refine internet mail logging

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

5 files changed, 20 insertions, 14 deletions

diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index 014e112f..0639893c 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -1287,7 +1287,7 @@ do_general(int garbage)
 #ifdef USE_LOG_INTERNETMAIL
                 log_filef("log/internet_mail.log", LOG_CREAT, 
                         "%s [%s (%s)] %s -> %s: %s\n",
-                        Cdatelite(&now), "do_general_reply_to_author",
+                        Cdatelite(&now), __FUNCTION__,
                         currboard, cuser.userid, str + 1, save_title);
 #endif
 		if ( bsmtp(fpath, save_title, str + 1, NULL) < 0)
diff --git a/pttbbs/mbbsd/mail.c b/pttbbs/mbbsd/mail.c
index 76ae08e6..b563b655 100644
--- a/pttbbs/mbbsd/mail.c
+++ b/pttbbs/mbbsd/mail.c
@@ -256,7 +256,7 @@ m_internet(void)
     trim(receiver);
     if (strchr(receiver, '@') && !invalidaddr(receiver) &&
 	getdata(21, 0, "主  題：", title, sizeof(title), DOECHO))
-	do_send(receiver, title, "m_internet");
+	do_send(receiver, title, __FUNCTION__);
     else {
 	vmsg("收信人或主題不正確,請重新選取指令");
     }
@@ -499,8 +499,8 @@ do_send(const char *userid, const char *title, const char *log_source)
 	    ret = bsmtp(fpath, save_title, userid, NULL);
 #ifdef USE_LOG_INTERNETMAIL
             log_filef("log/internet_mail.log", LOG_CREAT, 
-                    "%s [%s] %s -> %s: %s\n",
-                    Cdatelite(&now), log_source,
+                    "%s [%s - %s] %s -> %s: %s\n",
+                    Cdatelite(&now), __FUNCTION__, log_source,
                     cuser.userid, userid, save_title);
 #endif
 	    hold_mail(fpath, userid, save_title);
@@ -523,7 +523,7 @@ do_send(const char *userid, const char *title, const char *log_source)
 void
 my_send(const char *uident)
 {
-    switch (do_send(uident, NULL, "my_send")) {
+    switch (do_send(uident, NULL, __FUNCTION__)) {
 	case -1:
 	outs(err_uid);
 	break;
@@ -912,7 +912,7 @@ m_forward(int ent GCC_UNUSED, fileheader_t * fhdr, const char *direct GCC_UNUSED
     prints("轉信給: %s\n標  題: %s\n", uid, save_title);
     showplans(uid);
 
-    switch (do_send(uid, save_title, "m_forward")) {
+    switch (do_send(uid, save_title, __FUNCTION__)) {
     case -1:
 	outs(err_uid);
 	break;
@@ -1364,7 +1364,7 @@ mail_reply(int ent, fileheader_t * fhdr, const char *direct)
 
     /* edit, then send the mail */
     ent = curredit;
-    switch (do_send(uid, save_title, "mail_reply")) {
+    switch (do_send(uid, save_title, __FUNCTION__)) {
     case -1:
 	outs(err_uid);
 	break;
@@ -2099,6 +2099,7 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
     char            fname[PATHLEN];
     char            genbuf[PATHLEN];
     int             return_no;
+    const char      *hostaddr;
 
     if (!address[0] && strcasecmp(cuser.email, "x") != 0)
      	strlcpy(address, cuser.email, sizeof(address));
@@ -2141,6 +2142,11 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
     if (invalidaddr(address))
 	return -2;
 
+    // decide if address is internet mail
+    hostaddr = strchr(address, '@');
+    if (hostaddr && strcasecmp(hostaddr + 1, MYHOSTNAME) == 0)
+        hostaddr = NULL;
+
     outmsg("轉寄中請稍候...");
     refresh();
 
@@ -2225,11 +2231,11 @@ doforward(const char *direct, const fileheader_t * fh, int mode)
 	return -1;
 
 #ifdef USE_LOG_INTERNETMAIL
-    if (strchr(address, '@'))
+    if (hostaddr)
         log_filef("log/internet_mail.log", LOG_CREAT, 
-                "%s [%s] %s -> %s: %s %s\n",
-                Cdatelite(&now), "mail_doforward",
-                cuser.userid, address, fh->title, fname);
+                "%s [%s] %s -> %s: %s - %s\n",
+                Cdatelite(&now), __FUNCTION__,
+                cuser.userid, address, direct, fh->title);
 #endif
     return_no = bsmtp(fname, fh->title, address, NULL);
     unlink(fname);
diff --git a/pttbbs/mbbsd/ordersong.c b/pttbbs/mbbsd/ordersong.c
index e7a97156..d4b0b5c4 100644
--- a/pttbbs/mbbsd/ordersong.c
+++ b/pttbbs/mbbsd/ordersong.c
@@ -201,7 +201,7 @@ do_order_song(void)
         if (strchr(address, '@'))
             log_filef("log/internet_mail.log", LOG_CREAT, 
                     "%s [%s] %s -> %s: %s\n",
-                    Cdatelite(&now), "do_order_song",
+                    Cdatelite(&now), __FUNCTION__,
                     cuser.userid, address, save_title);
 #endif
     }
diff --git a/pttbbs/mbbsd/record.c b/pttbbs/mbbsd/record.c
index 672c0062..8590e391 100644
--- a/pttbbs/mbbsd/record.c
+++ b/pttbbs/mbbsd/record.c
@@ -430,7 +430,7 @@ append_record_forward(char *fpath, fileheader_t * record, int size, const char *
 #ifdef USE_LOG_INTERNETMAIL
                 log_filef("log/internet_mail.log", LOG_CREAT, 
                         "%s [%s] %s -> (%s) %s: %s\n",
-                        Cdatelite(&now), "auto_forward",
+                        Cdatelite(&now), __FUNCTION__,
                         cuser.userid, origid, address, fwd_title);
 #endif
 		return 0;
diff --git a/pttbbs/mbbsd/xyz.c b/pttbbs/mbbsd/xyz.c
index cce44e1e..62ee6c82 100644
--- a/pttbbs/mbbsd/xyz.c
+++ b/pttbbs/mbbsd/xyz.c
@@ -117,7 +117,7 @@ mail_sysop(void)
 	    char *suser = sysoplist[i].userid;
 	    clear();
 	    showplans(suser);
-	    do_send(suser, NULL, "mail_sysop");
+	    do_send(suser, NULL, __FUNCTION__);
 	}
     }
 }