- quote ASSESS features with #ifdef

- fix truncated ADM prompt
thanks to watch.bbs@ptt.cc


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

2 files changed, 12 insertions, 6 deletions

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 4a1cdd20..f46dbcae 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -478,7 +478,9 @@ static const commands_t userlist[] = {
     {u_cloak, PERM_CLOAK,           "KKCloak        隱身術"},
 #endif
     {u_register, PERM_BASIC,        "RRegister      填寫《註冊申請單》"},
+#ifdef ASSESS
     {u_cancelbadpost, PERM_LOGINOK, "BBye BadPost   申請刪除劣文"},
+#endif // ASSESS
     {u_list, PERM_SYSOP,            "XUsers         列出註冊名單"},
 #ifdef MERGEBBS
 //    {m_sob, PERM_LOGUSER|PERM_SYSOP,             "SSOB Import    沙灘變身術"},
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 0e87d17e..889bc9b0 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -145,12 +145,17 @@ user_display(const userec_t * u, int adminmode)
     sethomedir(genbuf, u->userid);
     prints("                私人信箱: %d 封  (購買信箱: %d 封)\n"
 	   "                手機號碼: %010d\n"
-	   "                生    日: %04i/%02i/%02i\n"
-	   "                優 劣 文: 優:%d / 劣:%d\n",
+	   "                生    日: %04i/%02i/%02i\n",
 	   get_num_records(genbuf, sizeof(fileheader_t)),
 	   u->exmailbox, u->mobile,
-	   u->year + 1900, u->month, u->day,
+	   u->year + 1900, u->month, u->day
+	   );
+
+#ifdef ASSESS
+    prints("                優 劣 文: 優:%d / 劣:%d\n",
            u->goodpost, u->badpost);
+#endif // ASSESS
+
     prints("                上站位置: %s\n", u->lasthost);
 
 #ifdef PLAY_ANGEL
@@ -657,9 +662,8 @@ uinfo_query(userec_t *u, int adminmode, int unum)
 
     memcpy(&x, u, sizeof(userec_t));
     ans = getans(adminmode ?
-	    "(1)改資料(2)設密碼(3)設權限(4)砍帳號(5)改ID"
-	    "(6)殺/復活寵物(7)審判(M)改信箱 [0]結束 " :
-	    "請選擇 (1)修改資料 (2)設定密碼 (M)修改信箱 (C) 個人化設定 ==> [0]結束 ");
+    "(1)改資料(2)密碼(3)權限(4)砍帳號(5)改ID(6)寵物(7)審判(M)信箱  [0]結束 " :
+    "請選擇 (1)修改資料 (2)設定密碼 (M)修改信箱 (C) 個人化設定 ==> [0]結束 ");
 
     if (ans > '2' && ans != 'm' && ans != 'c' && !adminmode)
 	ans = '0';