From 17c1ff808167979cb1bd3321807009859f9e0558 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 10 Mar 2008 15:24:51 +0000
Subject: - BM should have permission, even over18. Also we prevent over18 BMs
 setting this property.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3983 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/board.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'mbbsd/board.c')

diff --git a/mbbsd/board.c b/mbbsd/board.c
index d42d0033..f5cfe0de 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -156,10 +156,6 @@ HasBoardPerm(boardheader_t *bptr)
     if (HasUserPerm(PERM_SYSOP))
 	return 1;
 
-    /* 十八禁看板 */
-    if( (brdattr & BRD_OVER18) && !over18 )
-	return 0;
-
     /* 板主 */
     if( is_BM_cache(bptr - bcache + 1) ) /* XXXbid */
 	return 1;
@@ -175,6 +171,10 @@ HasBoardPerm(boardheader_t *bptr)
 	    return 1;
     }
 
+    /* 十八禁看板 */
+    if( (brdattr & BRD_OVER18) && !over18 )
+	return 0;
+
     /* 限制閱讀權限 */
     if (level && !(brdattr & BRD_POSTMASK) && !HasUserPerm(level))
 	return 0;
@@ -603,8 +603,13 @@ b_config(void)
 		break;
 #endif
 	    case '8':
-		bp->brdattr ^= BRD_OVER18;
-		touched = 1;		
+		if (!over18)
+		{
+		    vmsg("板主本身未滿 18 歲。");
+		} else {
+		    bp->brdattr ^= BRD_OVER18;
+		    touched = 1;		
+		}
 		break;
 
 	    case 'v':
-- 
cgit v1.2.3