Remove 'mobile' from user reg data.

We don't really need it.


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

4 files changed, 3 insertions, 23 deletions

diff --git a/pttbbs/include/proto.h b/pttbbs/include/proto.h
index 8dea64e9..d5556798 100644
--- a/pttbbs/include/proto.h
+++ b/pttbbs/include/proto.h
@@ -806,7 +806,6 @@ int pwcuRegisterSetInfo (const char *rname,
 			 const char *career,
 			 const char *phone,
 			 const char *email,
-			 int         mobile,
 			 uint8_t     is_foreign);
 
 // non-important based variables (only save on exit)
diff --git a/pttbbs/mbbsd/passwd.c b/pttbbs/mbbsd/passwd.c
index 3eeafc70..9011bfaa 100644
--- a/pttbbs/mbbsd/passwd.c
+++ b/pttbbs/mbbsd/passwd.c
@@ -264,7 +264,6 @@ int pwcuRegisterSetInfo (const char *rname,
 			 const char *career,
 			 const char *phone,
 			 const char *email,
-			 int         mobile,
 			 uint8_t     is_foreign)
 {
     PWCU_START();
@@ -273,7 +272,6 @@ int pwcuRegisterSetInfo (const char *rname,
     strlcpy(u.career,   career, sizeof(u.career));
     strlcpy(u.phone,    phone,  sizeof(u.phone));
     strlcpy(u.email,    email,  sizeof(u.email));
-    u.mobile = mobile;
     _SETBY_BIT(u.uflag, UF_FOREIGN, is_foreign);
 
     // duplicate to cuser
@@ -282,7 +280,6 @@ int pwcuRegisterSetInfo (const char *rname,
     strlcpy(cuser.career,   career, sizeof(cuser.career));
     strlcpy(cuser.phone,    phone,  sizeof(cuser.phone));
     strlcpy(cuser.email,    email,  sizeof(cuser.email));
-    cuser.mobile = mobile;
     _SETBY_BIT(cuser.uflag, UF_FOREIGN, is_foreign);
 
     PWCU_END();
diff --git a/pttbbs/mbbsd/register.c b/pttbbs/mbbsd/register.c
index a6ce43ec..18e2315d 100644
--- a/pttbbs/mbbsd/register.c
+++ b/pttbbs/mbbsd/register.c
@@ -1114,7 +1114,7 @@ toregister(char *email)
 int
 u_register(void)
 {
-    char            rname[20], addr[50], mobile[16];
+    char            rname[20], addr[50];
     char            phone[20], career[40], email[50];
     char            inregcode[14], regcode[50];
     char            ans[3], *errcode;
@@ -1152,11 +1152,6 @@ u_register(void)
     strlcpy(career,cuser.career,   sizeof(career));
     strlcpy(phone, cuser.phone,    sizeof(phone));
 
-    if (cuser.mobile)
-	snprintf(mobile, sizeof(mobile), "0%09d", cuser.mobile);
-    else
-	mobile[0] = 0;
-
     if (cuser.userlevel & PERM_NOREGCODE) {
 	vmsg("您不被允許\使用認證碼認證。請填寫註冊申請單");
 	goto REGFORM;
@@ -1364,8 +1359,6 @@ u_register(void)
 	    else
 		vmsg(errcode);
 	}
-	getfield(8, "只輸入數字 如:0912345678 (可不填)",
-		REGNOTES_ROOT "mobile", "手機號碼", mobile, 20);
 
 	getdata(20, 0, "以上資料是否正確(Y/N)？(Q)取消註冊 [N] ",
 		ans, 3, LCECHO);
@@ -1379,8 +1372,7 @@ u_register(void)
 #endif
 
     // copy values to cuser
-    pwcuRegisterSetInfo(rname, addr, career, phone, email,
-                        atoi(mobile), isForeign);
+    pwcuRegisterSetInfo(rname, addr, career, phone, email, isForeign);
 
     // if reach here, email is apparently 'x'.
     toregister(email);
diff --git a/pttbbs/mbbsd/user.c b/pttbbs/mbbsd/user.c
index f46ff9dc..e458d538 100644
--- a/pttbbs/mbbsd/user.c
+++ b/pttbbs/mbbsd/user.c
@@ -205,10 +205,7 @@ user_display(const userec_t * u, int adminmode)
     outs("\n"); // end of realname
     prints("\t職業學歷: %s\n", u->career);
     prints("\t居住地址: %s\n", u->address);
-    prints("\t電話手機: %s", u->phone);
-	if (u->mobile)
-	    prints(" / %010d", u->mobile);
-	outs("\n");
+    prints("\t電    話: %s\n", u->phone);
 
     prints("\t電子信箱: %s\n", u->email);
     prints("\t%6s幣: %d " MONEYNAME "\n", BBSMNAME, u->money);
@@ -789,11 +786,6 @@ uinfo_query(const char *orig_uid, int adminmode, int unum)
 	    getdata_buf(y++, 0, "電話號碼：", x.phone,
 		    sizeof(x.phone), DOECHO);
 	}
-	buf[0] = 0;
-	if (x.mobile)
-	    snprintf(buf, sizeof(buf), "%010d", x.mobile);
-	getdata_buf(y++, 0, "手機號碼：", buf, 11, NUMECHO);
-	x.mobile = atoi(buf);
 
         do {
             snprintf(buf, sizeof(buf), x.over_18 ? "y" : "n");