From f522d84f12acca963bf29ebdd5302d1cb2d8d4e8 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sat, 23 Jul 2011 03:26:00 +0000
Subject: make "BRD_BAD" into "BRD_NOCREDIT", a more natural name.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5377 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/include/pttstruct.h |  4 ++--
 pttbbs/mbbsd/admin.c       | 21 ++++++++++++---------
 pttbbs/mbbsd/bbs.c         | 16 ++++++----------
 pttbbs/mbbsd/board.c       |  7 ++-----
 pttbbs/mbbsd/var.c         |  4 ++--
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/pttbbs/include/pttstruct.h b/pttbbs/include/pttstruct.h
index 5e395446..cbfbf689 100644
--- a/pttbbs/include/pttstruct.h
+++ b/pttbbs/include/pttstruct.h
@@ -212,12 +212,12 @@ typedef struct boardheader_t { /* 256 bytes */
 #define BRD_POSTMASK		0x00000020	/* 限制發表或閱讀 */
 #define BRD_ANONYMOUS		0x00000040	/* 匿名板 */
 #define BRD_DEFAULTANONYMOUS	0x00000080	/* 預設匿名板 */
-#define BRD_BAD			0x00000100	/* 違法改進中看板 */
+#define BRD_NOCREDIT		0x00000100	/* 發文無獎勵看板 */
 #define BRD_VOTEBOARD		0x00000200	/* 連署機看板 */
 #define BRD_WARNEL		0x00000400	/* 連署機看板 */
 #define BRD_TOP			0x00000800	/* 熱門看板群組 */
 #define BRD_NORECOMMEND		0x00001000	/* 不可推薦 */
-#define BRD_NOCREDIT		0x00002000	/* 發文無金錢與有效文章 */
+#define BRD_BLOG		0x00002000	/* (已停用) 部落格 */
 #define BRD_BMCOUNT		0x00004000	/* 板主設定列入記錄 */
 #define BRD_SYMBOLIC		0x00008000	/* symbolic link to board */
 #define BRD_NOBOO		0x00010000	/* 不可噓 */
diff --git a/pttbbs/mbbsd/admin.c b/pttbbs/mbbsd/admin.c
index 95009312..30f0ea91 100644
--- a/pttbbs/mbbsd/admin.c
+++ b/pttbbs/mbbsd/admin.c
@@ -503,13 +503,15 @@ m_mod_board(char *bname)
 	return -1;
     }
     assert(0<=bid-1 && bid-1<MAX_BOARD);
-    prints("看板名稱：%s\n看板說明：%s\n看板bid：%d\n看板GID：%d\n"
-	   "板主名單：%s", bh.brdname, bh.title, bid, bh.gid, bh.BM);
+    prints("看板名稱：%s %s\n看板說明：%s\n看板bid：%d\n看板GID：%d\n"
+	   "板主名單：%s", bh.brdname, (bh.brdattr & BRD_NOCREDIT) ?
+           ANSI_COLOR(1;31) "[已設定發文無文章金錢獎勵]" ANSI_RESET : "",
+           bh.title, bid, bh.gid, bh.BM);
     bperm_msg(&bh);
 
     /* Ptt 這邊斷行會檔到下面 */
     move(9, 0);
