diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-08-24 00:36:58 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-08-24 00:36:58 +0800 |
| commit | 32ebebd6057f4fcc88667ffc6ed80be25f76e65f (patch) | |
| tree | d87badbd6f18b3034a5bfa26d3ed2a6f1c81e5bd | |
| parent | 867a8c0fc0075e0ff07a143b9e58d9a6591b080f (diff) | |
| download | pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.tar pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.tar.gz pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.tar.bz2 pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.tar.lz pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.tar.xz pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.tar.zst pttbbs-32ebebd6057f4fcc88667ffc6ed80be25f76e65f.zip | |
* improve foreign query interface again
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4766 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | mbbsd/register.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/mbbsd/register.c b/mbbsd/register.c index 8554c1e9..5f6ce248 100644 --- a/mbbsd/register.c +++ b/mbbsd/register.c @@ -1297,7 +1297,8 @@ u_register(void) { char rname[20], addr[50], mobile[16]; #ifdef FOREIGN_REG - char fore[2]; + int isForeign = (cuser.uflag2 & FOREIGN) ? 1 : 0; + char fore[2] = ""; #endif char phone[20], career[40], email[50], birthday[11], sex_is[2]; unsigned char year, mon, day; @@ -1449,13 +1450,17 @@ u_register(void) prints("%s(%s) 您好，請據實填寫以下的資料:", cuser.userid, cuser.nickname); #ifdef FOREIGN_REG - fore[0] = 0; - fore[1] = 0; - getfield(2, "Y/n", REGNOTES_ROOT "foreign", "是否現在住在台灣", fore, 2); - if (fore[0] == 'n' || fore[0] == 'N') - fore[0] |= FOREIGN; - else - fore[0] = 0; + fore[0] = 0; // ultilize default values + getfield(2, isForeign ? "y/N" : "Y/n", REGNOTES_ROOT "foreign", "是否現在住在台灣", fore, 2); + if (isForeign) + { + // default n + isForeign = (fore[0] == 'y' || fore[0] == 'Y') ? 0 : 1; + } else { + // default y + isForeign = (fore[0] == 'n' || fore[0] == 'N') ? 1 : 0; + } + move(2, 0); prints(" 是否現在住在台灣: %s\n", isForeign ? "N (否)" : "Y (是)"); #endif while (1) { getfield(4, @@ -1487,7 +1492,7 @@ u_register(void) REGNOTES_ROOT "address", "目前住址", addr, sizeof(addr)); if( (errcode = isvalidaddr(addr)) == NULL #ifdef FOREIGN_REG - || fore[0] + || isForeign #endif ) break; @@ -1501,7 +1506,7 @@ u_register(void) if( (errcode = isvalidphone(phone)) == NULL ) break; #ifdef FOREIGN_REG - else if(fore[0] && !strstr(errcode, "分隔符號")) + else if(isForeign && !strstr(errcode, "分隔符號")) break; #endif else @@ -1561,7 +1566,7 @@ u_register(void) cuser.year = year; #ifdef FOREIGN_REG - if (fore[0]) + if (isForeign) cuser.uflag2 |= FOREIGN; else cuser.uflag2 &= ~FOREIGN; |