Remove more article limitations.

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

2 files changed, 3 insertions, 15 deletions

diff --git a/pttbbs/mbbsd/ordersong.c b/pttbbs/mbbsd/ordersong.c
index 91f7dcb6..e2eb6353 100644
--- a/pttbbs/mbbsd/ordersong.c
+++ b/pttbbs/mbbsd/ordersong.c
@@ -34,14 +34,7 @@ do_order_song(void)
     char save_title[STRLEN];
     const char *override_receiver = NULL;
 
-    // 由於變免費了，改成要文章數跟登入天數
-#ifdef ORDERSONG_MIN_NUMPOST 
-    if (cuser.numposts < ORDERSONG_MIN_NUMPOST) { 
-        vmsgf("為避免濫用，留言前請先獲得 %d 篇有效文章記錄", 
-                ORDERSONG_MIN_NUMPOST); 
-        return 0; 
-    } 
-#endif 
+    // 由於變免費了，改成要看劣文跟登入天數
 #if defined(ORDERSONG_MAX_BADPOST) && defined(ASSESS)
     if (cuser.badpost > ORDERSONG_MAX_BADPOST) { 
         vmsgf("為避免濫用，留言前請先消除劣文記錄至 %d 篇以下",  
diff --git a/pttbbs/mbbsd/vote.c b/pttbbs/mbbsd/vote.c
index 8164d28c..24df4859 100644
--- a/pttbbs/mbbsd/vote.c
+++ b/pttbbs/mbbsd/vote.c
@@ -644,6 +644,7 @@ vote_maintain(const char *bname)
     setbfile(buf, bname, vbuf.limits);
     if (inbuf[0] == 'y') {
 	fp = fopen(buf, "w");
+        // TODO regtime 跟 LOGINDAYS 其實可以合併
 	assert(fp);
         // 註冊時間 (以月為單位，deprecated)
 	fprintf(fp, "%d\n", now - (MONTH_SECONDS * 0));
@@ -653,11 +654,7 @@ vote_maintain(const char *bname)
 	    closetime = atoi(inbuf);	// borrow variable
 	} while (closetime < 0);
 	fprintf(fp, "%d\n", closetime);
-	do {
-	    getdata(6, 0, "文章篇數下限", inbuf, 6, DOECHO);
-	    closetime = atoi(inbuf);	// borrow variable
-	} while (closetime < 0);
-	fprintf(fp, "%d\n", closetime);
+	fprintf(fp, "%d\n", 0); // legacy record: numpost limit.
 	fclose(fp);
     } else {
 	if (dashf(buf))
@@ -793,8 +790,6 @@ user_vote_one(const vote_buffer_t *vbuf, const char *bname)
 	// XXX if this is a private vote (limited), I think we don't need to check limits?
 	if (cuser.firstlogin > closetime)
             reason = "註冊時間";
-        else if (cuser.numposts < (uint32_t)limits_posts)
-            reason = "文章總數";
         else if (cuser.numlogindays < (uint32_t)limits_logins)
             reason = STR_LOGINDAYS;