X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=de74773ad5784c9d9ff8556bf0868805b25eab4f;hb=c202dea024542b9c6c6b771bb9a3a081d9eacdc5;hp=91d417b10c09555bd656fea3fcc7a390a94b6c4d;hpb=967bce73791bd3dcfe3b5f342a4d6b3a33330bd0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 91d417b10..de74773ad 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -22,8 +22,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implementation of callerid, usermode +g, /accept */
-
 class callerid_data
 {
  public:
@@ -122,7 +120,7 @@ struct CallerIDExtInfo : public ExtensionItem
 
 			if (!targ)
 			{
-				ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
 				continue; // shouldn't happen, but oh well.
 			}
 
@@ -130,7 +128,7 @@ struct CallerIDExtInfo : public ExtensionItem
 			if (it2 != targ->wholistsme.end())
 				targ->wholistsme.erase(it2);
 			else
-				ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
 	}
@@ -169,7 +167,7 @@ public:
 	{
 		allow_empty_last_param = false;
 		syntax = "{[+|-]<nicks>}|*}";
-		TRANSLATE2(TR_CUSTOM, TR_END);
+		TRANSLATE1(TR_CUSTOM);
 	}
 
 	void EncodeParameter(std::string& parameter, int index)
@@ -304,7 +302,7 @@ public:
 		if (!dat2)
 		{
 			// How the fuck is this possible.
-			ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
 			return false;
 		}
 
@@ -313,7 +311,7 @@ public:
 			// Found me!
 			dat2->wholistsme.erase(it);
 		else
-			ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
 
 
 		user->WriteNotice(whotoremove->nick + " is no longer on your accept list");
@@ -352,7 +350,7 @@ class ModuleCallerID : public Module
 			if (it2 != dat->accepting.end())
 				dat->accepting.erase(it2);
 			else
-				ServerInstance->Logs->Log("m_callerid", LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
 		}
 
 		userdata->wholistsme.clear();
@@ -365,14 +363,9 @@ public:
 
 	void init() CXX11_OVERRIDE
 	{
-		OnRehash(NULL);
-
 		ServerInstance->Modules->AddService(myumode);
 		ServerInstance->Modules->AddService(cmd);
 		ServerInstance->Modules->AddService(cmd.extInfo);
-
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreMessage };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
@@ -387,7 +380,7 @@ public:
 
 	ModResult PreText(User* user, User* dest, std::string& text)
 	{
-		if (!dest->IsModeSet('g') || (user == dest))
+		if (!dest->IsModeSet(myumode) || (user == dest))
 			return MOD_RES_PASSTHRU;
 
 		if (operoverride && user->IsOper())
@@ -432,7 +425,7 @@ public:
 		RemoveFromAllAccepts(user);
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
 		cmd.maxaccepts = tag->getInt("maxaccepts", 16);