- register: change notification mails to anonymous style

- mail: fast reject on replying to system mail/anonymous mail.


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4079 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 23 insertions, 3 deletions

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index c964cd73..86443d6c 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -3103,7 +3103,7 @@ del_range(int ent, const fileheader_t *fhdr, const char *direct)
 		stand_title("刪除失敗");
 		outs("\n\n無法刪除檔案。可能是同時有其它人也在進行刪除。\n\n"
 		     "若此錯誤持續發生，請等約一小時後再重試。\n\n"
-		     "若到時仍無法刪除，請到 SYSOP 看板報告。\n");
+		     "若到時仍無法刪除，請到 " BN_SYSOP " 看板報告。\n");
 		vmsg("無法刪除。可能有其它人正在同時刪除。");
 		return FULLUPDATE;
 	    } else 
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index 17dea28e..f9e116ca 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -116,6 +116,7 @@ mail_muser(userec_t muser, const char *title, const char *filename)
     return mail_id(muser.userid, title, filename, cuser.userid);
 }
 
+// TODO add header option?
 int
 mail_log2id(const char *id, const char *title, const char *src, const char *owner, char newmail, char trymove)
 {
@@ -1270,6 +1271,14 @@ mail_reply(int ent, fileheader_t * fhdr, const char *direct)
     if (!fhdr || !fhdr->filename[0])
 	return DONOTHING;
 
+    if (fhdr->owner[0] == '[' || (fhdr->filemode & FILE_ANONYMOUS))
+    {
+	// system mail. reject.
+	vmsg("無法回信。");
+	return FULLUPDATE;
+    }
+
+
     stand_title("回  信");
 
     /* 判斷是 boards 或 mail */
diff --git a/mbbsd/register.c b/mbbsd/register.c
index 09e25451..22d7e867 100644
--- a/mbbsd/register.c
+++ b/mbbsd/register.c
@@ -1474,13 +1474,17 @@ regform_accept(const char *userid, const char *justify)
 	kick_all(muser.userid);
     }
 
+    // According to suggestions by PTT BBS account sysops,
+    // it is better to use anonymous here.
 #if FOREIGN_REG_DAY > 0
     if(muser.uflag2 & FOREIGN)
-	mail_muser(muser, "[出入境管理局]", "etc/foreign_welcome");
+	mail_log2id(muser.userid, "[System] Registration Complete ", "etc/foreign_welcome",
+		"[SYSTEM]", 1, 0);
     else
 #endif
     // last: send notification mail
-    mail_muser(muser, "[註冊成功\囉]", "etc/registered");
+    mail_log2id(muser.userid, "[系統通知] 註冊成功\ ", "etc/registered",
+	    "[系統通知]", 1, 0);
 }
 
 void 
@@ -1520,11 +1524,18 @@ regform_reject(const char *userid, const char *reason, const RegformEntry *pre)
 
     if(pre) print_regform_entry_localized(pre, fp, 1);
     fprintf(fp, "%s 註冊失敗。\n", Cdate(&now));
+    // prompt user for how to contact if they have problem
+    fprintf(fp, ANSI_COLOR(1;31) "如有任何問題或需要與站務人員聯絡請至"
+	    BN_ID_PROBLEM "看板。" ANSI_RESET "\n"); 
 
     // multiple abbrev loop
     regform_print_reasons(reason, fp);
+
     fclose(fp);
 
+    // According to suggestions by PTT BBS account sysops,
+    // it is better to use anonymous here.
+    //
     // XXX how to handle the notification file better?
     // mail_log2id: do not use move.
     // mail_muser(muser, "[註冊失敗]", buf);