diff options
| -rw-r--r-- | pttbbs/include/common.h | 3 | ||||
| -rw-r--r-- | pttbbs/mbbsd/mail.c | 11 | ||||
| -rw-r--r-- | pttbbs/mbbsd/mbbsd.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/record.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/user.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/pttbbs/include/common.h b/pttbbs/include/common.h index 101722ab..66fa94ec 100644 --- a/pttbbs/include/common.h +++ b/pttbbs/include/common.h @@ -28,7 +28,7 @@ #define FN_VISABLE "visable" // 不知道是誰拼錯的，將錯就錯吧... #define FN_USIES "usies" /* BBS log */ #define FN_DIR ".DIR" -#define FN_BOARD ".BRD" /* board list */ +#define FN_BOARD ".BRD" /* board list */ #define FN_USEBOARD "usboard" /* 看板統計 */ #define FN_TOPSONG "etc/topsong" #define FN_OVERRIDES "overrides" @@ -45,6 +45,7 @@ #define FN_USERMEMO "memo.txt" // 使用者個人記事本 #define FN_BADLOGIN "logins.bad" // in BBSHOME & user directory #define FN_RECENTLOGIN "logins.recent" // in user directory +#define FN_FORWARD ".forward" /* auto forward */ #ifndef SZ_RECENTLOGIN #define SZ_RECENTLOGIN (16000) // size of max recent log before rotation #endif diff --git a/pttbbs/mbbsd/mail.c b/pttbbs/mbbsd/mail.c index 52fac976..5deaa28c 100644 --- a/pttbbs/mbbsd/mail.c +++ b/pttbbs/mbbsd/mail.c @@ -468,8 +468,7 @@ setforward(void) { char buf[PATHLEN], ip[50] = "", yn[4]; FILE *fp; const char *fn_forward_auth = ".secure/forward_auth", - *fn_forward_auth_dir = ".secure", - *fn_forward = ".forward"; + *fn_forward_auth_dir = ".secure"; char auth_code[16] = ""; time4_t auth_time = 0; const char *prefix = "va"; @@ -505,10 +504,10 @@ setforward(void) { if (getdata(4, 0, "請輸入上面轉寄信箱收到的的驗證碼: ", input, sizeof(input), LCECHO) && strcmp(auth_code, input) == 0) { - outs(ANSI_COLOR(1;32) "確認驗證成功\" ANSI_RESET "\n"); + outs(ANSI_COLOR(1;32) "確認驗證成功\ " ANSI_RESET "\n"); unlink(buf); // write auth! - setuserfile(buf, fn_forward); + setuserfile(buf, FN_FORWARD); fp = fopen(buf, "wt"); if (fp) { fputs(ip, fp); @@ -554,7 +553,7 @@ setforward(void) { "不便之處請多見諒\n" ANSI_RESET "\n"); - setuserfile(buf, fn_forward); + setuserfile(buf, FN_FORWARD); if ((fp = fopen(buf, "r"))) { fscanf(fp, "%" toSTR(sizeof(ip)) "s", ip); fclose(fp); @@ -589,7 +588,7 @@ setforward(void) { yn, sizeof(yn), LCECHO); if (*yn == 'y') { char authtemp[PATHLEN]; - setuserfile(buf, fn_forward); + setuserfile(buf, FN_FORWARD); unlink(buf); setuserfile(buf, fn_forward_auth_dir); Mkdir(buf); diff --git a/pttbbs/mbbsd/mbbsd.c b/pttbbs/mbbsd/mbbsd.c index b7d512b5..f757caea 100644 --- a/pttbbs/mbbsd/mbbsd.c +++ b/pttbbs/mbbsd/mbbsd.c @@ -1272,12 +1272,12 @@ user_login(void) #endif #ifdef UNTRUSTED_FORWARD_TIMEBOMB { char fwd_path[PATHLEN]; - setuserfile(fwd_path, ".forward"); + setuserfile(fwd_path, FN_FORWARD); if (dashf(fwd_path) && dasht(fwd_path) < UNTRUSTED_FORWARD_TIMEBOMB) { vs_hdr("自動轉寄設定已變更"); unlink(fwd_path); - outs("\n由於系統調整，您的自動轉寄已被停用，\n" + outs("\n由於系統調整，您的自動轉寄已被重設，\n" "如有需求請重新設定。"); pressanykey(); } diff --git a/pttbbs/mbbsd/record.c b/pttbbs/mbbsd/record.c index cf90c899..8fcb80e1 100644 --- a/pttbbs/mbbsd/record.c +++ b/pttbbs/mbbsd/record.c @@ -510,11 +510,11 @@ append_record_forward(char *fpath, fileheader_t * record, int size, const char * // Try to build .forward for (n = strlen(fpath) - 1; fpath[n] != '/' && n > 0; n--); - if (n + sizeof(".forward") > sizeof(buf)) + if (n + strlen(FN_FORWARD) + 1 > sizeof(buf)) return -1; memcpy(buf, fpath, n+1); - strcpy(buf + n + 1, ".forward"); + strcpy(buf + n + 1, FN_FORWARD); fp = fopen(buf, "r"); if (!fp) return 0; diff --git a/pttbbs/mbbsd/user.c b/pttbbs/mbbsd/user.c index 355db0da..ea834d97 100644 --- a/pttbbs/mbbsd/user.c +++ b/pttbbs/mbbsd/user.c @@ -291,7 +291,7 @@ user_display(const userec_t * u, int adminmode) prints("\n其它資訊: [%s]", (u->userlevel & PERM_LOGINOK) ? "已註冊" : "未註冊"); - sethomefile(buf, u->userid, ".forward"); + sethomefile(buf, u->userid, FN_FORWARD); if (dashs(buf) > 0) outs("[自動轉寄]"); |