X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=50c8e22a7212d738b33075f15f74a848167f1ea5;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=bbf061f7ea3cd6ec719959e2d3e09e4321377ba3;hpb=02859be56d43bcece02aab350e02bc95ed1bf446;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index bbf061f7e..50c8e22a7 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -63,7 +63,7 @@ class ModuleCensor : public Module
 		ServerInstance->Modules->AddService(cu);
 		ServerInstance->Modules->AddService(cc);
 		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 
@@ -123,14 +123,15 @@ class ModuleCensor : public Module
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
 		 * to call the constructor again and re-read our data.
 		 */
-		ConfigReader MyConf;
 		censors.clear();
 
-		for (int index = 0; index < MyConf.Enumerate("badword"); index++)
+		ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
+		for (ConfigIter i = badwords.first; i != badwords.second; ++i)
 		{
-			std::string str = MyConf.ReadValue("badword","text",index);
+			ConfigTag* tag = i->second;
+			std::string str = tag->getString("text");
 			irc::string pattern(str.c_str());
-			str = MyConf.ReadValue("badword","replace",index);
+			str = tag->getString("replace");
 			censors[pattern] = irc::string(str.c_str());
 		}
 	}