From 7146b73880e5f21507b848ae4095c63c991943b3 Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 10 May 2008 06:42:42 +0000 Subject: - register: fix 'x'/default being rejected in user->changemail git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4288 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/user.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mbbsd/user.c b/mbbsd/user.c index ffa5c235..077a9d44 100644 --- a/mbbsd/user.c +++ b/mbbsd/user.c @@ -603,7 +603,13 @@ uinfo_query(userec_t *u, int adminmode, int unum) do { getdata_str(y, 0, "電子信箱 [變動要重新認證]：", buf, sizeof(x.email), DOECHO, x.email); + strip_blank(buf, buf); + + // fast break + if (!buf[0] || strcasecmp(buf, "x") == 0) + break; + // TODO 這裡也要 emaildb_check #ifdef USE_EMAILDB if (isvalidemail(buf)) @@ -620,8 +626,10 @@ uinfo_query(userec_t *u, int adminmode, int unum) #endif } while (!isvalidemail(buf) && vmsg("認證信箱不能用使用免費信箱")); y++; + // admins may want to use special names - if (strcmp(buf, x.email) && + if (buf[0] && + strcmp(buf, x.email) && (strchr(buf, '@') || adminmode)) { // TODO 這裡也要 emaildb_check -- cgit v1.2.3