- mail: do not add numposts for cross-posting mails

- cross-post: notify user that all cp will not add numposts


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

2 files changed, 13 insertions, 16 deletions

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 8802699a..e3db272c 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -1081,6 +1081,7 @@ do_general(int isbid)
     }
     else
     {
+	char addPost = 0;
         rename(genbuf, fpath);
 #ifdef LOGPOST
 	{
@@ -1124,6 +1125,8 @@ do_general(int isbid)
 	if (strcmp(currboard, GLOBAL_TEST) && !ifuseanony &&
 	    !(currbrdattr&BRD_BAD)) {
 	    prints("這是您的第 %d 篇文章。",++cuser.numposts);
+	    addPost = 1;
+	   
             if(postfile.filemode&FILE_BID)
                 outs("招標文章沒有稿酬。");
             else
@@ -1180,7 +1183,7 @@ do_general(int isbid)
 	    }
 	    outs(msg);
 	    curredit ^= EDIT_BOTH;
-	}
+	} // if (curredit & EDIT_BOTH)
 	if (currbrdattr & BRD_ANONYMOUS)
             do_crosspost("UnAnonymous", &postfile, fpath, 0);
 #ifdef USE_COOLDOWN
@@ -1191,6 +1194,11 @@ do_general(int isbid)
 	}
 	add_posttimes(usernum, 1);
 #endif
+	// Notify all logins
+	if (addPost)
+	{
+
+	}
     }
     pressanykey();
     return FULLUPDATE;
@@ -1882,17 +1890,7 @@ cross_post(int ent, fileheader_t * fhdr, const char *direct)
 	add_posttimes(usernum, 1);
 #endif
 	setbtotal(getbnum(xboard));
-
-	// anti-crosspost spammers: do not add numpost.
-#if 0
-	if (strcmp(xboard, GLOBAL_TEST) == 0)
-	    outs("測試信件不列入紀錄，敬請包涵。");
-	else
-	    cuser.numposts++;
-	UPDATE_USEREC;
-#endif // anti-crosspost spammer
-
-	outs("文章轉錄完成");
+	outs("文章轉錄完成。(轉錄不增加文章數，敬請包涵) ");
 
 	// update crosspost record
 	if (hashPost == postrecord.checksum[0]) 
diff --git a/mbbsd/mail.c b/mbbsd/mail.c
index e8684174..a5f09ce3 100644
--- a/mbbsd/mail.c
+++ b/mbbsd/mail.c
@@ -1473,6 +1473,7 @@ mail_cross_post(int ent, fileheader_t * fhdr, const char *direct)
 	setbdir(fname, xboard);
 	append_record(fname, &xfile, sizeof(xfile));
 	setbtotal(getbnum(xboard));
+
 	if (!xfile.filemode)
 	    outgo_post(&xfile, xboard, cuser.userid, cuser.nickname);
 #ifdef USE_COOLDOWN
@@ -1481,10 +1482,8 @@ mail_cross_post(int ent, fileheader_t * fhdr, const char *direct)
 	add_posttimes(usernum, 1);
 #endif
 
-	if (strcmp(xboard, GLOBAL_TEST) == 0)
-	    outs("測試信件不列入紀錄，敬請包涵。");
-	else
-	    cuser.numposts++;
+	// cross-post does not add numpost.
+	outs("轉錄信件不增加文章數，敬請包涵。");
 
 	vmsg("文章轉錄完成");
 	currmode = currmode0;