diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands/ns_register.cpp | 6 | ||||
| -rw-r--r-- | modules/pseudoclients/nickserv.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index 5f768f6cb..fd19590e8 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -128,6 +128,12 @@ class CommandNSRegister : public Command return; } + if (nsregister.equals_ci("mail") && email.empty()) + { + source.Reply(_("You must specify an email address.")); + return; + } + time_t nickregdelay = Config->GetModule(this->owner)->Get<time_t>("nickregdelay"); time_t reg_delay = Config->GetModule("nickserv")->Get<time_t>("regdelay"); if (u && !u->HasMode("OPER") && nickregdelay && Anope::CurTime - u->timestamp < nickregdelay) diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 6730e91b9..4b9f016df 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -324,7 +324,7 @@ class NickServCore : public Module, public NickServService if (!modesonid.empty()) u->SetModes(NickServ, "%s", modesonid.c_str()); - if (block->Get<bool>("forceemail") && u->Account()->email.empty()) + if (block->Get<bool>("forceemail", "yes") && u->Account()->email.empty()) { u->SendMessage(NickServ, _("You must now supply an e-mail for your nick.\n" "This e-mail will allow you to retrieve your password in\n" |