Get rid of the remaining references in the core to specific services. Move more stuff out of the core to the proper modules.

4 files changed, 5 insertions, 0 deletions

diff --git a/modules/extra/m_ldap_authentication.cpp b/modules/extra/m_ldap_authentication.cpp
index 935ba76d5..617929380 100644
--- a/modules/extra/m_ldap_authentication.cpp
+++ b/modules/extra/m_ldap_authentication.cpp
@@ -104,6 +104,7 @@ class IdentifyInterface : public LDAPInterface
 					{
 						na = new NickAlias(ii->req->GetAccount(), new NickCore(ii->req->GetAccount()));
 						FOREACH_MOD(I_OnNickRegister, OnNickRegister(ii->user, na));
+						BotInfo *NickServ = Config->GetClient("NickServ");
 						if (ii->user && NickServ)
 							ii->user->SendMessage(NickServ, _("Your account \002%s\002 has been successfully created."), na->nick.c_str());
 					}
@@ -164,6 +165,7 @@ class OnIdentifyInterface : public LDAPInterface
 			if (!email.equals_ci(u->Account()->email))
 			{
 				u->Account()->email = email;
+				BotInfo *NickServ = Config->GetClient("NickServ");
 				if (NickServ)
 					u->SendMessage(NickServ, _("Your email has been updated to \002%s\002"), email.c_str());
 				Log(this->owner) << "m_ldap_authentication: Updated email address for " << u->nick << " (" << u->Account()->display << ") to " << email;
diff --git a/modules/extra/m_proxyscan.cpp b/modules/extra/m_proxyscan.cpp
index 4e2a6bd88..fb5f96758 100644
--- a/modules/extra/m_proxyscan.cpp
+++ b/modules/extra/m_proxyscan.cpp
@@ -85,6 +85,7 @@ class ProxyConnect : public ConnectionSocket
 		reason = reason.replace_all_cs("%i", this->conaddr.addr());
 		reason = reason.replace_all_cs("%p", stringify(this->conaddr.port()));
 
+		BotInfo *OperServ = Config->GetClient("OperServ");
 		Log(OperServ) << "PROXYSCAN: Open " << this->GetType() << " proxy found on " << this->conaddr.addr() << ":" << this->conaddr.port() << " (" << reason << ")";
 		XLine *x = new XLine("*@" + this->conaddr.addr(), OperServ ? OperServ->nick : "", Anope::CurTime + this->proxy.duration, reason, XLineManager::GenerateUID());
 		if (add_to_akill && akills)
diff --git a/modules/extra/m_sql_authentication.cpp b/modules/extra/m_sql_authentication.cpp
index ecc8700f6..648dc22c2 100644
--- a/modules/extra/m_sql_authentication.cpp
+++ b/modules/extra/m_sql_authentication.cpp
@@ -38,6 +38,7 @@ class SQLAuthenticationResult : public SQL::Interface
 		catch (const SQL::Exception &) { }
 
 		NickAlias *na = NickAlias::Find(req->GetAccount());
+		BotInfo *NickServ = Config->GetClient("NickServ");
 		if (na == NULL)
 		{
 			na = new NickAlias(req->GetAccount(), new NickCore(req->GetAccount()));
diff --git a/modules/extra/m_sql_oper.cpp b/modules/extra/m_sql_oper.cpp
index 0289e9a22..6f9f05004 100644
--- a/modules/extra/m_sql_oper.cpp
+++ b/modules/extra/m_sql_oper.cpp
@@ -41,6 +41,7 @@ class SQLOperResult : public SQL::Interface
 		}
 		catch (const SQL::Exception &) { }
 
+		BotInfo *OperServ = Config->GetClient("OperServ");
 		if (opertype.empty())
 		{
 			if (user->Account() && user->Account()->o && !user->Account()->o->config)