- general message refine

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

3 files changed, 14 insertions, 22 deletions

diff --git a/mbbsd/cal.c b/mbbsd/cal.c
index 4082de51..ee39fd83 100644
--- a/mbbsd/cal.c
+++ b/mbbsd/cal.c
@@ -291,11 +291,12 @@ p_from(void)
     reload_money();
     if (cuser.money < 49)
 	return 0;
-    if (getdata_buf(b_lines - 1, 0, "請輸入新故鄉:",
-		    tmp_from, sizeof(tmp_from), DOECHO)) {
+    if (getdata(b_lines - 1, 0, "請輸入新故鄉:",
+		tmp_from, sizeof(tmp_from), DOECHO) &&
+	strcmp(tmp_from, currutmp->from) != 0) 
+    {
 	vice(49, "更改故鄉");
 	strlcpy(currutmp->from, tmp_from, sizeof(currutmp->from));
-	currutmp->from_alias = 0;
     }
     return 0;
 }
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 4640c60d..10b9f6c8 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -127,7 +127,7 @@ user_display(const userec_t * u, int adminmode)
 	   "        " ANSI_COLOR(30;41) "┴┬┴┬┴┬" ANSI_RESET "  " ANSI_COLOR(1;30;45) "    使 用 者"
 	   " 資 料        "
 	   "     " ANSI_RESET "  " ANSI_COLOR(30;41) "┴┬┴┬┴┬" ANSI_RESET "\n");
-    prints("\t\t代號暱稱: %s(%s)\n", u->userid, u->nickname);
+    prints("\t\t代號暱稱: %s (%s)\n", u->userid, u->nickname);
     prints("\t\t真實姓名: %s", u->realname);
 #if FOREIGN_REG_DAY > 0
     prints(" %s%s",
@@ -153,10 +153,10 @@ user_display(const userec_t * u, int adminmode)
 	   u->year + 1900, u->month, u->day, 
 	   resolve_over18_user(u) ? "已" : "未");
 
-    prints("\t\t註冊日期: %s (已滿%d天)\n", 
+    prints("\t\t註冊日期: %s (已滿 %d 天)\n", 
 	    Cdate(&u->firstlogin), (int)((now - u->firstlogin)/DAY_SECONDS));
-    prints("\t\t上次上站: %s (%s)\n", 
-	    u->lasthost, Cdate(&u->lastlogin));
+    prints("\t\t上次上站: %s (來自 %s)\n", 
+	    Cdate(&u->lastlogin), u->lasthost);
 
     if (adminmode) {
 	strcpy(genbuf, "bTCPRp#@XWBA#VSM0123456789ABCDEF");
@@ -167,7 +167,7 @@ user_display(const userec_t * u, int adminmode)
 	prints("\t\t認證資料: %s\n", u->justify);
     }
 
-    prints("\t\t上站文章: %d 次 / %d 篇\n",
+    prints("\t\t上站文章: 上站 %d 次 / 文章 %d 篇\n",
 	   u->numlogins, u->numposts);
 
     sethomedir(genbuf, u->userid);
diff --git a/mbbsd/voteboard.c b/mbbsd/voteboard.c
index 84fea5fa..f9af60ff 100644
--- a/mbbsd/voteboard.c
+++ b/mbbsd/voteboard.c
@@ -59,14 +59,12 @@ do_voteboardreply(const fileheader_t * fhdr)
 
     clear();
     if (!CheckPostPerm()||HasUserPerm(PERM_NOCITIZEN)) {
-	move(5, 10);
 	vmsg("對不起，您目前無法在此發表文章！");
 	return;
     }
 
     if (!CheckVoteRestrictionFile(fhdr))
     {
-	move(5, 10); // why move (5, 10)?
 	vmsg("你不夠資深喔！ (可按 i 查看限制)");
 	return;
     }
@@ -201,25 +199,18 @@ do_voteboard(int type)
     FILE           *fp;
     int             temp;
 
-    clear();
     if (!CheckPostPerm()) {
-	move(5, 10);
 	vmsg("對不起，您目前無法在此發表文章！");
 	return FULLUPDATE;
     }
     if (!CheckVoteRestriction(currbid))
     {
-	move(5, 10); // why move (5, 10)?
 	vmsg("你不夠資深喔！ (可按 i 查看限制)");
 	return FULLUPDATE;
     }
-    move(0, 0);
-    clrtobot();
-    outs("您正在使用" BBSNAME "的連署系統\n");
-    outs("本連署系統將詢問您一些問題，請小心回答才能開始連署\n");
-    outs("任意提出連署案者，將被列入不受歡迎使用者喔\n");
-    move(4, 0);
-    clrtobot();
+    vs_hdr(BBSNAME "連署系統");
+    outs("您正在使用" BBSNAME "的連署系統，請小心回答下列問題才能開始連署\n");
+    outs("任意提出連署案者，將被列入不受歡迎使用者喔\n\n");
     outs("(1)活動連署 (2)記名公投 ");
     if(type==0)
       outs("(3)申請新板 (4)廢除舊板 (5)連署板主 \n(6)罷免板主 (7)連署小組長 (8)罷免小組長 (9)申請新群組\n");
@@ -390,8 +381,8 @@ do_voteboard(int type)
     /* use lower 16 bits of 'money' to store limits */
     /* lower 8 bits are posts, higher 8 bits are logins */
     votefile.multi.vote_limits.regtime = bcache[currbid - 1].vote_limit_regtime;
-    votefile.multi.vote_limits.logins = bcache[currbid - 1].vote_limit_logins;
-    votefile.multi.vote_limits.posts = bcache[currbid - 1].vote_limit_posts;
+    votefile.multi.vote_limits.logins  = bcache[currbid - 1].vote_limit_logins;
+    votefile.multi.vote_limits.posts   = bcache[currbid - 1].vote_limit_posts;
     votefile.multi.vote_limits.badpost = bcache[currbid - 1].vote_limit_badpost;
     setbdir(genbuf, currboard);
     if (append_record(genbuf, &votefile, sizeof(votefile)) != -1)