From ebda113f448cdde52d4015b75b09211eac182c8e Mon Sep 17 00:00:00 2001 From: lethality Date: Thu, 6 Jun 2013 17:28:59 +0100 Subject: [PATCH] Made the message for unconfirmed nicks relevant to the ns_register registration setting --- modules/pseudoclients/nickserv.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 04aabbc4f..9d05c339f 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -328,7 +328,11 @@ class NickServCore : public Module, public NickServService if (u->Account()->HasExt("UNCONFIRMED")) { - u->SendMessage(NickServ, _("Your email address is not confirmed. To confirm it, follow the instructions that were emailed to you when you registered.")); + const Anope::string &nsregister = Config->GetModule("ns_register")->Get("registration"); + if (nsregister.equals_ci("admin")) + u->SendMessage(NickServ, _("All new accounts must be validated by an administrator. Please wait for your registration to be confirmed.")); + else + u->SendMessage(NickServ, _("Your email address is not confirmed. To confirm it, follow the instructions that were emailed to you when you registered.")); const NickAlias *this_na = NickAlias::Find(u->Account()->display); time_t time_registered = Anope::CurTime - this_na->time_registered; time_t unconfirmed_expire = Config->GetModule(this)->Get("unconfirmedexpire", "1d");