merge from trunk.

git-svn-id: http://opensvn.csie.org/pttbbs/branches/scw.angel@1995 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 6 insertions, 25 deletions

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index bafff3fb..3db2800b 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -5,25 +5,6 @@
 static int      refscreen = NA;
 extern char    *boardprefix;
 extern struct utmpfile_t *utmpshm;
-
-int
-egetch()
-{
-    int             rval;
-
-    while (1) {
-	rval = igetkey();
-	if (talkrequest) {
-	    talkreply();
-	    refscreen = YEA;
-	    return rval;
-	}
-	if (rval != Ctrl('L'))
-	    return rval;
-	redoscr();
-    }
-}
-
 extern char    *fn_board;
 extern char     board_hidden_status;
 
@@ -70,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 */
@@ -87,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);
 }
 
 /* 動畫處理 */
@@ -314,7 +295,7 @@ domenu(int cmdmode, char *cmdtitle, int cmd, commands_t cmdtable[])
 		pos++;
 
 	cursor_show(menu_row + pos, menu_column);
-    } while (((cmd = egetch()) != EOF) || refscreen);
+    } while (((cmd = igetch()) != EOF) || refscreen);
 
     abort_bbs(0);
 }
@@ -399,7 +380,7 @@ static commands_t namelist[] = {
 static commands_t userlist[] = {
     {u_info, PERM_LOGINOK,          "IInfo          設定個人資料與密碼"},
     {calendar, PERM_LOGINOK,          "CCalendar      個人行事曆"},
-    {u_editcalendar, PERM_LOGINOK,    "EEditCalendar  編輯個人行事曆"},
+    {u_editcalendar, PERM_LOGINOK,    "CDEditCalendar  編輯個人行事曆"},
     {u_loginview, PERM_LOGINOK,     "LLogin View    選擇進站畫面"},
     {u_ansi, 0, "AANSI          切換 ANSI \033[36m彩\033[35m色\033[37m/"
      "\033[30;47m黑\033[1;37m白\033[m模示"},
@@ -410,9 +391,9 @@ static commands_t userlist[] = {
     {u_editplan, PERM_LOGINOK,      "QQueryEdit     編輯名片檔"},
     {u_editsig, PERM_LOGINOK,       "SSignature     編輯簽名檔"},
 #if HAVE_FREECLOAK
-    {u_cloak, PERM_LOGINOK,           "CCloak         隱身術"},
+    {u_cloak, PERM_LOGINOK,           "KKCloak         隱身術"},
 #else
-    {u_cloak, PERM_CLOAK,           "CCloak         隱身術"},
+    {u_cloak, PERM_CLOAK,           "KKCloak         隱身術"},
 #endif
     {u_register, PERM_BASIC,        "RRegister      填寫《註冊申請單》"},
     {u_list, PERM_SYSOP,            "UUsers         列出註冊名單"},