diff options
| -rw-r--r-- | include/pttstruct.h | 2 | ||||
| -rw-r--r-- | mbbsd/admin.c | 6 | ||||
| -rw-r--r-- | mbbsd/bbs.c | 16 | ||||
| -rw-r--r-- | mbbsd/var.c | 12 | ||||
| -rw-r--r-- | sample/pttbbs.conf | 7 |
5 files changed, 30 insertions, 13 deletions
diff --git a/include/pttstruct.h b/include/pttstruct.h index 2104cf0e..4ba8f16b 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -217,7 +217,7 @@ typedef struct boardheader_t { #define BRD_RESTRICTEDPOST 001000000 /* 板友才能發文 */ #define BRD_GUESTPOST 002000000 /* guest能 post */ #define BRD_COOLDOWN 004000000 /* 冷靜 */ -#define BRD_NOCPLOG 010000000 /* 不會自動留轉錄記錄 */ +#define BRD_CPLOG 010000000 /* 自動留轉錄記錄 */ #define BRD_LINK_TARGET(x) ((x)->postexpire) #define GROUPOP() (currmode & MODE_GROUPOP) diff --git a/mbbsd/admin.c b/mbbsd/admin.c index 65199e00..d1470a6e 100644 --- a/mbbsd/admin.c +++ b/mbbsd/admin.c @@ -847,6 +847,9 @@ m_newbrd(int whatclass, int recover) return -1; } newboard.brdattr = BRD_NOTRAN; +#ifdef DEFAULT_AUTOCPLOG + newboard.brdattr |= BRD_CPLOG; +#endif if (HasUserPerm(PERM_SYSOP)) { move(1, 0); @@ -857,7 +860,10 @@ m_newbrd(int whatclass, int recover) } getdata(9, 0, "是看板? (N:目錄) (Y/n)：", genbuf, 3, LCECHO); if (genbuf[0] == 'n') + { newboard.brdattr |= BRD_GROUPBOARD; + newboard.brdattr &= ~BRD_CPLOG; + } if (newboard.brdattr & BRD_GROUPBOARD) strncpy(newboard.title + 5, "Σ", 2); diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index 4fc6c17b..9e57e65f 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -1169,9 +1169,9 @@ cross_post(int ent, fileheader_t * fhdr, const char *direct) addsignature(xptr, 0); fclose(xptr); -#ifdef AUTO_CP_LOG +#ifdef USE_AUTOCPLOG /* add cp log. bp is currboard now. */ - if(!(bp->brdattr & BRD_NOCPLOG)) + if(bp->brdattr & BRD_CPLOG) { char buf[MAXPATHLEN]; char bname[STRLEN] = ""; @@ -2571,21 +2571,21 @@ b_changerecommend(int ent, const fileheader_t * fhdr, const char *direct) #else optCmds[0] = ""; #endif -#ifdef AUTO_CP_LOG +#ifdef USE_AUTOCPLOG prints( " " ANSI_COLOR(1;36) "x" ANSI_RESET " - 轉錄文章時 %s " ANSI_RESET "自動記錄\n", - (bp->brdattr & BRD_NOCPLOG) ? - "不會" : ANSI_COLOR(1)"會"); + (bp->brdattr & BRD_CPLOG) ? + ANSI_COLOR(1)"會" : "不會" ); #else - optCmds[1] = ""; optDesc[1] = ""; + optCmds[1] = ""; #endif switch(tolower(getans("請按 h/r%s%s 改變設定,其它鍵結束: ", optCmds[0], optCmds[1]))) { -#ifdef AUTO_CP_LOG +#ifdef USE_AUTOCPLOG case 'x': - bp->brdattr ^= BRD_NOCPLOG; + bp->brdattr ^= BRD_CPLOG; touched = 1; break; #endif diff --git a/mbbsd/var.c b/mbbsd/var.c index 8da44567..989d2a15 100644 --- a/mbbsd/var.c +++ b/mbbsd/var.c @@ -62,8 +62,16 @@ const char * const str_permboard[] = { "預設 Local Save", /* BRD_LOCALSAVE */ "限板友發文", /* BRD_RESTRICTEDPOST */ "Guest可以發表", /* BRD_GUESTPOST */ - "沒想到", - "沒想到", +#ifdef USE_COOLDOWN + "冷靜", /* BRD_COOLDOWN */ +#else + "冷靜(本站無效)", /* BRD_COOLDOWN */ +#endif +#ifdef USE_AUTOCPLOG + "自動留轉錄記錄", /* BRD_CPLOG */ +#else + "轉錄記錄(本站無效)", /* BRD_CPLOG */ +#endif "沒想到", "沒想到", "沒想到", diff --git a/sample/pttbbs.conf b/sample/pttbbs.conf index 3263bbc9..27b48713 100644 --- a/sample/pttbbs.conf +++ b/sample/pttbbs.conf @@ -185,8 +185,11 @@ /* 若定義, 則使用舊式推文 */ #define OLDRECOMMEND -/* 若定義, 轉錄會在原文留下記錄 */ -#define AUTO_CP_LOG +/* 若定義, 可設定轉錄自動在原文留下記錄 */ +#define USE_AUTOCPLOG + +/* 若定義, 新板設定自動開記錄，不過 USE_AUTOCPLOG 還是要開才有用 */ +#define DEFAULT_AUTOCPLOG /* 贈送信箱 */ //#define ADD_EXMAILBOX 100 |