summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/extra/ldap_authentication.cpp2
-rw-r--r--modules/nickserv/access.cpp2
-rw-r--r--modules/nickserv/cert.cpp2
-rw-r--r--modules/nickserv/drop.cpp2
-rw-r--r--modules/nickserv/group.cpp12
-rw-r--r--modules/nickserv/main/nickserv.cpp26
-rw-r--r--modules/nickserv/recover.cpp2
-rw-r--r--modules/nickserv/register.cpp24
-rw-r--r--modules/nickserv/set.cpp20
-rw-r--r--modules/nickserv/suspend.cpp2
-rw-r--r--modules/operserv/forbid.cpp2
-rw-r--r--modules/webcpanel/pages/register.cpp2
12 files changed, 49 insertions, 49 deletions
diff --git a/modules/extra/ldap_authentication.cpp b/modules/extra/ldap_authentication.cpp
index ef61b6940..8160eb6e2 100644
--- a/modules/extra/ldap_authentication.cpp
+++ b/modules/extra/ldap_authentication.cpp
@@ -243,7 +243,7 @@ class ModuleLDAPAuthentication : public Module
if (!email_attribute.empty())
/* Don't complain to users about how they need to update their email, we will do it for them */
- config->GetModule("nickserv")->Set("forceemail", "false");
+ config->GetModule("nickserv/main")->Set("forceemail", "false");
}
EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) override
diff --git a/modules/nickserv/access.cpp b/modules/nickserv/access.cpp
index bff710cc4..fb068e92b 100644
--- a/modules/nickserv/access.cpp
+++ b/modules/nickserv/access.cpp
@@ -189,7 +189,7 @@ class CommandNSAccess : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.GetAccount() != na->GetAccount() && na->GetAccount()->IsServicesOper() && !cmd.equals_ci("LIST"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && source.GetAccount() != na->GetAccount() && na->GetAccount()->IsServicesOper() && !cmd.equals_ci("LIST"))
{
source.Reply(_("You may view but not modify the access list of other Services Operators."));
return;
diff --git a/modules/nickserv/cert.cpp b/modules/nickserv/cert.cpp
index c7bd2a207..68bcc6fe3 100644
--- a/modules/nickserv/cert.cpp
+++ b/modules/nickserv/cert.cpp
@@ -275,7 +275,7 @@ class CommandNSCert : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.GetAccount() != na->GetAccount() && na->GetAccount()->IsServicesOper() && !cmd.equals_ci("LIST"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && source.GetAccount() != na->GetAccount() && na->GetAccount()->IsServicesOper() && !cmd.equals_ci("LIST"))
{
source.Reply(_("You may view, but not modify, the certificate list of other Services Operators."));
return;
diff --git a/modules/nickserv/drop.cpp b/modules/nickserv/drop.cpp
index 22d3b59fb..f4a109573 100644
--- a/modules/nickserv/drop.cpp
+++ b/modules/nickserv/drop.cpp
@@ -55,7 +55,7 @@ class CommandNSDrop : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && !is_mine && na->GetAccount()->IsServicesOper())
+ if (Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && !is_mine && na->GetAccount()->IsServicesOper())
{
source.Reply(_("You may not drop other Services Operators' nicknames."));
return;
diff --git a/modules/nickserv/group.cpp b/modules/nickserv/group.cpp
index 7c0f41809..68e59ad7f 100644
--- a/modules/nickserv/group.cpp
+++ b/modules/nickserv/group.cpp
@@ -121,7 +121,7 @@ class CommandNSGroup : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("restrictopernicks"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("restrictopernicks"))
for (Oper *o : Serialize::GetObjects<Oper *>())
{
if (!u->HasMode("OPER") && u->nick.find_ci(o->GetName()) != Anope::string::npos)
@@ -132,8 +132,8 @@ class CommandNSGroup : public Command
}
NickServ::Nick *target, *na = NickServ::FindNick(u->nick);
- const Anope::string &guestnick = Config->GetModule("nickserv")->Get<Anope::string>("guestnickprefix", "Guest");
- time_t reg_delay = Config->GetModule("nickserv")->Get<time_t>("regdelay");
+ const Anope::string &guestnick = Config->GetModule("nickserv/main")->Get<Anope::string>("guestnickprefix", "Guest");
+ time_t reg_delay = Config->GetModule("nickserv/main")->Get<time_t>("regdelay");
unsigned maxaliases = Config->GetModule(this->GetOwner())->Get<unsigned>("maxaliases");
if (!(target = NickServ::FindNick(nick)))
{
@@ -324,8 +324,8 @@ class CommandNSGList : public Command
ListFormatter list(source.GetAccount());
list.AddColumn(_("Nick")).AddColumn(_("Expires"));
- time_t nickserv_expire = Config->GetModule("nickserv")->Get<time_t>("expire", "21d"),
- unconfirmed_expire = Config->GetModule("nickserv")->Get<time_t>("unconfirmedexpire", "1d");
+ time_t nickserv_expire = Config->GetModule("nickserv/main")->Get<time_t>("expire", "21d"),
+ unconfirmed_expire = Config->GetModule("nickserv/main")->Get<time_t>("unconfirmedexpire", "1d");
for (NickServ::Nick *na2 : nc->GetRefs<NickServ::Nick *>())
{
Anope::string expires;
@@ -381,7 +381,7 @@ class NSGroup : public Module
, commandnsungroup(this)
, commandnsglist(this)
{
- if (Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
throw ModuleException(modname + " can not be used with options:nonicknameownership enabled");
}
};
diff --git a/modules/nickserv/main/nickserv.cpp b/modules/nickserv/main/nickserv.cpp
index 8f33caf87..2e766a9e2 100644
--- a/modules/nickserv/main/nickserv.cpp
+++ b/modules/nickserv/main/nickserv.cpp
@@ -102,8 +102,8 @@ class NickServRelease : public User, public Timer
Anope::string nick;
public:
- NickServRelease(Module *me, NickServ::Nick *na, time_t delay) : User(na->GetNick(), Config->GetModule("nickserv")->Get<Anope::string>("enforceruser", "user"),
- Config->GetModule("nickserv")->Get<Anope::string>("enforcerhost", "services.localhost.net"), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->GetNick())
+ NickServRelease(Module *me, NickServ::Nick *na, time_t delay) : User(na->GetNick(), Config->GetModule("nickserv/main")->Get<Anope::string>("enforceruser", "user"),
+ Config->GetModule("nickserv/main")->Get<Anope::string>("enforcerhost", "services.localhost.net"), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->GetNick())
{
/* Erase the current release timer and use the new one */
Anope::map<NickServRelease *>::iterator nit = NickServReleases.find(this->nick);
@@ -165,12 +165,12 @@ class NickServCore : public Module, public NickServ::NickServService
{
collided.Unset(na);
- new NickServHeld(this, na, Config->GetModule("nickserv")->Get<time_t>("releasetimeout", "1m"));
+ new NickServHeld(this, na, Config->GetModule("nickserv/main")->Get<time_t>("releasetimeout", "1m"));
if (IRCD->CanSVSHold)
- IRCD->SendSVSHold(na->GetNick(), Config->GetModule("nickserv")->Get<time_t>("releasetimeout", "1m"));
+ IRCD->SendSVSHold(na->GetNick(), Config->GetModule("nickserv/main")->Get<time_t>("releasetimeout", "1m"));
else
- new NickServRelease(this, na, Config->GetModule("nickserv")->Get<time_t>("releasetimeout", "1m"));
+ new NickServRelease(this, na, Config->GetModule("nickserv/main")->Get<time_t>("releasetimeout", "1m"));
}
}
@@ -251,7 +251,7 @@ class NickServCore : public Module, public NickServ::NickServService
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
return;
bool on_access = u->IsRecognized(false);
@@ -272,13 +272,13 @@ class NickServCore : public Module, public NickServ::NickServService
}
else if (na->GetAccount()->HasFieldS("KILL_QUICK"))
{
- time_t killquick = Config->GetModule("nickserv")->Get<time_t>("killquick", "20s");
+ time_t killquick = Config->GetModule("nickserv/main")->Get<time_t>("killquick", "20s");
u->SendMessage(*NickServ, _("If you do not change within %s, I will change your nick."), Anope::Duration(killquick, u->Account()).c_str());
new NickServCollide(this, this, u, na, killquick);
}
else
{
- time_t kill = Config->GetModule("nickserv")->Get<time_t>("kill", "60s");
+ time_t kill = Config->GetModule("nickserv/main")->Get<time_t>("kill", "60s");
u->SendMessage(*NickServ, _("If you do not change within %s, I will change your nick."), Anope::Duration(kill, u->Account()).c_str());
new NickServCollide(this, this, u, na, kill);
}
@@ -289,7 +289,7 @@ class NickServCore : public Module, public NickServ::NickServService
void OnUserLogin(User *u) override
{
NickServ::Nick *na = NickServ::FindNick(u->nick);
- if (na && na->GetAccount() == u->Account() && !Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
+ if (na && na->GetAccount() == u->Account() && !Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership") && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
u->SetMode(NickServ, "REGISTERED");
const Anope::string &modesonid = Config->GetModule(this)->Get<Anope::string>("modesonid");
@@ -305,7 +305,7 @@ class NickServCore : public Module, public NickServ::NickServService
if (IRCD->CanSVSNick)
{
unsigned nicklen = Config->GetBlock("networkinfo")->Get<unsigned>("nicklen");
- const Anope::string &guestprefix = Config->GetModule("nickserv")->Get<Anope::string>("guestnickprefix", "Guest");
+ const Anope::string &guestprefix = Config->GetModule("nickserv/main")->Get<Anope::string>("guestnickprefix", "Guest");
Anope::string guestnick;
@@ -509,7 +509,7 @@ class NickServCore : public Module, public NickServ::NickServService
const NickServ::Nick *na = NickServ::FindNick(u->nick);
const Anope::string &unregistered_notice = Config->GetModule(this)->Get<Anope::string>("unregistered_notice");
- if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && !unregistered_notice.empty() && !na && !u->Account())
+ if (!Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership") && !unregistered_notice.empty() && !na && !u->Account())
u->SendMessage(*NickServ, unregistered_notice.replace_all_cs("%n", u->nick));
else if (na && !u->IsIdentified(true))
this->Validate(u);
@@ -553,7 +553,7 @@ class NickServCore : public Module, public NickServ::NickServService
{
/* Reset +r and re-send account (even though it really should be set at this point) */
IRCD->SendLogin(u, na);
- if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && na->GetAccount() == u->Account() && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
+ if (!Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership") && na->GetAccount() == u->Account() && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
u->SetMode(NickServ, "REGISTERED");
Log(u, "", NickServ) << u->GetMask() << " automatically identified for group " << u->Account()->GetDisplay();
}
@@ -572,7 +572,7 @@ class NickServCore : public Module, public NickServ::NickServService
{
if (!params.empty() || source.c || source.service != *NickServ)
return EVENT_CONTINUE;
- if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (!Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
source.Reply(_("\002%s\002 allows you to register a nickname and\n"
"prevent others from using it. The following\n"
"commands allow for registration and maintenance of\n"
diff --git a/modules/nickserv/recover.cpp b/modules/nickserv/recover.cpp
index 287965373..7c58fbade 100644
--- a/modules/nickserv/recover.cpp
+++ b/modules/nickserv/recover.cpp
@@ -241,7 +241,7 @@ class NSRecover : public Module
, svsnick(this, "svsnick")
{
- if (Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
throw ModuleException(modname + " can not be used with options:nonicknameownership enabled");
}
diff --git a/modules/nickserv/register.cpp b/modules/nickserv/register.cpp
index 02da01f5d..7a392dd7c 100644
--- a/modules/nickserv/register.cpp
+++ b/modules/nickserv/register.cpp
@@ -64,7 +64,7 @@ class CommandNSConfirm : public Command
NickServ::Nick *u_na = NickServ::FindNick(u->nick);
/* Set +r if they're on a nick in the group */
- if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && u_na && u_na->GetAccount() == na->GetAccount())
+ if (!Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership") && u_na && u_na->GetAccount() == na->GetAccount())
u->SetMode(source.service, "REGISTERED");
}
}
@@ -91,7 +91,7 @@ class CommandNSConfirm : public Command
if (na)
{
IRCD->SendLogin(source.GetUser(), na);
- if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && na->GetAccount() == source.GetAccount() && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
+ if (!Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership") && na->GetAccount() == source.GetAccount() && !na->GetAccount()->HasFieldS("UNCONFIRMED"))
source.GetUser()->SetMode(source.service, "REGISTERED");
}
}
@@ -120,7 +120,7 @@ class CommandNSRegister : public Command
CommandNSRegister(Module *creator) : Command(creator, "nickserv/register", 1, 2)
{
this->SetDesc(_("Register a nickname"));
- if (Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("forceemail", "yes"))
this->SetSyntax(_("\037password\037 \037email\037"));
else
this->SetSyntax(_("\037password\037 \037[email]\037"));
@@ -149,7 +149,7 @@ class CommandNSRegister : public Command
}
time_t nickregdelay = Config->GetModule(this->GetOwner())->Get<time_t>("nickregdelay");
- time_t reg_delay = Config->GetModule("nickserv")->Get<time_t>("regdelay");
+ time_t reg_delay = Config->GetModule("nickserv/main")->Get<time_t>("regdelay");
if (u && !u->HasMode("OPER") && nickregdelay && Anope::CurTime - u->timestamp < nickregdelay)
{
source.Reply(_("You must have been using this nickname for at least {0} seconds to register."), nickregdelay);
@@ -161,7 +161,7 @@ class CommandNSRegister : public Command
/* Guest nick can now have a series of between 1 and 7 digits.
* --lara
*/
- const Anope::string &guestnick = Config->GetModule("nickserv")->Get<Anope::string>("guestnickprefix", "Guest");
+ const Anope::string &guestnick = Config->GetModule("nickserv/main")->Get<Anope::string>("guestnickprefix", "Guest");
if (nicklen <= guestnick.length() + 7 && nicklen >= guestnick.length() + 1 && !u_nick.find_ci(guestnick) && u_nick.substr(guestnick.length()).find_first_not_of("1234567890") == Anope::string::npos)
{
source.Reply(_("\002{0}\002 may not be registered."), u_nick);
@@ -180,7 +180,7 @@ class CommandNSRegister : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("restrictopernicks"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("restrictopernicks"))
for (Oper *o : Serialize::GetObjects<Oper *>())
{
if (!source.IsOper() && u_nick.find_ci(o->GetName()) != Anope::string::npos)
@@ -190,9 +190,9 @@ class CommandNSRegister : public Command
}
}
- unsigned int passlen = Config->GetModule("nickserv")->Get<unsigned>("passlen", "32");
+ unsigned int passlen = Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32");
- if (Config->GetModule("nickserv")->Get<bool>("forceemail", "yes") && email.empty())
+ if (Config->GetModule("nickserv/main")->Get<bool>("forceemail", "yes") && email.empty())
{
this->OnSyntaxError(source, "");
return;
@@ -217,9 +217,9 @@ class CommandNSRegister : public Command
return;
}
- if (pass.length() > Config->GetModule("nickserv")->Get<unsigned>("passlen", "32"))
+ if (pass.length() > Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"))
{
- source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv")->Get<unsigned>("passlen", "32"));
+ source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"));
return;
}
@@ -284,7 +284,7 @@ class CommandNSRegister : public Command
source.Reply(_("Registers your nickname. Once your nickname is registered, you will be able to use most features of services, including owning and managing channels."
"Make sure you remember the password - you'll need it to identify yourself later. Your email address will only be used if you forget your password."));
- if (!Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
+ if (!Config->GetModule("nickserv/main")->Get<bool>("forceemail", "yes"))
{
source.Reply(" ");
source.Reply(_("The \037email\037 parameter is optional and will set the email\n"
@@ -294,7 +294,7 @@ class CommandNSRegister : public Command
"after registering if it isn't the default setting already."));
}
- if (!Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (!Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
{
source.Reply(" ");
source.Reply(_("This command also creates a new group for your nickname, which will allow you to group other nicknames later, which share the same configuration, the same set of memos and the same channel privileges."));
diff --git a/modules/nickserv/set.cpp b/modules/nickserv/set.cpp
index bb6557f4b..7637c8e47 100644
--- a/modules/nickserv/set.cpp
+++ b/modules/nickserv/set.cpp
@@ -148,9 +148,9 @@ class CommandNSSetPassword : public Command
return;
}
- if (len > Config->GetModule("nickserv")->Get<unsigned>("passlen", "32"))
+ if (len > Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"))
{
- source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv")->Get<unsigned>("passlen", "32"));
+ source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"));
return;
}
@@ -197,7 +197,7 @@ class CommandNSSASetPassword : public Command
size_t len = params[1].length();
- if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
+ if (Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
{
source.Reply(_("You may not change the password of other Services Operators."));
return;
@@ -209,9 +209,9 @@ class CommandNSSASetPassword : public Command
return;
}
- if (len > Config->GetModule("nickserv")->Get<unsigned>("passlen", "32"))
+ if (len > Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"))
{
- source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv")->Get<unsigned>("passlen", "32"));
+ source.Reply(_("Your password is too long, it can not contain more than \002{0}\002 characters."), Config->GetModule("nickserv/main")->Get<unsigned>("passlen", "32"));
return;
}
@@ -330,7 +330,7 @@ class CommandNSSetDisplay : public Command
NickServ::Nick *user_na = NickServ::FindNick(user), *na = NickServ::FindNick(param);
- if (Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
{
source.Reply(_("This command may not be used on this network because nickname ownership is disabled."));
return;
@@ -455,13 +455,13 @@ class CommandNSSetEmail : public Command
return;
}
- if (param.empty() && Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
+ if (param.empty() && Config->GetModule("nickserv/main")->Get<bool>("forceemail", "yes"))
{
source.Reply(_("You cannot unset the e-mail on this network."));
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
+ if (Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
{
source.Reply(_("You may not change the e-mail of other Services Operators."));
return;
@@ -484,7 +484,7 @@ class CommandNSSetEmail : public Command
nc->SetEmail("");
source.Reply(_("E-mail address for \002{0}\002 unset."), nc->GetDisplay());
}
- else if (Config->GetModule("nickserv")->Get<bool>("confirmemailchanges") && !source.IsServicesOper())
+ else if (Config->GetModule("nickserv/main")->Get<bool>("confirmemailchanges") && !source.IsServicesOper())
{
if (SendConfirmMail(source.GetUser(), source.service, param))
source.Reply(_("A confirmation e-mail has been sent to \002{0}\002. Follow the instructions in it to change your e-mail address."), param);
@@ -626,7 +626,7 @@ class CommandNSSetKill : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("nonicknameownership"))
{
source.Reply(_("This command may not be used on this network because nickname ownership is disabled."));
return;
diff --git a/modules/nickserv/suspend.cpp b/modules/nickserv/suspend.cpp
index 9bdafa2d8..8f436e682 100644
--- a/modules/nickserv/suspend.cpp
+++ b/modules/nickserv/suspend.cpp
@@ -160,7 +160,7 @@ class CommandNSSuspend : public Command
return;
}
- if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && na->GetAccount()->IsServicesOper())
+ if (Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && na->GetAccount()->IsServicesOper())
{
source.Reply(_("You may not suspend other Services Operators' nicknames."));
return;
diff --git a/modules/operserv/forbid.cpp b/modules/operserv/forbid.cpp
index a4234fbbf..84f5d3a93 100644
--- a/modules/operserv/forbid.cpp
+++ b/modules/operserv/forbid.cpp
@@ -247,7 +247,7 @@ class CommandOSForbid : public Command
}
NickServ::Nick *target = NickServ::FindNick(entry);
- if (target != NULL && Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && target->GetAccount()->IsServicesOper())
+ if (target != NULL && Config->GetModule("nickserv/main")->Get<bool>("secureadmins", "yes") && target->GetAccount()->IsServicesOper())
{
source.Reply(_("Access denied."));
return;
diff --git a/modules/webcpanel/pages/register.cpp b/modules/webcpanel/pages/register.cpp
index c662397ab..cecba606c 100644
--- a/modules/webcpanel/pages/register.cpp
+++ b/modules/webcpanel/pages/register.cpp
@@ -25,7 +25,7 @@ bool WebCPanel::Register::OnRequest(HTTPProvider *server, const Anope::string &p
replacements["TITLE"] = page_title;
- if (Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
+ if (Config->GetModule("nickserv/main")->Get<bool>("forceemail", "yes"))
replacements["FORCE_EMAIL"] = "yes";
TemplateFileServer page("register.html");