From faaddb42006b9733537555c2852f629deaa1401d Mon Sep 17 00:00:00 2001
From: victor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sat, 27 Dec 2003 12:33:13 +0000
Subject: =?UTF-8?q?1.=E7=89=B9=E6=AE=8A=E6=90=9C=E5=B0=8B=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=80=85=E8=A3=A1=20=20=20=E8=AB=8B=E8=BC=B8=E5=85=A5?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E9=97=9C=E9=8D=B5=E5=AD=97[?=
 =?UTF-8?q?=E9=9B=BB=E8=A9=B1|=E5=9C=B0=E5=9D=80|=E5=A7=93=E5=90=8D|?=
 =?UTF-8?q?=E4=B8=8A=E7=AB=99=E5=9C=B0=E9=BB=9E|email|=E5=B0=8F=E9=9B=9Eid?=
 =?UTF-8?q?]=20=20=20=E5=8F=AF=E5=90=A6=E5=8A=A0=E4=B8=8A=E8=BA=AB?=
 =?UTF-8?q?=E5=88=86=E8=AD=89=E5=AD=97=E8=99=9F=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.退註冊後重註 填完x後資料就會送過來
  被退的人無法更新資料 我們又不見得有時間馬上去退掉
  常常被罵好玩的啊XD

3.連署看板時 申請原因一欄沒有標題說明
  常常有人因此重新連署@@



git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1437 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/admin.c     | 12 ++++++------
 mbbsd/user.c      |  5 +++--
 mbbsd/voteboard.c |  5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index b1553f3c..03199d5f 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -39,7 +39,7 @@ search_key_user(char *passwdfile, int mode)
 
     assert(fp1);
     clear();
-    getdata(0, 0, mode ? "�п�J�ϥΪ�����r[�q��|�a�}|�m�W|�W���a�I|"
+    getdata(0, 0, mode ? "�п�J�ϥΪ�����r[�q��|�a�}|�m�W|������|�W���a�I|"
 	    "email|�p��id] :" : "�п�Jid :", key, sizeof(key), DOECHO);
     if(!key[0])
 	return 0;
@@ -52,8 +52,7 @@ search_key_user(char *passwdfile, int mode)
         keymatch = NULL;
 	if (!strcasecmp(user.userid, key))
              keymatch = user.userid; 
-        else if(mode)
-         {
+        else if(mode) {
              if(strstr(user.realname, key))
                  keymatch = user.realname; 
              else if(strstr(user.username, key))
@@ -68,9 +67,10 @@ search_key_user(char *passwdfile, int mode)
                  keymatch = user.justify; 
              else if(strstr(user.mychicken.name, key))
                  keymatch = user.mychicken.name; 
-         }
-        if(keymatch)
-          {
+	     else if(strstr(user.ident, key))
+		 keymatch = user.ident;
+	}
+        if(keymatch) {
 	    move(1, 0);
 	    prints("�� [%d] �����\n", coun);
 	    refresh();
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 3554103f..bd88b1f4 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -1249,9 +1249,10 @@ u_register(void)
 	} else if (strcmp(inregcode, "x") != 0 && strcmp(inregcode, "X") != 0) {
 	    outs("�{�ҽX���~\n");
 	    pressanykey();
+	} else {
+	    toregister(email, genbuf, phone, career, ident, rname, addr, mobile);
+	    return FULLUPDATE;
 	}
-	toregister(email, genbuf, phone, career, ident, rname, addr, mobile);
-	return FULLUPDATE;
     }
 
     getdata(b_lines - 1, 0, "�z�T�w�n��g���U���(Y/N)�H[N] ",
diff --git a/mbbsd/voteboard.c b/mbbsd/voteboard.c
index 897f68f9..2556942e 100644
--- a/mbbsd/voteboard.c
+++ b/mbbsd/voteboard.c
@@ -80,8 +80,9 @@ do_voteboardreply(fileheader_t * fhdr)
 	    return;
 	}
     } while (opnion[0] != 'y' && opnion[0] != 'n');
-    if (!getdata_buf(20, 0, "�аݱz�P�o��ij�D�����Y�γs�p�z�Ѭ���G",
-		 reason, 35, DOECHO)) {
+    sprintf(genbuf, "�аݱz�P�o��ij�D�����Y��%s�z�Ѭ���G",
+	    opnion[0] == 'y' ? "���" : "�Ϲ�");
+    if (!getdata_buf(20, 0, genbuf, reason, 35, DOECHO)) {
 	return;
     }
     if ((fd = open(oldfpath, O_RDONLY)) == -1)
-- 
cgit v1.2.3