Revice "delete comment" ui.

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

2 files changed, 17 insertions, 10 deletions

diff --git a/pttbbs/mbbsd/comments.c b/pttbbs/mbbsd/comments.c
index 1e6d1a59..c767c17f 100644
--- a/pttbbs/mbbsd/comments.c
+++ b/pttbbs/mbbsd/comments.c
@@ -195,7 +195,7 @@ int CommentsGetCount(void *ctx)
     return num;
 }
 
-int CommentsDeleteFromTextFile(void *ctx, int i)
+int CommentsDeleteFromTextFile(void *ctx, int i, const char *reason)
 {
     size_t pattern_len;
     CommentsCtx *c = (CommentsCtx *)ctx;
@@ -225,7 +225,7 @@ int CommentsDeleteFromTextFile(void *ctx, int i)
         if (strncmp(buf, pattern, pattern_len) == 0 &&
             (buf[pattern_len] == ' ' || buf[pattern_len] == ESC_CHR) &&
             !found) {
-            fprintf(out, "[本行文字已被 %s 刪除。]\n", cuser.userid);
+            fprintf(out, "[本行推文已被 %s 刪除，理由: %s]\n", cuser.userid, reason);
             found = 1;
         } else {
             fputs(buf, out);
@@ -244,8 +244,9 @@ int CommentsDeleteFromTextFile(void *ctx, int i)
         if (rev > 0) {
             char revfn[PATHLEN];
             timecapsule_get_by_revision(filename, rev, revfn, sizeof(revfn));
-            log_filef(revfn, 0, "\n※ 刪除推文: %s %s <%s:%s>", cuser.userid,
-                      Cdatelite(&now), req->userid, req->msg);
+            log_filef(revfn, 0, "\n※ 刪除推文: %s %s理由: %s\n"
+                      "推文內容: %s: %s\n", Cdatelite(&now), cuser.userid,
+                      reason, req->userid, req->msg);
         }
 #endif
         CommentsDelete(ctx, i);
diff --git a/pttbbs/mbbsd/psb.c b/pttbbs/mbbsd/psb.c
index dd2274fa..eea22b19 100644
--- a/pttbbs/mbbsd/psb.c
+++ b/pttbbs/mbbsd/psb.c
@@ -703,17 +703,23 @@ pvcm_input_processor(int key, int curr, int total GCC_UNUSED, int rows GCC_UNUSE
     switch(key) {
         case KEY_DEL:
         case 'd':
-            {
+            do {
                 boardheader_t *bp = bp = getbcache(currbid);
                 assert(bp);
                 if (!(bp->brdattr & BRD_BM_MASK_CONTENT)) {
                     vmsg("要先開啟刪特定文字的權限。");
-                    return FULLUPDATE;
+                    break;
                 }
-            }
-            if (vans("確定要刪除嗎？ (y/N) ") == 'y') {
-                CommentsDeleteFromTextFile(cx->cmctx, curr);
-            }
+                char reason[DISP_TTLEN];
+                if (!getdata(b_lines-2, 0, "請輸入刪除原因: ",
+                            reason, sizeof(reason), DOECHO))
+                    break;
+                if (vans("確定要刪除嗎？ (y/N) ") == 'y') {
+                    CommentsDeleteFromTextFile(cx->cmctx, curr, reason);
+                }
+
+            } while(0);
+
             return PSB_NOP;
     }
     return PSB_NA;