X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=faf2a4200334d9dcd51654e0e67950d7c7f83313;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=fc640624ce3529b189d4b0d1a297648608fe90a1;hpb=c4d6ce8c5e1802e5b834d5845e31c3adf7700585;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index fc640624c..faf2a4200 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -75,10 +75,11 @@ class ModuleCensor : public Module
 		{
 			active = ((Channel*)dest)->IsModeSet('G');
 			Channel* c = (Channel*)dest;
-			if (CHANOPS_EXEMPT('G') && c->GetPrefixValue(user) == OP_VALUE)
-			{
+			ModResult res;
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"censor"));
+
+			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
-			}
 		}
 
 		if (!active)
@@ -113,22 +114,20 @@ 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 = new ConfigReader;
+		ConfigReader MyConf;
 		censors.clear();
 
-		for (int index = 0; index < MyConf->Enumerate("badword"); index++)
+		for (int index = 0; index < MyConf.Enumerate("badword"); index++)
 		{
-			irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
-			irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
+			irc::string pattern = (MyConf.ReadValue("badword","text",index)).c_str();
+			irc::string replace = (MyConf.ReadValue("badword","replace",index)).c_str();
 			censors[pattern] = replace;
 		}
-
-		delete MyConf;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR);
 	}
 
 };