diff options
| author | jack <jack@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-03 05:58:08 +0800 |
|---|---|---|
| committer | jack <jack@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-05-03 05:58:08 +0800 |
| commit | e443776eb7025c569df22f801965f0ec84798e35 (patch) | |
| tree | a6200d5ccc57109dfece0b30180da83a9915785c /include/perm.h | |
| parent | 886fd091d3cc9e39e342e13e994fb63acb30c34b (diff) | |
| download | pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.gz pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.bz2 pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.lz pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.xz pttbbs-e443776eb7025c569df22f801965f0ec84798e35.tar.zst pttbbs-e443776eb7025c569df22f801965f0ec84798e35.zip | |
merge trunk to branches and corrected confliction
git-svn-id: http://opensvn.csie.org/pttbbs/branches/Jaky.i18n@1919 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'include/perm.h')
| -rw-r--r-- | include/perm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/perm.h b/include/perm.h index 2d676bae..02c03d0f 100644 --- a/include/perm.h +++ b/include/perm.h @@ -11,7 +11,7 @@ #define PERM_CLOAK 000000000100 /* 目前隱形中 */ #define PERM_SEECLOAK 000000000200 /* 看見忍者 */ #define PERM_XEMPT 000000000400 /* 永久保留帳號 */ -#define PERM_DENYPOST 000000001000 /* 站長隱身術 */ +#define PERM_SYSOPHIDE 000000001000 /* 站長隱身術 */ #define PERM_BM 000000002000 /* 板主 */ #define PERM_ACCOUNTS 000000004000 /* 帳號總管 */ #define PERM_CHATROOM 000000010000 /* 聊天室總管 */ @@ -51,8 +51,7 @@ #define HAS_PERM(x) ((x) ? cuser.userlevel & (x) : 1) #define HAVE_PERM(x) (cuser.userlevel&(x)) -#define PERM_HIDE(u) ((u)->userlevel & PERM_SYSOP && \ - (u)->userlevel & PERM_DENYPOST) +#define PERM_HIDE(u) (u && (u)->userlevel & PERM_SYSOPHIDE) #define IS_BOARD(bptr) ((bptr)->brdname[0] && \ !((bptr)->brdattr & BRD_GROUPBOARD)) |