diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2014-07-21 18:15:53 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2014-07-21 18:15:53 +0800 |
| commit | 73365042d94346292533287922160e4c2edb5cee (patch) | |
| tree | 98239347ba7ddfbbb81550ece475ac347caaa007 | |
| parent | 0856b6d4493f8f7134db7205765251db86246bd2 (diff) | |
| download | pttbbs-73365042d94346292533287922160e4c2edb5cee.tar pttbbs-73365042d94346292533287922160e4c2edb5cee.tar.gz pttbbs-73365042d94346292533287922160e4c2edb5cee.tar.bz2 pttbbs-73365042d94346292533287922160e4c2edb5cee.tar.lz pttbbs-73365042d94346292533287922160e4c2edb5cee.tar.xz pttbbs-73365042d94346292533287922160e4c2edb5cee.tar.zst pttbbs-73365042d94346292533287922160e4c2edb5cee.zip | |
Revise local flags and don't disturb user if they're posting on local boards.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk@6023 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/include/common.h | 1 | ||||
| -rw-r--r-- | pttbbs/mbbsd/bbs.c | 2 | ||||
| -rw-r--r-- | pttbbs/mbbsd/board.c | 2 | ||||
| -rw-r--r-- | pttbbs/mbbsd/edit.c | 12 |
4 files changed, 7 insertions, 10 deletions
diff --git a/pttbbs/include/common.h b/pttbbs/include/common.h index ad1fc099..7d02dfc8 100644 --- a/pttbbs/include/common.h +++ b/pttbbs/include/common.h @@ -246,6 +246,7 @@ #define EDITFLAG_KIND_SENDMAIL (0x00000040) #define EDITFLAG_KIND_MAILLIST (0x00000080) #define EDITFLAG_WARN_NOSELFDEL (0x00000100) +#define EDITFLAG_ALLOW_LOCAL (0x00000200) #define EDIT_ABORTED -1 /* ----------------------------------------------------- */ diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c index 57d00347..48275b25 100644 --- a/pttbbs/mbbsd/bbs.c +++ b/pttbbs/mbbsd/bbs.c @@ -1419,6 +1419,8 @@ do_post_article(int edflags) edflags |= solveEdFlagByBoard(currboard, edflags); if (bp->brdattr & BRD_NOSELFDELPOST) edflags |= EDITFLAG_WARN_NOSELFDEL; + if (!(bp->brdattr & BRD_NOTRAN)) + edflags |= EDITFLAG_ALLOW_LOCAL; #if defined(PLAY_ANGEL) // XXX 惡搞的 code。 diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c index 9654f739..f80ca7ab 100644 --- a/pttbbs/mbbsd/board.c +++ b/pttbbs/mbbsd/board.c @@ -482,7 +482,7 @@ b_config(void) prints( " " ANSI_COLOR(1;36) "L" ANSI_RESET " - 若有轉信則發文時預設 %s " ANSI_RESET "\n", (bp->brdattr & BRD_LOCALSAVE) ? - "站內存檔(不轉出)" : ANSI_COLOR(1)"站際存檔(轉出)" ); + "不轉出" : ANSI_COLOR(1)"自動轉出" ); // use '8' instead of '1', to prevent 'l'/'1' confusion prints( " " ANSI_COLOR(1;36) "8" ANSI_RESET diff --git a/pttbbs/mbbsd/edit.c b/pttbbs/mbbsd/edit.c index acc91273..806f8ee2 100644 --- a/pttbbs/mbbsd/edit.c +++ b/pttbbs/mbbsd/edit.c @@ -1918,17 +1918,11 @@ write_file(const char *fpath, int saveheader, int *islocal, char mytitle[STRLEN] #endif // EDIT_UPLOAD_ALLOWALL // common trail - - if (flags & (EDITFLAG_KIND_NEWPOST | EDITFLAG_KIND_REPLYPOST)) { - // TODO 應該要 check 看是不是在連線看板發表，有再顯示這個腦殘 L. - // 可惜目前轉信資訊並無法簡單的在 mbbsd 裡得到，只好一律顯示。 - // P.S: 雖然後面已經有又大又彩色又清楚的 warn_prompt 提示了，聽說有些 - // 人還是會搞不清楚狀況不知道站內是三小。 話說回來如果 REPLYPOST - // 加上 mail 的話.... 那個限站內可能更讓人誤會。 + if (flags & EDITFLAG_ALLOW_LOCAL) { if (local_article) - outs("[L]限站內 (S)儲存"); + outs("[L]儲存 (S)儲存+轉信"); else - outs("[S]儲存 (L)限站內"); + outs("[S]儲存+轉信 (L)儲存"); } else { outs("[S]儲存"); } |