diff options
| -rw-r--r-- | include/perm.h | 2 | ||||
| -rw-r--r-- | mbbsd/mail.c | 4 | ||||
| -rw-r--r-- | mbbsd/menu.c | 16 | ||||
| -rw-r--r-- | mbbsd/var.c | 4 |
4 files changed, 15 insertions, 11 deletions
diff --git a/include/perm.h b/include/perm.h index cf838044..71a6fdb3 100644 --- a/include/perm.h +++ b/include/perm.h @@ -29,7 +29,7 @@ #define PERM_LOGUSER 000010000000 /* 觀察使用者行蹤 */ #define PERM_NOCITIZEN 000020000000 /* 搋奪公權 */ #define PERM_RELATION 000040000000 /* 公關組 */ -#define PERM_SMG 000100000000 /* 特務組 */ +#define PERM_ACCTREG 000100000000 /* 帳號審核組 */ #define PERM_PRG 000200000000 /* 程式組 */ #define PERM_ACTION 000400000000 /* 活動組 */ #define PERM_PAINT 001000000000 /* 美工組 */ diff --git a/mbbsd/mail.c b/mbbsd/mail.c index 997f1d0f..0d7e3fda 100644 --- a/mbbsd/mail.c +++ b/mbbsd/mail.c @@ -139,8 +139,8 @@ void setupmailusage() { // Ptt: get_sum_records is a bad function int max_keepmail = MAX_KEEPMAIL; - if (HAS_PERM(PERM_SYSSUBOP) || HAS_PERM(PERM_SMG) || - HAS_PERM(PERM_PRG) || HAS_PERM(PERM_ACTION) || HAS_PERM(PERM_PAINT)) { + if( HAS_PERM(PERM_SYSSUBOP | PERM_ACCTREG | PERM_PRG | + PERM_ACTION | PERM_PAINT) ){ mailsumlimit = 700; max_keepmail = 500; } else if (HAS_PERM(PERM_BM)) { diff --git a/mbbsd/menu.c b/mbbsd/menu.c index 7543ae8d..b592d4da 100644 --- a/mbbsd/menu.c +++ b/mbbsd/menu.c @@ -32,8 +32,8 @@ showtitle(char *title, char *mid) else if (currutmp->mailalert) { mid = "\033[41;5m 郵差來按鈴囉 " TITLE_COLOR; spc = 22; - } else if ((HAS_PERM(PERM_SYSOP) || HAS_PERM(PERM_ACCOUNTS)) && - (nreg = dashs((char *)fn_register) / 163) >100) { + } else if ( HAS_PERM(PERM_ACCTREG) && + (nreg = dashs((char *)fn_register) / 163) > 100 ) { snprintf(numreg, sizeof(numreg), "\033[41;5m 有 %03d 未審核 " TITLE_COLOR, nreg); @@ -316,10 +316,13 @@ const static commands_t adminlist[] = { {search_user_bypwd, PERM_SYSOP, "SSearch User 特殊搜尋使用者"}, {search_user_bybakpwd,PERM_SYSOP, "OOld User data 查閱\備份使用者資料"}, {m_board, PERM_SYSOP, "BBoard 設定看板"}, - {m_register, PERM_ACCOUNTS, "RRegister 審核註冊表單"}, + {m_register, PERM_ACCOUNTS|PERM_ACCTREG, + "RRegister 審核註冊表單"}, {cat_register, PERM_SYSOP, "CCatregister 無法審核時用的"}, - {x_file, PERM_SYSOP|PERM_VIEWSYSOP, "XXfile 編輯系統檔案"}, - {give_money, PERM_SYSOP|PERM_VIEWSYSOP, "GGivemoney 紅包雞"}, + {x_file, PERM_SYSOP|PERM_VIEWSYSOP, + "XXfile 編輯系統檔案"}, + {give_money, PERM_SYSOP|PERM_VIEWSYSOP, + "GGivemoney 紅包雞"}, {m_loginmsg, PERM_SYSOP, "MMessage Login 進站水球"}, #ifdef HAVE_MAILCLEAN {m_mclean, PERM_SYSOP, "MMail Clean 清理使用者個人信箱"}, @@ -405,7 +408,8 @@ const static commands_t userlist[] = { {u_register, PERM_BASIC, "RRegister 填寫《註冊申請單》"}, {u_list, PERM_SYSOP, "UUsers 列出註冊名單"}, #ifdef MERGEBBS - {m_sob, PERM_LOGUSER|PERM_SYSOP, "SSOB Import 沙灘變身術"}, +// {m_sob, PERM_LOGUSER|PERM_SYSOP, "SSOB Import 沙灘變身術"}, + {m_sob, PERM_BASIC, "SSOB Import 沙灘變身術"}, #endif {NULL, 0, NULL} }; diff --git a/mbbsd/var.c b/mbbsd/var.c index 91c042f1..70d8d38f 100644 --- a/mbbsd/var.c +++ b/mbbsd/var.c @@ -31,7 +31,7 @@ char * const str_permid[] = { "觀察使用者行蹤", /* PERM_LOGUSER */ "禠奪公權", /* PERM_NOCITIZEN */ "公關組", /* PERM_RELATION */ - "特務組", /* PERM_SMG */ + "帳號審核組", /* PERM_SMG */ "程式組", /* PERM_PRG */ "活動組", /* PERM_ACTION */ "美工組", /* PERM_PAINT */ @@ -611,7 +611,7 @@ word_t *toplev; #ifndef _BBS_UTIL_C_ /* menu.c */ const commands_t cmdlist[] = { - {admin, PERM_SYSOP|PERM_ACCOUNTS|PERM_BOARD|PERM_VIEWSYSOP, "00Admin 【 系統維護區 】"}, + {admin, PERM_SYSOP|PERM_ACCOUNTS|PERM_BOARD|PERM_VIEWSYSOP|PERM_ACCTREG, "00Admin 【 系統維護區 】"}, {Announce, 0, "AAnnounce 【 精華公佈欄 】"}, {Boards, 0, "FFavorite 【 我 的 最愛 】"}, {root_board, 0, "CClass 【 分組討論區 】"}, |