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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 4b08e3711..faf2a4200 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -76,7 +76,7 @@ class ModuleCensor : public Module
 			active = ((Channel*)dest)->IsModeSet('G');
 			Channel* c = (Channel*)dest;
 			ModResult res;
-			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (c->GetUser(user),c,"censor"));
+			FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"censor"));
 
 			if (res == MOD_RES_ALLOW)
 				return MOD_RES_PASSTHRU;
@@ -114,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);
 	}
 
 };