* fix ANSI in getdata/vgets prompts

 * allow badpost filtering for everyone


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

4 files changed, 30 insertions, 14 deletions

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 92ff4cd5..8d8cd67d 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1231,7 +1231,12 @@ do_generalboardreply(/*const*/ fileheader_t * fhdr)
 
     if (!CheckPostRestriction(currbid))
     {
-	getdata(b_lines - 1, 0,	ANSI_COLOR(1;31) "▲ 無法回應至看板。 " ANSI_RESET
+	getdata(b_lines - 1, 0,	
+#ifdef USE_PFTERM
+		ANSI_COLOR(1;31) "▲ 無法回應至看板。 " ANSI_RESET
+#else
+		"▲ 無法回應至看板。 "
+#endif
 		"改回應至 (M)作者信箱 (Q)取消？[Q] ",
 		genbuf, sizeof(genbuf), LCECHO);
 	switch (genbuf[0]) {
diff --git a/mbbsd/friend.c b/mbbsd/friend.c
index aa2ad319..f3f88925 100644
--- a/mbbsd/friend.c
+++ b/mbbsd/friend.c
@@ -512,17 +512,16 @@ friend_edit(int type)
 		dirty = 1;
 	    }
 	} else if (uident[0] == 'c') {
-	    int expire, badpost;
+	    int expire = 0, badpost = 0;
 	    getdata(2, 0, 
 		    "要從名單中清除幾個月沒上站(包含帳號已消失)的使用者？ (0=不清除)[0] ",
 		    uident, 4, NUMECHO);
 	    expire = atoi(uident);
-	    if (HasUserPerm(PERM_BM | PERM_SYSOP))
-	    {
-		getdata(3, 0, 
-			"要從名單中清除有幾篇以上劣文的使用者？ (0=不清除)[0] ",
-			uident, 4, NUMECHO);
-	    }
+#ifdef ASSESS
+	    getdata(3, 0, 
+		    "要從名單中清除有幾篇以上劣文的使用者？ (0=不清除)[0] ",
+		    uident, 4, NUMECHO);
+#endif
 	    badpost = atoi(uident);
 
 	    // delete all users that not in list.
diff --git a/mbbsd/gamble.c b/mbbsd/gamble.c
index 93388e1f..a3d59236 100644
--- a/mbbsd/gamble.c
+++ b/mbbsd/gamble.c
@@ -258,7 +258,13 @@ openticket(int bid)
     do {
 	do {
 	    getdata(20, 0,
-		    ANSI_COLOR(1) "選擇中獎的號碼(0:不開獎 99:取消退錢)" ANSI_RESET ":", buf, 3, LCECHO);
+#ifdef USE_PFTERM
+		ANSI_COLOR(1) "選擇中獎的號碼(0:不開獎 99:取消退錢)" 
+		ANSI_RESET ":"
+#else
+		"選擇中獎的號碼(0:不開獎 99:取消退錢):"
+#endif
+		    , buf, 3, LCECHO);
 	    bet = atoi(buf);
 	    move(0, 0);
 	    clrtoeol();
@@ -267,7 +273,13 @@ openticket(int bid)
 	    unlockutmpmode();
 	    return 0;
 	}
-	getdata(21, 0, ANSI_COLOR(1) "再次確認輸入號碼" ANSI_RESET ":", buf, 3, LCECHO);
+	getdata(21, 0, 
+#ifdef USE_PFTERM
+		ANSI_COLOR(1) "再次確認輸入號碼" ANSI_RESET ":"
+#else
+		"再次確認輸入號碼:"
+#endif
+		, buf, 3, LCECHO);
     } while (bet != atoi(buf));
 
     // before we fork to process, 
diff --git a/mbbsd/ordersong.c b/mbbsd/ordersong.c
index 7163e1a5..8d41103d 100644
--- a/mbbsd/ordersong.c
+++ b/mbbsd/ordersong.c
@@ -45,15 +45,15 @@ do_order_song(void)
 	     "公然侮辱 誹謗\n"
 	     "若有上述違規情形，站方將保留決定是否公開播放的權利\n"
 	     "如不同意請按 (3) 離開。" ANSI_RESET "\n");
+	getdata(18, 0, 
 #ifdef USE_PFTERM
-	getdata(18, 0, "請選擇 " ANSI_COLOR(1) "1)" ANSI_RESET " 開始點歌、"
+		"請選擇 " ANSI_COLOR(1) "1)" ANSI_RESET " 開始點歌、"
 		ANSI_COLOR(1) "2)" ANSI_RESET " 看歌本、"
 		"或是 " ANSI_COLOR(1) "3)" ANSI_RESET " 離開: ",
-		ans, sizeof(ans), DOECHO);
 #else
-	getdata(18, 0, "請選擇 1)開始點歌 2)看歌本 3)離開: ",
-		ans, sizeof(ans), DOECHO);
+		"請選擇 1)開始點歌 2)看歌本 3)離開: ",
 #endif
+		ans, sizeof(ans), DOECHO);
 
 	if (ans[0] == '1')
 	    break;