- register: drop some rejected words which are valid in some addresses

- user: support 80 column in signature preview
- admin: log admin/sys(etc)edit


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4296 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 15 insertions, 2 deletions

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 4a875adb..f7de644f 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -851,6 +851,13 @@ x_file(void)
 		strlcpy(buf, entries[sel], sizeof(buf));
 		v = strchr(buf, ' '); *v++ = 0;
 		i = vedit(buf, NA, NULL);
+		// log file change
+		if (i != -1)
+		{
+		    log_filef("log/etc_edit.log", LOG_CREAT,
+			    "%s %s %s # %s", Cdate(&now),
+			    cuser.userid, buf, v);
+		}
 		vmsgf("系統檔案[%s]: %s", buf, (i == -1) ? 
 			"未改變" : "更新完畢");
 		break;
diff --git a/mbbsd/register.c b/mbbsd/register.c
index 957e4a2c..5eb3f513 100644
--- a/mbbsd/register.c
+++ b/mbbsd/register.c
@@ -74,8 +74,9 @@ HaveRejectStr(const char *s, const char **rej)
 {
     int     i;
     char    *rejectstr[] =
-	{"幹", "阿", "不", "你媽", "某", "笨", "呆", "..", "xx",
+	{"幹", "不", "你媽", "某", "笨", "呆", "..", "xx",
 	 "你管", "管我", "猜", "天才", "超人", 
+	 /* "阿",  (某些住址有) */
 	 "ㄅ", "ㄆ", "ㄇ", "ㄈ", "ㄉ", "ㄊ", "ㄋ", "ㄌ", "ㄍ", "ㄎ", "ㄏ",
 	 "ㄐ", "ㄑ", "ㄒ", "ㄓ", "ㄔ", "ㄕ", "ㄖ", "ㄗ", "ㄘ", "ㄙ",
 	 "ㄧ", "ㄨ", "ㄩ", "ㄚ", "ㄛ", "ㄜ", "ㄝ", "ㄞ", "ㄟ", "ㄠ", "ㄡ",
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 7e71c414..26ef7588 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -1222,13 +1222,18 @@ showsignature(char *fname, int *j, SigInfo *si)
 	    si->max = ch - '1';
 	    if(lines > 0 && si->max >= si->show_start)
 	    {
+		int y = vgety() + 1;
 		prints(ANSI_COLOR(36) "【 簽名檔.%c 】" ANSI_RESET "\n", ch);
 		lines--;
 		if(lines > MAX_SIGLINES/2)
 		    si->show_max = si->max;
 		for (i = 0; lines > 0 && i < MAX_SIGLINES && 
 			fgets(buf, sizeof(buf), fp) != NULL; i++)
-		    outs(buf), lines--;
+		{
+		    chomp(buf);
+		    mvouts(y++, 0, buf);
+		    lines--;
+		}
 	    }
 	    fclose(fp);
 	}