diff options
| -rw-r--r-- | Changes | 2 | ||||
| -rw-r--r-- | src/core/ns_register.c | 6 | ||||
| -rw-r--r-- | src/mail.c | 7 |
3 files changed, 8 insertions, 7 deletions
@@ -5,4 +5,4 @@ Anope Version 1.9.0 10/11 F Move core services to use BotInfo 10/12 F Move BotInfo and related methods into a class 11/01 F Move modules into a class - +11/15 F Fixed ns resending of passcode issue diff --git a/src/core/ns_register.c b/src/core/ns_register.c index a90c0ca0c..0a0e073ac 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -428,11 +428,11 @@ int do_resend(User * u) if (NSEmailReg) { if ((nr = findrequestnick(u->nick))) { if (time(NULL) < nr->lastmail + NSResendDelay) { - return MOD_CONT; - } else { - nr->lastmail = time(NULL); + notice_lang(s_NickServ, u, MAIL_LATER); + return MOD_CONT; } if (do_sendregmail(u, nr) == 0) { + nr->lastmail = time(NULL); notice_lang(s_NickServ, u, NICK_REG_RESENT, nr->email); alog("%s: re-sent registration verification code for %s to %s", s_NickServ, nr->nick, nr->email); } else { diff --git a/src/mail.c b/src/mail.c index 43d8e7845..4aa3b0a2a 100644 --- a/src/mail.c +++ b/src/mail.c @@ -30,15 +30,16 @@ MailInfo *MailRegBegin(User * u, NickRequest * nr, char *subject, char *service) { + int timeToWait = 0; if (!u || !nr || !subject || !service) { return NULL; } if (!UseMail) { notice_lang(service, u, MAIL_DISABLED); - } else if ((time(NULL) - u->lastmail < MailDelay) - || (time(NULL) - nr->lastmail < MailDelay)) { - notice_lang(service, u, MAIL_DELAYED, MailDelay); + } else if ((time(NULL) - u->lastmail < MailDelay)) { + timeToWait = MailDelay - (time(NULL) - u->lastmail); + notice_lang(service, u, MAIL_DELAYED, timeToWait); } else if (!nr->email) { notice_lang(service, u, MAIL_INVALID, nr->nick); } else { |