msg pretty print

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

3 files changed, 19 insertions, 14 deletions

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index b1c68b18..04a802ad 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -2206,6 +2206,12 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
 
     bp = getbcache(currbid);
 
+    /* TODO recursive lookup */
+    if (currmode & MODE_SELECT) { 
+        vmsg("請回到一般模式再刪除文章");
+        return DONOTHING;
+    }
+
     if(fhdr->filemode & FILE_ANONYMOUS)
                 /* When the file is anonymous posted, fhdr->multi.anon_uid is author.
                  * see do_general() */
@@ -2226,15 +2232,11 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
 	!strcmp(cuser.userid, STR_GUEST))
 	return DONOTHING;
 
-    if (currmode & MODE_SELECT) { 
-        vmsg("請回到一般模式再刪除文章");
-        return DONOTHING;
-    }
     getdata(1, 0, msg_del_ny, genbuf, 3, LCECHO);
     if (genbuf[0] == 'y') {
 	if(
 #ifdef SAFE_ARTICLE_DELETE
-	   (bp->nuser>30 && !(currmode & MODE_DIGEST) &&
+	   (bp->nuser > 30 && !(currmode & MODE_DIGEST) &&
             !safe_article_delete(ent, fhdr, direct)) ||
 #endif
 	   !delete_record(direct, sizeof(fileheader_t), ent)
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index be473814..0d57a8bc 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -894,7 +894,7 @@ mailtitle(void)
     showtitle("\0郵件選單", BBSName);
     prints("[←]離開[↑↓]選擇[→]閱\讀信件 [R]回信 [x]轉達 "
 	     "[y]群組回信 [O]站外信:%s [h]求助\n" ANSI_COLOR(7) ""
-	     "編 號   %s  作 者          信  件  標  題     " 
+	     "  編號   %s 作 者          信  件  標  題     " 
 	     ANSI_COLOR(32) "",
 	     REJECT_OUTTAMAIL ? ANSI_COLOR(31) "關" ANSI_RESET : "開",
 	     (showmail_mode == SHOWMAIL_SUM) ? "大 小":"日 期");
@@ -963,10 +963,10 @@ maildoent(int num, fileheader_t * ent)
     }
 
     if (strncmp(currtitle, title, TTLEN))
-	prints("%5d %c %-7s%-15.14s%s %.46s\n", num, type,
+	prints("%6d %c %-6s%-15.14s%s %.46s\n", num, type,
 	       datepart, ent->owner, mark, title);
     else
-	prints("%5d %c %-7s%-15.14s" ANSI_COLOR(1;3%c) 
+	prints("%6d %c %-6s%-15.14s" ANSI_COLOR(1;3%c) 
 		"%s %.46s" ANSI_COLOR(0) "\n", num, type,
 	       datepart, ent->owner, color, mark, title);
 }
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 6c1d3362..06a366da 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -2004,8 +2004,8 @@ draw_pickup(int drawall, pickup_t * pickup, int pickup_way,
 	showtitle((cuser.uflag & FRIEND_FLAG) ? "好友列表" : "休閒聊天",
 		  BBSName);
 	prints("\n"
-	       ANSI_COLOR(7) "  %sP%c代號         %-17s%-17s%-13s%-10s" ANSI_RESET "\n",
-	       show_uid ? "UID " : " No.",
+	       ANSI_COLOR(7) "  %s P%c代號         %-17s%-17s%-13s%-10s" ANSI_RESET "\n",
+	       show_uid ? "UID " : "編號",
 	       (HasUserPerm(PERM_SEECLOAK) || HasUserPerm(PERM_SYSOP)) ? 'C' : ' ',
 	       "暱稱",
 	       MODE_STRING[show_mode],
@@ -2026,9 +2026,12 @@ draw_pickup(int drawall, pickup_t * pickup, int pickup_way,
 		8);
     }
     move(1, 0);
-    prints("  排序：[%s] 上站人數：%-4d" ANSI_COLOR(1;32) "我的朋友：%-3d"
-	   ANSI_COLOR(33) "與我為友：%-3d" ANSI_COLOR(36) "板友：%-4d" ANSI_COLOR(31) "壞人："
-	   "%-2d" ANSI_RESET "\n",
+    prints(" 排序:[%s]  上站人數:%-4d " 
+	    ANSI_COLOR(1;32) "我的朋友:%-3d "
+	   ANSI_COLOR(33) "與我為友:%-3d " 
+	   ANSI_COLOR(36) "板友:%-4d " 
+	   ANSI_COLOR(31) "壞人:%-2d" 
+	   ANSI_RESET "\n",
 	   msg_pickup_way[pickup_way], SHM->UTMPnumber,
 	   myfriend, friendme, currutmp->brc_id ? bfriend : 0, badfriend);
     for (i = 0, ch = page * nPickups + 1; i < nPickups; ++i, ++ch) {
@@ -2075,7 +2078,7 @@ draw_pickup(int drawall, pickup_t * pickup, int pickup_way,
 	else
 	    memcpy(mind, uentp->mind, 4);
 	mind[4] = 0;
-	prints("%6d%c%c%s%-13s%-17.16s" ANSI_RESET "%-17.16s%-13.13s"
+	prints("%6d %c%c%s%-13s%-17.16s" ANSI_RESET "%-17.16s%-13.13s"
 	       ANSI_COLOR(33) "%-4.4s" ANSI_RESET "%s\n",
 
 	/* list number or uid */