better readability.

real => adminmode,
HAS_PERM() => HasUserPerm(),
HasPerm()  => HasBoardPerm().


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

1 files changed, 12 insertions, 12 deletions

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index 77c75a27..ae543d33 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -416,14 +416,14 @@ m_mod_board(char *bname)
     /* Ptt 這邊斷行會檔到下面 */
     move(9, 0);
     snprintf(genbuf, sizeof(genbuf), "(E)設定 (V)違法/解除%s%s [Q]取消？",
-	    HAS_PERM(PERM_SYSOP |
+	    HasUserPerm(PERM_SYSOP |
 		     PERM_BOARD) ? " (B)Vote (S)救回 (C)合併 (G)賭盤解卡" : "",
-	    HAS_PERM(PERM_SYSSUBOP | PERM_BOARD) ? " (D)刪除" : "");
+	    HasUserPerm(PERM_SYSSUBOP | PERM_BOARD) ? " (D)刪除" : "");
     getdata(10, 0, genbuf, ans, 3, LCECHO);
 
     switch (*ans) {
     case 'g':
-	if (HAS_PERM(PERM_SYSOP | PERM_BOARD)) {
+	if (HasUserPerm(PERM_SYSOP | PERM_BOARD)) {
 	    char            path[256];
 	    setbfile(genbuf, bname, FN_TICKET_LOCK);
 	    setbfile(path, bname, FN_TICKET_END);
@@ -431,7 +431,7 @@ m_mod_board(char *bname)
 	}
 	break;
     case 's':
-	if (HAS_PERM(PERM_SYSOP | PERM_BOARD)) {
+	if (HasUserPerm(PERM_SYSOP | PERM_BOARD)) {
 	  snprintf(genbuf, sizeof(genbuf),
 		   BBSHOME "/bin/buildir boards/%c/%s &",
 		   bh.brdname[0], bh.brdname);
@@ -439,7 +439,7 @@ m_mod_board(char *bname)
 	}
 	break;
     case 'c':
-	if (HAS_PERM(PERM_SYSOP)) {
+	if (HasUserPerm(PERM_SYSOP)) {
 	   char frombname[20], fromdir[256];
 #ifdef MERGEBBS
 	   if(getans("是否匯入SOB看板? (y/N)")=='y')
@@ -465,7 +465,7 @@ m_mod_board(char *bname)
 	}
 	break;
     case 'b':
-	if (HAS_PERM(PERM_SYSOP | PERM_BOARD)) {
+	if (HasUserPerm(PERM_SYSOP | PERM_BOARD)) {
 	    char            bvotebuf[10];
 
 	    memcpy(&newbh, &bh, sizeof(bh));
@@ -496,7 +496,7 @@ m_mod_board(char *bname)
 	}
 	break;
     case 'd':
-	if (!HAS_PERM(PERM_SYSOP | PERM_BOARD))
+	if (!HasUserPerm(PERM_SYSOP | PERM_BOARD))
 	    break;
 	getdata_str(9, 0, msg_sure_ny, genbuf, 3, LCECHO, "N");
 	if (genbuf[0] != 'y' || !bname[0])
@@ -559,7 +559,7 @@ m_mod_board(char *bname)
 	    strlcpy(newbh.BM, genbuf, sizeof(newbh.BM));
 	}
 #ifdef CHESSCOUNTRY
-	if (HAS_PERM(PERM_SYSOP)) {
+	if (HasUserPerm(PERM_SYSOP)) {
 	    snprintf(genbuf, sizeof(genbuf), "%d", bh.chesscountry);
 	    if (getdata_str(16, 0, "設定棋國 (0)無 (1)五子棋 (2)象棋", ans,
 			sizeof(ans), LCECHO, genbuf)){
@@ -570,7 +570,7 @@ m_mod_board(char *bname)
 	    }
 	}
 #endif /* defined(CHESSCOUNTRY) */
-	if (HAS_PERM(PERM_SYSOP|PERM_BOARD)) {
+	if (HasUserPerm(PERM_SYSOP|PERM_BOARD)) {
 	    move(1, 0);
 	    clrtobot();
 	    newbh.brdattr = setperms(newbh.brdattr, str_permboard);
@@ -584,7 +584,7 @@ m_mod_board(char *bname)
 	else
 	    strncpy(newbh.title + 5, "●", 2);
 
-	if (HAS_PERM(PERM_SYSOP|PERM_BOARD) && !(newbh.brdattr & BRD_HIDE)) {
+	if (HasUserPerm(PERM_SYSOP|PERM_BOARD) && !(newbh.brdattr & BRD_HIDE)) {
 	    getdata_str(14, 0, "設定讀寫權限(Y/N)？", ans, sizeof(ans), LCECHO, "N");
 	    if (*ans == 'y') {
 		getdata_str(15, 0, "限制 [R]閱\讀 (P)發表？", ans, sizeof(ans), LCECHO,
@@ -848,7 +848,7 @@ m_newbrd(int whatclass, int recover)
     }
     newboard.brdattr = BRD_NOTRAN;
 
-    if (HAS_PERM(PERM_SYSOP)) {
+    if (HasUserPerm(PERM_SYSOP)) {
 	move(1, 0);
 	clrtobot();
 	newboard.brdattr = setperms(newboard.brdattr, str_permboard);
@@ -878,7 +878,7 @@ m_newbrd(int whatclass, int recover)
     }
 #endif /* defined(CHESSCOUNTRY) */
 
-    if (HAS_PERM(PERM_SYSOP) && !(newboard.brdattr & BRD_HIDE)) {
+    if (HasUserPerm(PERM_SYSOP) && !(newboard.brdattr & BRD_HIDE)) {
 	getdata_str(14, 0, "設定讀寫權限(Y/N)？", ans, sizeof(ans), LCECHO, "N");
 	if (*ans == 'y') {
 	    getdata_str(15, 0, "限制 [R]閱\讀 (P)發表？", ans, sizeof(ans), LCECHO, "R");