diff options
| -rw-r--r-- | pttbbs/include/pttstruct.h | 2 | ||||
| -rw-r--r-- | pttbbs/mbbsd/bbs.c | 8 | ||||
| -rw-r--r-- | pttbbs/mbbsd/edit.c | 7 | ||||
| -rw-r--r-- | pttbbs/mbbsd/var.c | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/pttbbs/include/pttstruct.h b/pttbbs/include/pttstruct.h index 4230d910..49ec901c 100644 --- a/pttbbs/include/pttstruct.h +++ b/pttbbs/include/pttstruct.h @@ -218,7 +218,7 @@ typedef struct boardheader_t { /* 256 bytes */ #define BRD_WARNEL 0x00000400 /* 連署機看板 */ #define BRD_TOP 0x00000800 /* 熱門看板群組 */ #define BRD_NORECOMMEND 0x00001000 /* 不可推薦 */ -#define BRD_BLOG 0x00002000 /* (已停用) 部落格 */ +#define BRD_ANGELANONYMOUS 0x00002000 /* 小天使可匿名 */ #define BRD_BMCOUNT 0x00004000 /* 板主設定列入記錄 */ #define BRD_SYMBOLIC 0x00008000 /* symbolic link to board */ #define BRD_NOBOO 0x00010000 /* 不可噓 */ diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c index a1f27313..9243fdbe 100644 --- a/pttbbs/mbbsd/bbs.c +++ b/pttbbs/mbbsd/bbs.c @@ -1322,9 +1322,9 @@ do_general(int garbage GCC_UNUSED) if (bp->brdattr & BRD_NOSELFDELPOST) edflags |= EDITFLAG_WARN_NOSELFDEL; -#if defined(PLAY_ANGEL) && defined(BN_ANGELPRAY) +#if defined(PLAY_ANGEL) // XXX 惡搞的 code。 - if (HasUserPerm(PERM_ANGEL) && strcmp(currboard, BN_ANGELPRAY) == 0) + if (HasUserPerm(PERM_ANGEL) && (currbrdattr & BRD_ANGELANONYMOUS)) { currbrdattr |= BRD_ANONYMOUS; currbrdattr |= BRD_DEFAULTANONYMOUS; @@ -3008,8 +3008,8 @@ recommend(int ent, fileheader_t * fhdr, const char *direct) logIP = 1; } -#if defined(PLAY_ANGEL) && defined(BN_ANGELPRAY) && defined(ANGEL_ANONYMOUS_COMMENT) - if (HasUserPerm(PERM_ANGEL) && currboard && strcmp(currboard, BN_ANGELPRAY) == 0 && +#if defined(PLAY_ANGEL) + if (HasUserPerm(PERM_ANGEL) && (bp->brdattr & BRD_ANGELANONYMOUS) && vans("要使用小天使匿名推文嗎？ [Y/n]: ") != 'n') { // angel push diff --git a/pttbbs/mbbsd/edit.c b/pttbbs/mbbsd/edit.c index d9601b4d..6256094b 100644 --- a/pttbbs/mbbsd/edit.c +++ b/pttbbs/mbbsd/edit.c @@ -1623,13 +1623,12 @@ write_header(FILE * fp, const char *mytitle) char ans[3]; int use_userid = 1; -#if defined(PLAY_ANGEL) && defined(BN_ANGELPRAY) +#if defined(PLAY_ANGEL) // dirty hack here... sorry - if (HasUserPerm(PERM_ANGEL) && currboard && - strcmp(currboard, BN_ANGELPRAY) == 0) { + if (HasUserPerm(PERM_ANGEL) && (currbrdattr & BRD_ANGELANONYMOUS)) { angel_load_my_fullnick(default_name, sizeof(default_name)); } -#endif // PLAY_ANGEL && BN_ANGELPRAY +#endif // PLAY_ANGEL do { getdata_str(3, 0, defanony ? diff --git a/pttbbs/mbbsd/var.c b/pttbbs/mbbsd/var.c index e570f133..7e281afa 100644 --- a/pttbbs/mbbsd/var.c +++ b/pttbbs/mbbsd/var.c @@ -55,7 +55,7 @@ const char * const str_permboard[] = { "已警告要廢除", /* BRD_WARNEL */ "熱門看板群組", /* BRD_TOP */ "不可推薦", /* BRD_NORECOMMEND */ - "保留", /* was: BRD_BLOG */ + "小天使可匿名", /* BRD_ANGELANONYMOUS */ "板主設定列入記錄", /* BRD_BMCOUNT */ "連結看板", /* BRD_SYMBOLIC */ "不可噓", /* BRD_NOBOO */ |