From 4ba68ec1c69ed1f484a6e795a08a32244e743af4 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Tue, 25 Mar 2014 03:30:28 +0000
Subject: Combine From line and provide URL in article.

git-svn-id: http://opensvn.csie.org/pttbbs/trunk@5955 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 pttbbs/mbbsd/bbs.c  | 10 ++++++++++
 pttbbs/mbbsd/edit.c |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index f69759e7..32e88fe4 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -1449,6 +1449,16 @@ do_post_article(int edflags)
     owner = cuser.userid;
 #endif
 
+#ifdef QUERY_ARTICLE_URL
+    if (IsBoardForWeb(bp)) {
+        char buf[STRLEN];
+        if (GetWebUrl(bp, &postfile, buf, sizeof(buf))) {
+            log_filef(fpath, LOG_CREAT,
+                      "※ " URL_DISPLAYNAME ": %s\n", buf);
+        }
+    }
+#endif
+
     // ---- BEGIN OF MONEY VERIFICATION ----
 
     // money verification
diff --git a/pttbbs/mbbsd/edit.c b/pttbbs/mbbsd/edit.c
index c31e77f9..59d689a3 100644
--- a/pttbbs/mbbsd/edit.c
+++ b/pttbbs/mbbsd/edit.c
@@ -1772,8 +1772,7 @@ addsimplesignature(FILE *fp, const char *host) {
         host = FROMHOST;
     strlcpy(temp, host, sizeof(temp));
     fprintf(fp,
-            "\n--\n※ 發信站: " BBSNAME "(" MYHOSTNAME ") \n"
-            "◆ From: %s\n", host);
+            "\n--\n※ 發信站: " BBSNAME "(" MYHOSTNAME "), 來源: %s\n", host);
 }
 
 void
-- 
cgit v1.2.3