diff options
Diffstat (limited to 'src/nickserv.c')
| -rw-r--r-- | src/nickserv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nickserv.c b/src/nickserv.c index 87a2228dc..0c76c3064 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -2045,12 +2045,15 @@ static int do_register(User * u) } if (!pass) { - if (NSForceEmail && !email) { + if (NSForceEmail) { syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL); } else { syntax_error(s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX); } + } else if (NSForceEmail && !email) { + syntax_error(s_NickServ, u, "REGISTER", + NICK_REGISTER_SYNTAX_EMAIL); } else if (time(NULL) < u->lastnickreg + NSRegDelay) { notice_lang(s_NickServ, u, NICK_REG_PLEASE_WAIT, NSRegDelay); } else if (u->na) { /* i.e. there's already such a nick regged */ |