X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcaps.cpp;h=7146ee068d421b0cf83525117eaad13355cd7b09;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=1530a85e0019bedb2ec36fcf06428536e3937d9f;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 1530a85e0..7146ee068 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -42,12 +42,15 @@ class ModuleBlockCAPS : public Module
 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)
@@ -64,7 +67,7 @@ public:
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
-			if ((!IS_LOCAL(user)) || (text.length() < minlen))
+			if ((!IS_LOCAL(user)) || (text.length() < minlen) || (text == "\1ACTION\1") || (text == "\1ACTION"))
 				return MOD_RES_PASSTHRU;
 
 			Channel* c = (Channel*)dest;
@@ -109,12 +112,10 @@ 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;