remove MODE_ETC useless function

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

5 files changed, 6 insertions, 22 deletions

diff --git a/include/modes.h b/include/modes.h
index 4c629f2f..8c06317a 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -111,7 +111,6 @@
 #define MODE_BOARD       0x0008    /* 是否可以在 currboard 刪除、mark文章 */
 #define MODE_GROUPOP     0x0010    /* 是否為小組長 (可以在 MENU 開板) */
 #define MODE_DIGEST      0x0020    /* 是否為 digest mode */
-#define MODE_ETC         0x0040    /* 是否為 etc mode */
 #define MODE_SELECT      0x0080    /* 搜尋使用者標題 */
 #define MODE_DIRTY       0x0100    /* 是否更動過 userflag */
 
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index fb2480f8..19fd7c67 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1536,7 +1536,7 @@ recommend(int ent, fileheader_t * fhdr, char *direct)
 	return FULLUPDATE;
        }
 #ifndef DEBUG
-      if (now - lastrecommend < 40) {
+      if (!(currmode & MODE_BOARD)&& now - lastrecommend < 40) {
 	vmsg("離上次時間太近囉, 請多花點時間仔細閱\讀文章!");
 	return FULLUPDATE;
        }
@@ -2087,20 +2087,6 @@ board_digest()
     return NEWDIRECT;
 }
 
-int
-board_etc()
-{
-    if (!HAS_PERM(PERM_SYSOP))
-	return DONOTHING;
-    currmode ^= MODE_ETC;
-    if (currmode & MODE_ETC)
-	currmode &= ~MODE_POST;
-    else if (haspostperm(currboard))
-	currmode |= MODE_POST;
-
-    setbdir(currdirect, currboard);
-    return NEWDIRECT;
-}
 
 static int
 push_bottom(int ent, fileheader_t * fhdr, char *direct)
@@ -2364,7 +2350,7 @@ onekey_t read_comms[] = {
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, // 'A' 65
     bh_title_edit, // 'B'
-    board_etc, // 'C'
+    NULL, // 'C'
     del_range, // 'D'
     edit_post, // 'E'
     NULL, // 'F'
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 3c4dcbae..f85adfdc 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -51,7 +51,7 @@ showtitle(char *title, char *mid)
     clear();
     prints(TITLE_COLOR "【%s】%s\033[33m%s%s%s\033[3%s《",
 	   title, buf, mid, buf, " " + pad,
-	currmode & MODE_SELECT ? "6m系列" : currmode & MODE_ETC ? "5m其他" :
+	currmode & MODE_SELECT ? "6m系列" :
 	   currmode & MODE_DIGEST ? "2m文摘" : "7m看板");
 
     if (strcmp(currboard, lastboard)) {	/* change board */
@@ -68,7 +68,7 @@ showtitle(char *title, char *mid)
     else
 	prints("%s", currboard);
     prints("\033[3%dm》\033[0m\n", currmode & MODE_SELECT ? 6 :
-	   currmode & MODE_ETC ? 5 : currmode & MODE_DIGEST ? 2 : 7);
+	   currmode & MODE_DIGEST ? 2 : 7);
 }
 
 /* 動畫處理 */
diff --git a/mbbsd/read.c b/mbbsd/read.c
index b732ac0c..58ec63ca 100644
--- a/mbbsd/read.c
+++ b/mbbsd/read.c
@@ -472,7 +472,7 @@ i_read_key(onekey_t * rcmdlist, keeploc_t * locmem,
 		mode =  NEWDIRECT;
 	    }
 	    else
-		mode =  (currmode & MODE_ETC) ? board_etc() :
+		mode =  
 		    (currmode & MODE_DIGEST) ? board_digest() : DOQUIT;
 	    break;
         case Ctrl('L'):
@@ -644,7 +644,7 @@ i_read_key(onekey_t * rcmdlist, keeploc_t * locmem,
     case KEY_RIGHT:
 	ch = 'r';
     default:
-	if( ch == 'h' && currmode & (MODE_ETC | MODE_DIGEST) )
+	if( ch == 'h' && currmode & (MODE_DIGEST) )
 	    break;
 	if (ch > 0 && ch <= onekey_size) {
 	    int (*func)() = rcmdlist[ch - 1];
diff --git a/mbbsd/stuff.c b/mbbsd/stuff.c
index 14c83953..f59d8119 100644
--- a/mbbsd/stuff.c
+++ b/mbbsd/stuff.c
@@ -64,7 +64,6 @@ void
 setbdir(char *buf, char *boardname)
 {
     sprintf(buf, str_board_file, boardname[0], boardname,
-	    currmode & MODE_ETC ? ".ETC" :
 	    (currmode & MODE_DIGEST ? fn_mandex : str_dotdir));
 }