X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=cd02fffe2d1dd66be3e18e4fedabd3843914662c;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=1530a85e0019bedb2ec36fcf06428536e3937d9f;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 1530a85e0..cd02fffe2 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -39,20 +39,23 @@ class ModuleBlockCAPS : public Module
 	int percent;
 	unsigned int minlen;
 	char capsmap[256];
-public:
 
+public:
 	ModuleBlockCAPS() : bc(this)
+	{
+	}
+
+	void init()
 	{
 		OnRehash(NULL);
-		if (!ServerInstance->Modes->AddMode(&bc))
-			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->AddService(bc);
 		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		ServerInstance->AddExtBanChar('B');
+		tokens["EXTBAN"].push_back('B');
 	}
 
 	virtual void OnRehash(User* user)
@@ -109,31 +112,25 @@ public:
 
 	void ReadConf()
 	{
-		ConfigReader Conf;
-		percent = Conf.ReadInteger("blockcaps", "percent", "100", 0, true);
-		minlen = Conf.ReadInteger("blockcaps", "minlen", "1", 0, true);
-		std::string hmap = Conf.ReadValue("blockcaps", "capsmap", 0);
-		if (hmap.empty())
-			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps");
+		percent = tag->getInt("percent", 100);
+		minlen = tag->getInt("minlen", 1);
+		std::string hmap = tag->getString("capsmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
 		memset(capsmap, 0, sizeof(capsmap));
 		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
 			capsmap[(unsigned char)*n] = 1;
 		if (percent < 1 || percent > 100)
 		{
-			ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
+			ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "<blockcaps:percent> out of range, setting to default of 100.");
 			percent = 100;
 		}
 		if (minlen < 1 || minlen > MAXBUF-1)
 		{
-			ServerInstance->Logs->Log("CONFIG",DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
+			ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "<blockcaps:minlen> out of range, setting to default of 1.");
 			minlen = 1;
 		}
 	}
 
-	virtual ~ModuleBlockCAPS()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR);