Change Badpost to "revoked post", to avoid legal pettifoggers.

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

9 files changed, 49 insertions, 49 deletions

diff --git a/pttbbs/mbbsd/assess.c b/pttbbs/mbbsd/assess.c
index ddf585f4..412660a2 100644
--- a/pttbbs/mbbsd/assess.c
+++ b/pttbbs/mbbsd/assess.c
@@ -64,12 +64,12 @@ int assign_badpost(const char *userid, fileheader_t *fhdr,
     for (i = 0; i < (int)DIM(badpost_reason); i++)
 	prints("%d.%s ", i + 1, badpost_reason[i]);
     prints("%d.%s ", i + 1, "其他");
-    prints("0.取消劣文 ");
+    prints("0.取消退文 ");
     do {
         getdata(b_lines - 1, 0, "請選擇: ", genbuf, 2, NUMECHO);
         i = genbuf[0] - '1';
         if (i == -1) {
-            vmsg("取消設定劣文。");
+            vmsg("取消設定退文。");
             return -1;
         }
         if (i < 0 || i > (int)DIM(badpost_reason))
@@ -84,7 +84,7 @@ int assign_badpost(const char *userid, fileheader_t *fhdr,
         while (!getdata(b_lines, 0, "請輸入原因", reason, 50, DOECHO)) {
             // 對於 comment 目前可以重來，但非comment 文直接刪掉所以沒法 cancel
             if (comment) {
-                vmsg("取消設定劣文。");
+                vmsg("取消設定退文。");
                 return -1;
             }
             bell();
@@ -93,7 +93,7 @@ int assign_badpost(const char *userid, fileheader_t *fhdr,
     }
     assert(i >= 0 && i <= (int)DIM(badpost_reason));
 
-    sprintf(genbuf,"劣%s文退回(%s)", comment ? "推" : "", reason);
+    sprintf(genbuf,"退回%s(%s)", comment ? "推文" : "文章", reason);
 
     if (fhdr) strncat(genbuf, fhdr->title, 64-strlen(genbuf));
 
@@ -105,9 +105,9 @@ int assign_badpost(const char *userid, fileheader_t *fhdr,
     if (!(inc_badpost(userid, 1) % 5)){
 	userec_t xuser;
 	post_violatelaw(userid, BBSMNAME "系統警察",
-		"劣文累計 5 篇", "罰單一張");
+		"退文累計 5 篇", "罰單一張");
 	mail_violatelaw(userid, BBSMNAME "系統警察",
-		"劣文累計 5 篇", "罰單一張");
+		"退文累計 5 篇", "罰單一張");
 	kick_all(userid);
 	passwd_sync_query(tusernum, &xuser);
 	xuser.money = moneyof(tusernum);
@@ -135,16 +135,16 @@ int assign_badpost(const char *userid, fileheader_t *fhdr,
 
 	    strcpy(report_fh.owner, "[" BBSMNAME "警察局]");
 	    snprintf(report_fh.title, sizeof(report_fh.title),
-		    "%s 板 %s 板主給予 %s 一篇劣%s文",
-		    currboard, cuser.userid, userid, comment ? "推" : "");
+		    "%s 板 %s 板主退回 %s %s",
+		    currboard, cuser.userid, userid, comment ? "推文" : "文章");
 	    Copy(newpath, rptpath);
 	    fp = fopen(rptpath, "at");
 
 	    if (fp)
 	    {
-		fprintf(fp, "\n劣文原因: %s\n", genbuf);
+		fprintf(fp, "\n退文原因: %s\n", genbuf);
 		if (comment)
-		    fprintf(fp, "\n被劣推文項目:\n%s", comment);
+		    fprintf(fp, "\n退回推文項目:\n%s", comment);
 		fprintf(fp, "\n");
 		fclose(fp);
 	    }
@@ -177,17 +177,17 @@ reassign_badpost(const char *userid) {
     int orig_badpost = 0;
     int uid;
 
-    vs_hdr2(" 劣文修正 ", userid);
+    vs_hdr2(" 退文修正 ", userid);
     if ((uid = getuser(userid, &u)) == 0) {
         vmsgf("找不到使用者 %s。", userid);
         return -1;
     }
     orig_badpost = u.badpost;
-    prints("\n使用者 %s 的劣文數目前為: %d\n", userid, u.badpost);
+    prints("\n使用者 %s 的退文數目前為: %d\n", userid, u.badpost);
     snprintf(buf, sizeof(buf), "%d", u.badpost);
-    if (!getdata_str(5, 0, "調整劣文數目為: ", buf, sizeof(buf), DOECHO, buf) ||
+    if (!getdata_str(5, 0, "調整退文數目為: ", buf, sizeof(buf), DOECHO, buf) ||
         atoi(buf) == u.badpost) {
-        vmsg("劣文數目不變，未變動。");
+        vmsg("退文數目不變，未變動。");
         return 0;
     }
 
@@ -196,7 +196,7 @@ reassign_badpost(const char *userid) {
     if (u.badpost > orig_badpost) {
         u.timeremovebadpost = adjust_badpost_time(u.timeremovebadpost);
     }
-    prints("\n使用者 %s 的劣文即將由 %d 改為 %d。請輸入理由(會寄給使用者)\n",
+    prints("\n使用者 %s 的退文即將由 %d 改為 %d。請輸入理由(會寄給使用者)\n",
            userid, orig_badpost, u.badpost);
     if (!getdata(7, 0, "理由: ", reason, sizeof(reason), DOECHO)) {
         vmsg("錯誤: 不能無理由。");
@@ -204,7 +204,7 @@ reassign_badpost(const char *userid) {
     }
 
     move(6, 0); clrtobot();
-    prints("使用者 %s 的劣文由 %d 改為 %d。\n理由: %s\n",
+    prints("使用者 %s 的退文由 %d 改為 %d。\n理由: %s\n",
            userid, orig_badpost, u.badpost, reason);
     if (!getdata(9, 0, "確定？ [y/N]", buf, 3, LCECHO) || buf[0] != 'y') {
         vmsg("錯誤: 未確定，放棄。");
@@ -214,14 +214,14 @@ reassign_badpost(const char *userid) {
     // GOGOGO
     snprintf(msg, sizeof(msg),
              "   站長" ANSI_COLOR(1;32) "%s" ANSI_RESET "把" ANSI_COLOR(1;32)
-             "%s" ANSI_RESET "的劣文從" ANSI_COLOR(1;35) "%d" ANSI_RESET
+             "%s" ANSI_RESET "的退文從" ANSI_COLOR(1;35) "%d" ANSI_RESET
              "改成" ANSI_COLOR(1;35) "%d" ANSI_RESET "\n"
              "   " ANSI_COLOR(1;37) "修改理由是：%s" ANSI_RESET,
              cuser.userid, u.userid, orig_badpost, u.badpost, reason);
     snprintf(title, sizeof(title),
-             "[安全報告] 站長%s修改%s劣文報告", cuser.userid, u.userid);
+             "[安全報告] 站長%s修改%s退文報告", cuser.userid, u.userid);
     post_msg(BN_SECURITY, title, msg, "[系統安全局]");
-    mail_log2id_text(u.userid, "[系統通知] 劣文變更", msg,
+    mail_log2id_text(u.userid, "[系統通知] 退文變更", msg,
                      "[系統安全局]", NA);
     passwd_sync_update(uid, &u);
     kick_all(u.userid);
@@ -244,8 +244,8 @@ bad_comment(const char *fn)
     int done = 0;
     int i = 0, c;
 
-    vs_hdr("劣推文");
-    usercomplete("請輸入要劣推文的 ID: ", uid);
+    vs_hdr("退回推文");
+    usercomplete("請輸入要退回推文的 ID: ", uid);
     if (!*uid)
 	return -1;
 
@@ -253,7 +253,7 @@ bad_comment(const char *fn)
     if (!fp)
 	return -1;
 
-    vs_hdr2(" 劣推文 ", uid);
+    vs_hdr2(" 退回推文 ", uid);
     // search file for it
     while (fgets(buf, sizeof(buf), fp) && *buf)
     {
@@ -268,7 +268,7 @@ bad_comment(const char *fn)
 	outs(buf);
 
 	move (5, 0);
-	outs("請問是要劣這個推文嗎？(Y:確定,N:找下個,Q:離開) [y/N/q]: ");
+	outs("請問退回這個推文嗎？(Y:確定,N:找下個,Q:離開) [y/N/q]: ");
 	c = vkey();
 	if (isascii(c)) c = tolower(c);
 	if (c == 'q')
@@ -280,7 +280,7 @@ bad_comment(const char *fn)
 	    continue;
 
 	done = 1;
-	vmsg("已劣推文。");
+	vmsg("已退回推文。");
 	break;
     }
     fclose(fp);
diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index 4db893fc..d17afdf8 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -2419,7 +2419,7 @@ editLimits(unsigned char *plogins,
     sprintf(genbuf, "%u", 255 - badpost);
     do {
 	getdata_buf(y, 0,
-		"劣文篇數上限 (0~255)：", genbuf, 5, NUMECHO);
+		"退文篇數上限 (0~255)：", genbuf, 5, NUMECHO);
 	temp = atoi(genbuf);
     } while (temp < 0 || temp > 255);
     badpost = (unsigned char)(255 - temp);
@@ -2636,11 +2636,11 @@ recommend_cancel(int ent, fileheader_t * fhdr, const char *direct)
     if (now - atoi(fhdr->filename + 2) > 2 * 7 * 24 * 60 * 60)
     {
 	move(b_lines-2, 0); clrtoeol();
-	outs("超過兩週，禁止劣推文。");
+	outs("超過兩週，禁止退回推文。");
     } else
 #endif
     {
-	getdata(b_lines - 1, 0, "請問您要 (1) 推薦歸零 (2) 劣推文 [1/2]? ", yn, 3, LCECHO);
+	getdata(b_lines - 1, 0, "請問您要 (1) 推薦歸零 (2) 退回推文 [1/2]? ", yn, 3, LCECHO);
 	if (yn[0] == '2')
 	{
 	    setbfile(fn, currboard, fhdr->filename);
@@ -3519,15 +3519,15 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
                 // case one, self-owned, invalid author, or digest mode - should not give bad posts
 	    } else if (!IS_DELETE_FILE_CONTENT_OK(del_ret) || !*newpath) {
                 // case 2, got error in file deletion (already deleted, also skip badpost)
-                outs("劣文設定: 已刪或刪除錯誤 (跳過)\n");
+                outs("退文設定: 已刪或刪除錯誤 (跳過)\n");
 	    } else if (now - atoi(fhdr->filename + 2) > 7 * 24 * 60 * 60) {
                 // case 3, post older than one week (TODO use macro for the duration)
-		outs("劣文設定: 文章超過一週 (跳過)\n");
+		outs("退文設定: 文章超過一週 (跳過)\n");
 	    } else {
                 // case 4, can assign badpost
 		move_ansi(1, 40); clrtoeol();
 		// TODO not_owned 時也要改變 numpost?
-                outs("惡劣文章?(y/N) ");
+                outs("惡退文章?(y/N) ");
                 // FIXME 有板主會在這裡不小心斷掉連線所以要小心...
                 // 重要的事最好在前面作完。
                 vgets(genbuf, 3, VGET_LOWERCASE);
@@ -3563,7 +3563,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
                     pay_as_uid(tusernum, del_fee,
                             "%s 看板 文章「%s」被%s，扣除稿酬%s %s",
                             currboard,  fhdr->title,
-                            as_badpost ? "劣退" : "刪除",
+                            as_badpost ? "退回" : "刪除",
                             reason[0] ? "。原因:" : "", reason);
                     sendalert_uid(tusernum, ALERT_PWD_PERM);
 #ifdef USE_COOLDOWN
@@ -4242,7 +4242,7 @@ int check_cooldown(boardheader_t *bp)
        }
       else if(posttimesof(usernum)==0xf)
       {
-	 vmsgf("對不起，您被設劣文！ (限制 %d 分 %d 秒)", diff/60, diff%60);
+	 vmsgf("對不起，您被設退文！ (限制 %d 分 %d 秒)", diff/60, diff%60);
 	 return 1;
       }
 #ifdef REJECT_FLOOD_POST
diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c
index dcee67ad..d44f9069 100644
--- a/pttbbs/mbbsd/board.c
+++ b/pttbbs/mbbsd/board.c
@@ -534,7 +534,7 @@ b_config(void)
 	    i = 255 - lbp;
 	    attr = (cuser.badpost > i) ? 1 : 0;
 	    if (attr) outs(ANSI_COLOR(1;31) "*");
-	    prints("劣文篇數 %d 篇以下", i);
+	    prints("退文篇數 %d 篇以下", i);
 	    if (attr) outs(ANSI_RESET);
 	    hasres = 1;
 	}
diff --git a/pttbbs/mbbsd/cal.c b/pttbbs/mbbsd/cal.c
index d29f5504..b6d25e61 100644
--- a/pttbbs/mbbsd/cal.c
+++ b/pttbbs/mbbsd/cal.c
@@ -23,7 +23,7 @@ char *get_restriction_reason(
     }
 #ifdef ASSESS
     if  (badpost > (255 - limits_badpost)) {
-        snprintf(msg, sz_msg, "劣文超過 %d 篇(目前%d篇)",
+        snprintf(msg, sz_msg, "退文超過 %d 篇(目前%d篇)",
                  255 - limits_badpost, badpost);
         return msg;
     }
diff --git a/pttbbs/mbbsd/friend.c b/pttbbs/mbbsd/friend.c
index 0d43acf0..c2aa369b 100644
--- a/pttbbs/mbbsd/friend.c
+++ b/pttbbs/mbbsd/friend.c
@@ -536,7 +536,7 @@ friend_edit(int type)
 
             move(1, 0); clrtobot();
             // we have seen some BM hit this accidentally.. so ask again.
-            outs("整理名單可清除已消失、過期、或已有劣文的帳號。\n\n");
+            outs("整理名單可清除已消失、過期、或已有退文的帳號。\n\n");
 
 	    getdata(2, 0,
 		    "要從名單中清除幾個月沒上站的使用者？ (0=不清除)[0] ",
@@ -544,7 +544,7 @@ friend_edit(int type)
 	    expire = atoi(uident);
 #ifdef ASSESS
 	    getdata(3, 0,
-		    "要從名單中清除有幾篇以上劣文的使用者？ (0=不清除)[0] ",
+		    "要從名單中清除有幾篇以上退文的使用者？ (0=不清除)[0] ",
 		    uident, 4, NUMECHO);
 	    badpost = atoi(uident);
 #endif
@@ -554,7 +554,7 @@ friend_edit(int type)
             if (expire)
                 prints(" * %d 個月沒上站的使用者\n", expire);
             if (badpost)
-                prints(" * 已有 %d 篇劣文的使用者\n", badpost);
+                prints(" * 已有 %d 篇退文的使用者\n", badpost);
 
             getdata(9, 0,
                     "確定要執行嗎? [y/N] ",
diff --git a/pttbbs/mbbsd/menu.c b/pttbbs/mbbsd/menu.c
index c960b423..ee4a5f7c 100644
--- a/pttbbs/mbbsd/menu.c
+++ b/pttbbs/mbbsd/menu.c
@@ -803,7 +803,7 @@ static const commands_t userlist[] = {
     {u_mylogs,	    PERM_LOGINOK,   "LMy Logs      【個人記錄】 (最近上線...)"},
     {u_register,    MENU_UNREGONLY, "Register      填寫《註冊申請單》"},
 #ifdef ASSESS
-    {u_cancelbadpost,PERM_LOGINOK,  "Bye BadPost   申請刪除劣文"},
+    {u_cancelbadpost,PERM_LOGINOK,  "Bye BadPost   申請刪除退文"},
 #endif // ASSESS
     {deprecate_userlist,       0,   "KCloak        隱身術"},
     {NULL, 0, NULL}
diff --git a/pttbbs/mbbsd/ordersong.c b/pttbbs/mbbsd/ordersong.c
index 4211acbd..802055a2 100644
--- a/pttbbs/mbbsd/ordersong.c
+++ b/pttbbs/mbbsd/ordersong.c
@@ -34,10 +34,10 @@ do_order_song(void)
     char save_title[STRLEN];
     const char *override_receiver = NULL;
 
-    // 由於變免費了，改成要看劣文跟登入天數
+    // 由於變免費了，改成要看退文跟登入天數
 #if defined(ORDERSONG_MAX_BADPOST) && defined(ASSESS)
     if (cuser.badpost > ORDERSONG_MAX_BADPOST) {
-        vmsgf("為避免濫用，留言前請先消除劣文記錄至 %d 篇以下",
+        vmsgf("為避免濫用，留言前請先消除退文記錄至 %d 篇以下",
                 ORDERSONG_MAX_BADPOST);
         return 0;
     }
diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c
index 257bc636..793a97d8 100644
--- a/pttbbs/mbbsd/talk.c
+++ b/pttbbs/mbbsd/talk.c
@@ -471,7 +471,7 @@ my_query(const char *uident)
 	move(vgety(), 40);
 	prints("《有效文章》%d 篇", muser.numposts);
 #ifdef ASSESS
-	prints(" (劣:%d)", muser.badpost);
+	prints(" (退:%d)", muser.badpost);
 #endif
 	outc('\n');
 
diff --git a/pttbbs/mbbsd/user.c b/pttbbs/mbbsd/user.c
index 1fa6e04b..3e146f9f 100644
--- a/pttbbs/mbbsd/user.c
+++ b/pttbbs/mbbsd/user.c
@@ -103,7 +103,7 @@ int u_cancelbadpost(void)
 
    // early check.
    if(cuser.badpost == 0) {
-       vmsg("你並沒有劣文.");
+       vmsg("你並沒有退文.");
        return 0;
    }
 
@@ -129,7 +129,7 @@ int u_cancelbadpost(void)
    // 某些 user 會一直失敗，原因不明；由 vmsg 改為 getdata.
    clear();
    // 無聊的 disclaimer...
-   mvprints(1, 0, "預計劣文將由 %d 篇變為 %d 篇，確定嗎[y/N]? ", prev, prev-1);
+   mvprints(1, 0, "預計退文將由 %d 篇變為 %d 篇，確定嗎[y/N]? ", prev, prev-1);
    do {
        if (vgets(ans, sizeof(ans), VGET_LOWERCASE | VGET_ASCII_ONLY) < 1 ||
            ans[0] != 'y') { pass_verify = 0; break; }
@@ -156,10 +156,10 @@ int u_cancelbadpost(void)
    }
 
    log_filef("log/cancelbadpost.log", LOG_CREAT,
-	   "%s %s 刪除一篇劣文 (%d -> %d 篇)\n",
+	   "%s %s 刪除一篇退文 (%d -> %d 篇)\n",
 	   Cdate(&now), cuser.userid, prev, cuser.badpost);
 
-   vmsgf("恭喜您已成功\刪除一篇劣文 (由 %d 變為 %d 篇)",
+   vmsgf("恭喜您已成功\刪除一篇退文 (由 %d 變為 %d 篇)",
 	   prev, cuser.badpost);
    return 0;
 }
@@ -242,7 +242,7 @@ user_display(const userec_t * u, int adminmode)
 
     // conditional fields
 #ifdef ASSESS
-    prints("\t劣文數目: %u\n", (unsigned int)u->badpost);
+    prints("\t退文數目: %u\n", (unsigned int)u->badpost);
 #endif // ASSESS
 
 #ifdef CHESSCOUNTRY
@@ -652,7 +652,7 @@ uinfo_query(const char *orig_uid, int adminmode, int unum)
     }
 
     ans = vans(adminmode ?
-    "(1)改資料(2)密碼(3)權限(4)砍帳(5)改ID(6)寵物(7)審判(8)劣文(M)信箱 [0]結束 " :
+    "(1)改資料(2)密碼(3)權限(4)砍帳(5)改ID(6)寵物(7)審判(8)退文(M)信箱 [0]結束 " :
     "請選擇 (1)修改資料 (2)設定密碼 (C)個人化設定 [0]結束 ");
 
     if (ans > '2' && ans != 'c' && !adminmode)
@@ -920,7 +920,7 @@ uinfo_query(const char *orig_uid, int adminmode, int unum)
 		if ((tmp = atoi(buf)) >= 0)
 		    x.numposts = tmp;
 	    move(y-1, 0); clrtobot();
-	    prints("文章數目： %d (劣: %d, 修改劣文請改用選項8)\n",
+	    prints("文章數目： %d (退: %d, 修改退文數請選項8)\n",
 		    x.numposts, x.badpost);
 
 	    snprintf(genbuf, sizeof(genbuf), "%d", x.vl_count);
@@ -1138,7 +1138,7 @@ uinfo_query(const char *orig_uid, int adminmode, int unum)
 #ifdef ASSESS
         reassign_badpost(x.userid);
 #else
-        vmsg("本站目前不支援劣文設定。");
+        vmsg("本站目前不支援退文設定。");
 #endif
         return;