diff options
| -rw-r--r-- | mbbsd/mail.c | 15 | ||||
| -rw-r--r-- | util/outmail.c | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/mbbsd/mail.c b/mbbsd/mail.c index e0dced0f..396beb04 100644 --- a/mbbsd/mail.c +++ b/mbbsd/mail.c @@ -1460,11 +1460,16 @@ bbs_sendmail(char *fpath, char *title, char *receiver) return -1; if (fpath) - fprintf(fout, "Reply-To: %s%s\nFrom: %s%s\n", - cuser.userid, str_mail_address, cuser.userid, - str_mail_address); - fprintf(fout, "To: %s\nSubject: %s\n", receiver, title); - fprintf(fout, "X-Disclaimer: " BBSNAME "對本信內容恕不負責。\n\n"); + fprintf(fout, "Reply-To: %s%s\nFrom: %s <%s%s>\n", + cuser.userid, str_mail_address, + cuser.username, + cuser.userid, str_mail_address); + fprintf(fout,"To: %s\nSubject: %s\n" + "Mime-Version: 1.0\r\n" + "Content-Type: text/plain; charset=\"big5\"\r\n" + "Content-Transfer-Encoding: 8bit\r\n" + "X-Disclaimer: " BBSNAME "對本信內容恕不負責。\n\n", + receiver, title); while (fgets(genbuf, 255, fin)) { if (genbuf[0] == '.' && genbuf[1] == '\n') diff --git a/util/outmail.c b/util/outmail.c index f818d2c6..262c3a67 100644 --- a/util/outmail.c +++ b/util/outmail.c @@ -86,7 +86,7 @@ void doSendBody(int sock, FILE *fp, char *from, char *to, char *subject) { char buf[2048]; n = snprintf(buf, sizeof(buf), - "From: %s\r\n" + "From: %s <%s>\r\n" "To: %s\r\n" "Subject: %s\r\n" "X-Sender: outmail of pttbbs\r\n" @@ -94,7 +94,7 @@ void doSendBody(int sock, FILE *fp, char *from, char *to, char *subject) { "Content-Type: text/plain; charset=\"big5\"\r\n" "Content-Transfer-Encoding: 8bit\r\n" "X-Disclaimer: [" BBSNAME "]對本信內容恕不負責\r\n\r\n", - from, to, subject); + from, from, to, subject); write(sock, buf, n); while(fgets(buf, sizeof(buf), fp)) { |