* change BN_SECURITY checks to is_readonly_board

 * remove more bid stuff
 * expire some deprecated BM hot keys


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

4 files changed, 13 insertions, 34 deletions

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index fba3539f..c028f4cf 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1324,27 +1324,6 @@ do_post_vote(void)
     return do_voteboard(1);
 }
 
-int
-do_post_openbid(void)
-{
-    char ans[4];
-    boardheader_t  *bp;
-
-    assert(0<=currbid-1 && currbid-1<MAX_BOARD);
-    bp = getbcache(currbid);
-    if (!(bp->brdattr & BRD_VOTEBOARD))
-    {
-	getdata(b_lines - 1, 0,
-		"確定要公開招標嗎？ [y/N] ",
-		ans, sizeof(ans), LCECHO);
-	if(ans[0] != 'y')
-	    return FULLUPDATE;
-
-	return do_general(1);
-    }
-    return 0;
-}
-
 static void
 do_generalboardreply(/*const*/ fileheader_t * fhdr)
 {
@@ -1511,7 +1490,7 @@ edit_post(int ent, fileheader_t * fhdr, const char *direct)
 	return DONOTHING;
 
     // board check
-    if (strcmp(bp->brdname, BN_SECURITY) == EQUSTR ||
+    if (is_readonly_board(bp->brdname) ||
 	(bp->brdattr & BRD_VOTEBOARD))
 	return DONOTHING;
 
@@ -2514,7 +2493,7 @@ do_add_recommend(const char *direct, fileheader_t *fhdr,
      */
     setdirpath(path, direct, fhdr->filename);
     if( log_file(path, 0, buf) == -1 ){ // 不 CREATE
-	vmsg("推薦/競標失敗");
+	vmsg("推薦失敗");
 	return -1;
     }
 
@@ -2747,7 +2726,7 @@ recommend(int ent, fileheader_t * fhdr, const char *direct)
     bp = getbcache(currbid);
     if (bp->brdattr & BRD_NORECOMMEND || fhdr->filename[0] == 'L' || 
         ((fhdr->filemode & FILE_MARKED) && (fhdr->filemode & FILE_SOLVED))) {
-	vmsg("抱歉, 禁止推薦或競標");
+	vmsg("抱歉, 禁止推薦");
 	return FULLUPDATE;
     }
     if (   !CheckPostPerm() || isGuest)
@@ -3141,7 +3120,7 @@ del_range(int ent, const fileheader_t *fhdr, const char *direct)
     { 
 	// 很不幸的是有一種是信件->mail_cite->精華區
         bp = getbcache(currbid);
-	if (strcmp(bp->brdname, BN_SECURITY) == 0)
+	if (is_readonly_board(bp->brdname))
 	    return DONOTHING;
     }
 
@@ -3209,7 +3188,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
     assert(0<=currbid-1 && currbid-1<MAX_BOARD);
     bp = getbcache(currbid);
 
-    if (strcmp(bp->brdname, BN_SECURITY) == 0)
+    if (is_readonly_board(bp->brdname))
 	return DONOTHING;
 
     /* TODO recursive lookup */
@@ -4068,9 +4047,9 @@ const onekey_t read_comms[] = {
 #else
     { 0, NULL }, // 'J'
 #endif
-    { 0, b_moved_to_config }, // 'K'
+    { 0, NULL }, // 'K'
     { 1, solve_post }, // 'L'
-    { 0, b_moved_to_config }, // 'M'
+    { 0, NULL }, // 'M'
     { 0, NULL }, // 'N'
     { 0, NULL }, // 'O'
     { 0, NULL }, // 'P'
@@ -4116,7 +4095,7 @@ const onekey_t read_comms[] = {
 #else
     { 0, NULL }, // 'u'
 #endif
-    { 0, b_moved_to_config }, // 'v'
+    { 0, NULL }, // 'v'
     { 1, b_call_in }, // 'w'
     { 1, cross_post }, // 'x'
     { 1, reply_post }, // 'y'
diff --git a/mbbsd/cal.c b/mbbsd/cal.c
index ec99c459..67a91a5e 100644
--- a/mbbsd/cal.c
+++ b/mbbsd/cal.c
@@ -545,8 +545,11 @@ give_money_ui(const char *userid)
 	    return 0;
 	}
 
+	// TODO 若是壞人，禁止編輯內文？
 	if (vans("交易已完成，要修改紅包袋嗎？[y/N] ") == 'y')
+	{
 	    veditfile(fpath);
+	}
 	sendalert(id, ALERT_NEW_MAIL);
     }
     return 0;
diff --git a/mbbsd/read.c b/mbbsd/read.c
index cdb94944..7740d3cf 100644
--- a/mbbsd/read.c
+++ b/mbbsd/read.c
@@ -180,7 +180,7 @@ TagPruner(int bid)
     assert(bid >= 0);   /* bid == 0 means in mailbox */
     if (bid){
 	bp = getbcache(bid);
-	if (strcmp(bp->brdname, BN_SECURITY) == 0)
+	if (is_readonly_board(bp->brdname))
 	    return DONOTHING;
     }
     if (TagNum && ((currstat != READING) || (currmode & MODE_BOARD))) {
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 2a58066a..b477c206 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -497,10 +497,7 @@ my_query(const char *uident)
 	       "《象棋戰績》%3d 勝 %3d 敗 %3d 和\n",
 	       muser.five_win, muser.five_lose, muser.five_tie,
 	       muser.chc_win, muser.chc_lose, muser.chc_tie);
-#ifdef ASSESS
-	prints("《競標評比》 優 %d / 劣 %d", muser.goodsale, muser.badsale);
-	move(6, 40);
-#endif
+
 	if ((uentp && ((fri_stat & HFM) || strcmp(muser.userid,cuser.userid) == 0) && !uentp->invisible))
 	    prints("《 性  別 》%-28.28s\n", sex[muser.sex % 8]);