use macro instead for class_bid recognition

put class_bid in file scope (board.c)


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

4 files changed, 40 insertions, 23 deletions

diff --git a/include/proto.h b/include/proto.h
index 7daa496d..8d358443 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,7 @@ char *setstate(char *state);
 /* admin */
 int m_loginmsg(void);
 int m_mod_board(char *bname);
-int m_newbrd(int recover);
+int m_newbrd(int whatclass, int recover);
 int scan_register_form(const char *regfile, int automode, int neednum);
 int m_user(void);
 int search_user_bypwd(void);
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index ed3b9cec..e2486ff8 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -796,8 +796,14 @@ static int add_board_record(const boardheader_t *board)
     return 0;
 }
 
+/**
+ * open a new board
+ * @param whatclass In which sub class
+ * @param recover   Forcely open a new board, often used for recovery.
+ * @return -1 if failed
+ */
 int
-m_newbrd(int recover)
+m_newbrd(int whatclass, int recover)
 {
     boardheader_t   newboard;
     char            ans[4];
@@ -806,7 +812,7 @@ m_newbrd(int recover)
     stand_title("建立新板");
     memset(&newboard, 0, sizeof(newboard));
 
-    newboard.gid = class_bid;
+    newboard.gid = whatclass;
     if (newboard.gid == 0) {
 	vmsg("請先選擇一個類別再開板!");
 	return -1;
@@ -887,7 +893,7 @@ m_newbrd(int recover)
     }
 
     add_board_record(&newboard);
-    getbcache(class_bid)->childcount = 0;
+    getbcache(whatclass)->childcount = 0;
     pressanykey();
     setup_man(&newboard, NULL);
     outs("\n新板成立");
diff --git a/mbbsd/board.c b/mbbsd/board.c
index ab7fc4b7..743a8bb6 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -23,6 +23,20 @@ typedef struct {
     unsigned char   myattr;
 } __attribute__ ((packed)) boardstat_t;
 
+/**
+ * class_bid 的意義
+ *   class_bid < 0   熱門看板
+ *   class_bid = 0   我的最愛
+ *   class_bid = 1   分類看板
+ *   class_bid > 1   其他目錄
+ */
+#define IN_HOTBOARD()	(class_bid < 0)
+#define IN_FAVORITE()	(class_bid == 0)
+#define IN_CLASSROOT()	(class_bid == 1)
+#define IN_SUBCLASS()	(class_bid > 1)
+#define IN_CLASS()	(class_bid > 0)
+static int      class_bid = 0;
+
 static boardstat_t *nbrd = NULL;
 static char	choose_board_depth = 0;
 static short    brdnum;
@@ -222,7 +236,7 @@ load_boards(char *key)
     int             i, n, bid;
     int             state;
 
-    if (class_bid > 0) {
+    if (IN_CLASS()) {
 	bptr = getbcache(class_bid);
 	if (bptr->firstchild[type] == 0 )
 	    load_uidofgid(class_bid, type);
@@ -232,7 +246,7 @@ load_boards(char *key)
         free(nbrd);
 	nbrd = NULL;
     }
-    if (class_bid <= 0) {
+    if (!IN_CLASS()) {
 	if(IS_LISTING_FAV()){
 	    fav_t   *fav = get_current_fav();
 	    int     nfav = get_data_number(fav);
@@ -290,7 +304,7 @@ load_boards(char *key)
 		addnewbrdstat(0, 0);
 	}
 #if HOTBOARDCACHE
-	else if( class_bid == -1 ){
+	else if(IN_HOTBOARD()){
 	    nbrd = (boardstat_t *)malloc(sizeof(boardstat_t) * SHM->nHOTs);
 	    for( i = 0 ; i < SHM->nHOTs ; ++i ) {
 		if(SHM->HBcache[i] == -1)
@@ -310,7 +324,7 @@ load_boards(char *key)
 		    !((state = HasPerm(bptr)) || GROUPOP()) ||
 		    TITLE_MATCH(bptr, key)
 #if ! HOTBOARDCACHE
-		    || (class_bid == -1 && bptr->nuser < 5)
+		    || (IN_HOTBOARD() && bptr->nuser < 5)
 #endif
 		    )
 		    continue;
@@ -318,7 +332,7 @@ load_boards(char *key)
 	    }
 	}
 #if ! HOTBOARDCACHE
-	if (class_bid == -1)
+	if (IN_HOTBOARD())
 	    qsort(nbrd, brdnum, sizeof(boardstat_t), cmpboardfriends);
 #endif
     } else { /* load boards of a subclass */
@@ -452,7 +466,7 @@ static void
 show_brdlist(int head, int clsflag, int newflag)
 {
     int             myrow = 2;
-    if (unlikely(class_bid == 1)) {
+    if (unlikely(IN_CLASSROOT())) {
 	currstat = CLASS;
 	myrow = 6;
 	showtitle("分類看板", BBSName);
@@ -526,7 +540,7 @@ show_brdlist(int head, int clsflag, int newflag)
 		    continue;
 		}
 
-		if (class_bid == 1)
+		if (IN_CLASSROOT())
 		    outs("          ");
 		else {
 		    if (!GROUPOP() && !HasPerm(B_BH(ptr))) {
@@ -549,7 +563,7 @@ show_brdlist(int head, int clsflag, int newflag)
 			prints("%6d%s", (int)(B_TOTAL(ptr)),
 				unread[ptr->myattr & NBRD_UNREAD ? 1 : 0]);
 		}
-		if (class_bid != 1) {
+		if (!IN_CLASSROOT()) {
 		    prints("%s%-13s\033[m%s%5.5s\033[0;37m%2.2s\033[m"
 			    "%-34.34s",
 			    ((!(cuser.uflag2 & FAVNOHILIGHT) &&
@@ -671,7 +685,7 @@ choose_board(int newflag)
 		}
 		if (HAS_PERM(PERM_SYSOP) || GROUPOP()) {
                     if (paste_taged_brds(class_bid) || 
-		        m_newbrd(0) == -1)
+		        m_newbrd(class_bid, 0) == -1)
 			break;
 		    brdnum = -1;
 		    continue;
@@ -705,7 +719,7 @@ choose_board(int newflag)
 	    head = (num / p_lines) * p_lines;
 	    show_brdlist(head, 0, newflag);
 	}
-	if (class_bid == 1)
+	if (IN_CLASSROOT())
 	    ch = cursor_key(7 + num - head, 10);
 	else
 	    ch = cursor_key(3 + num - head, 0);
@@ -799,7 +813,7 @@ choose_board(int newflag)
 	    break;
 	case 'F':
 	case 'f':
-	    if (class_bid>0 && HAS_PERM(PERM_SYSOP)) {
+	    if (IN_SUBCLASS() && HAS_PERM(PERM_SYSOP)) {
 		getbcache(class_bid)->firstchild[cuser.uflag & BRDSORT_FLAG ? 1 : 0] = 0;
 		brdnum = -1;
 	    }
@@ -870,7 +884,7 @@ choose_board(int newflag)
                 brdnum = -1;
             break;
 	case 'L':
-	    if (HAS_PERM(PERM_SYSOP) && class_bid > 0) {
+	    if (HAS_PERM(PERM_SYSOP) && IN_SUBCLASS()) {
 		if (make_symbolic_link_interactively(class_bid) < 0)
 		    break;
 		brdnum = -1;
@@ -925,7 +939,7 @@ choose_board(int newflag)
 	    break;
 	case 'M':
 	    if (HAS_PERM(PERM_LOGINOK)){
-		if (class_bid == 0 && IS_LISTING_FAV()){
+		if (IN_FAVORITE() && IS_LISTING_FAV()){
 		    imovefav(num);
 		    brdnum = -1;
 		    head = 9999;
@@ -1051,18 +1065,18 @@ choose_board(int newflag)
 	    break;
 	case 'R':
 	    if (HAS_PERM(PERM_SYSOP) || GROUPOP()) {
-		m_newbrd(1);
+		m_newbrd(class_bid, 1);
 		brdnum = -1;
 	    }
 	    break;
 	case 'B':
 	    if (HAS_PERM(PERM_SYSOP) || GROUPOP()) {
-		m_newbrd(0);
+		m_newbrd(class_bid, 0);
 		brdnum = -1;
 	    }
 	    break;
 	case 'W':
-	    if (class_bid > 0 &&
+	    if (IN_SUBCLASS() &&
 		(HAS_PERM(PERM_SYSOP) || GROUPOP())) {
 		setbpath(buf, getbcache(class_bid)->brdname);
 		mkdir(buf, 0755);	/* Ptt:開群組目錄 */
diff --git a/mbbsd/var.c b/mbbsd/var.c
index 58f54e54..81dd207c 100644
--- a/mbbsd/var.c
+++ b/mbbsd/var.c
@@ -353,9 +353,6 @@ SHM_t          *SHM;
 boardheader_t  *bcache;
 userinfo_t     *currutmp;
 
-/* board.c */
-int             class_bid = 0;
-
 /* brc.c */
 int             brc_num;
 time4_t         brc_list[BRC_MAXNUM];