-    snprintf(genbuf, sizeof(genbuf), "(E)設定 (V)違法/解除%s%s [Q]取消？",
+    snprintf(genbuf, sizeof(genbuf), "(E)設定 (V)發文獎勵%s%s [Q]取消? ",
 	    HasUserPerm(PERM_SYSOP |
 		     PERM_BOARD) ? " (B)Vote (S)救回 (C)合併 (G)賭盤解卡" : "",
 	    HasUserPerm(PERM_SYSSUBOP | PERM_SYSSUPERSUBOP | PERM_BOARD) ? " (D)刪除" : "");
@@ -564,14 +566,15 @@ m_mod_board(char *bname)
 	    break;
     case 'v':
 	memcpy(&newbh, &bh, sizeof(bh));
-	outs("看板目前為");
-	outs((bh.brdattr & BRD_BAD) ? "違法" : "正常");
+	outs("看板發文的文章金錢獎勵方法目前為");
+	outs((bh.brdattr & BRD_NOCREDIT) ?
+             ANSI_COLOR(1;31) "禁止" ANSI_RESET : "正常");
 	getdata(21, 0, "確定更改？", genbuf, 5, LCECHO);
 	if (genbuf[0] == 'y') {
-	    if (newbh.brdattr & BRD_BAD)
-		newbh.brdattr = newbh.brdattr & (!BRD_BAD);
+	    if (newbh.brdattr & BRD_NOCREDIT)
+		newbh.brdattr = newbh.brdattr & (!BRD_NOCREDIT);
 	    else
-		newbh.brdattr = newbh.brdattr | BRD_BAD;
+		newbh.brdattr = newbh.brdattr | BRD_NOCREDIT;
 	    assert(0<=bid-1 && bid-1<MAX_BOARD);
 	    substitute_record(fn_board, &newbh, sizeof(newbh), bid);
 	    reset_board(bid);
@@ -613,7 +616,7 @@ m_mod_board(char *bname)
 	    vmsg("禁止更動連結看板，請直接修正原看板");
 	    break;
 	}
-	move(8, 0);
+	move(8, 0); clrtobot();
 	outs("直接按 [Return] 不修改該項設定");
 	memcpy(&newbh, &bh, sizeof(bh));
 
diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index c4949e63..0d1868aa 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -1232,10 +1232,7 @@ do_general(int garbage)
     // including: special boards (e.g. TEST, ALLPOST), bad boards, no BM boards
     if (!HasBasicUserPerm(PERM_LOGINOK) || 
 	IsFreeBoardName(currboard) || 
-	(currbrdattr & BRD_BAD) || 
-#ifdef BRD_NOCREDIT
 	(currbrdattr & BRD_NOCREDIT) || 
-#endif
 #ifdef USE_HIDDEN_BOARD_NOCREDIT
         (currbrdattr & BRD_HIDE) ||
 #endif
@@ -1314,7 +1311,7 @@ do_general(int garbage)
 	}
 	outs("順利貼出佈告，");
 
-	// Freeboard/BRD_BAD check was already done.
+	// Freeboard/BRD_NOCREDIT check was already done.
 	if (!ifuseanony) 
 	{
             if (money > 0)
@@ -2412,11 +2409,10 @@ hold_gamble(void)
     assert(0<=currbid-1 && currbid-1<MAX_BOARD);
     if (!(currmode & MODE_BOARD))
 	return 0;
-    if (bp->brdattr & BRD_BAD )
-	{
-      	  vmsg("違法看板禁止使用賭盤");
-	  return 0;
-	}
+    if (bp->brdattr & BRD_NOCREDIT ) {
+        vmsg("本看板目前被設定為發文無獎勵，無法使用賭盤");
+        return 0;
+    }
 
     setbfile(fn_ticket, currboard, FN_TICKET);
     setbfile(fn_ticket_end, currboard, FN_TICKET_END);
@@ -3437,7 +3433,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
         // also check MAX_POST_MONEY in case any error made bad money...
         if (del_fee < 0 || 
             IsFreeBoardName(currboard) || 
-            (currbrdattr & BRD_BAD) ||
+            (currbrdattr & BRD_NOCREDIT) ||
             (currmode & MODE_DIGEST) ||
             (fhdr->filemode & INVALIDMONEY_MODES) ||
             del_fee > MAX_POST_MONEY ||
diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c
index f8b463c7..28f963c3 100644
--- a/pttbbs/mbbsd/board.c
+++ b/pttbbs/mbbsd/board.c
@@ -1375,13 +1375,10 @@ show_brdlist(int head, int clsflag, int newflag)
 
 #ifdef USE_COOLDOWN
 		    if (B_BH(ptr)->brdattr & BRD_COOLDOWN)
-			outs("靜 ");
-		    else if (B_BH(ptr)->brdattr & BRD_BAD)
 #else
-		    if (B_BH(ptr)->brdattr & BRD_BAD)
+                    if (0)
 #endif
-			outs(" X ");
-
+			outs("靜 ");
 		    else if (B_BH(ptr)->nuser <= 0)
 			prints(" %c ", B_BH(ptr)->bvote ? 'V' : ' ');
 		    else if (B_BH(ptr)->nuser <= 10)
diff --git a/pttbbs/mbbsd/var.c b/pttbbs/mbbsd/var.c
index aba4cbc3..15df0e73 100644
--- a/pttbbs/mbbsd/var.c
+++ b/pttbbs/mbbsd/var.c
@@ -50,12 +50,12 @@ const char * const str_permboard[] = {
     "限制(不需設定)",		/* BRD_POSTMASK */
     "匿名板",			/* BRD_ANONYMOUS */
     "預設匿名板",		/* BRD_DEFAULTANONYMOUS */
-    "違法改進中看板",		/* BRD_BAD */
+    "發文無獎勵",		/* BRD_NOCREDIT, was: BRD_BAD */
     "連署專用看板",		/* BRD_VOTEBOARD */
     "已警告要廢除",		/* BRD_WARNEL */
     "熱門看板群組",		/* BRD_TOP */
     "不可推薦",                 /* BRD_NORECOMMEND */
-    "發文無獎賞",		/* BRD_NOCREDIT */
+    "保留",		        /* was: BRD_BLOG */
     "板主設定列入記錄",		/* BRD_BMCOUNT */
     "連結看板",                 /* BRD_SYMBOLIC */
     "不可噓",                   /* BRD_NOBOO */
-- 
cgit v1.2.3