X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=03c5bfb69e2ff5685c14d7acdf5b26ce8ef60eff;hb=2ab88037d8d7d6df3fb9686216a0b36f5ece2313;hp=7fea6be06e9bfe757385e4ceab7a9393455cd230;hpb=f901c996b97c6d20d776ae2e916fcd75131d13db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 7fea6be06..03c5bfb69 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -15,9 +15,6 @@
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -30,7 +27,7 @@ class CensorUser : public ModeHandler
  public:
 	CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -60,7 +57,7 @@ class CensorChannel : public ModeHandler
  public:
 	CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -100,7 +97,7 @@ class ModuleCensor : public Module
 		OnRehash(NULL,"");
 		cu = new CensorUser(ServerInstance);
 		cc = new CensorChannel(ServerInstance);
-		if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G'))
+		if (!ServerInstance->AddMode(cu) || !ServerInstance->AddMode(cc))
 			throw ModuleException("Could not add new modes!");
 	}
 
@@ -113,8 +110,8 @@ class ModuleCensor : public Module
 	{
 		ServerInstance->Modes->DelMode(cu);
 		ServerInstance->Modes->DelMode(cc);
-		DELETE(cu);
-		DELETE(cc);
+		delete cu;
+		delete cc;
 	}
 
 	virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
@@ -131,7 +128,7 @@ class ModuleCensor : public Module
 	}
 
 	// format of a config entry is <badword text="shit" replace="poo">
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (!IS_LOCAL(user))
 			return 0;
@@ -139,9 +136,9 @@ class ModuleCensor : public Module
 		bool active = false;
 
 		if (target_type == TYPE_USER)
-			active = ((userrec*)dest)->IsModeSet('G');
+			active = ((User*)dest)->IsModeSet('G');
 		else if (target_type == TYPE_CHANNEL)
-			active = ((chanrec*)dest)->IsModeSet('G');
+			active = ((Channel*)dest)->IsModeSet('G');
 
 		if (!active)
 			return 0;
@@ -153,7 +150,7 @@ class ModuleCensor : public Module
 			{
 				if (index->second.empty())
 				{
-					user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((chanrec*)dest)->name, index->first.c_str());
+					user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str());
 					return 1;
 				}
 				
@@ -164,12 +161,12 @@ class ModuleCensor : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		/*
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
@@ -177,13 +174,15 @@ class ModuleCensor : public Module
 		 */
 		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		censors.clear();
+
 		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();
 			censors[pattern] = replace;
 		}
-		DELETE(MyConf);
+
+		delete MyConf;
 	}
 	
 	virtual Version GetVersion()
@@ -193,4 +192,4 @@ class ModuleCensor : public Module
 	
 };
 
-MODULE_INIT(ModuleCensor);
+MODULE_INIT(ModuleCensor)