X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_chanfilter.cpp;h=5fe3f7d4bac2298b661ae41bfdbe73b77843e8da;hb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;hp=375fbce9c5fdecd39e2b2329d6a60af32ccfae21;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 375fbce9c..5fe3f7d4b 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,10 +15,6 @@
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
 #include "u_listmode.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
@@ -31,7 +27,7 @@ class ChanFilter : public ListModeBase
  public:
 	ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
 	
-	virtual bool ValidateParam(userrec* user, chanrec* chan, std::string &word)
+	virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
 	{
 		if ((word.length() > 35) || (word.empty()))
 		{
@@ -42,18 +38,18 @@ class ChanFilter : public ListModeBase
 		return true;
 	}
 	
-	virtual bool TellListTooLong(userrec* user, chanrec* chan, std::string &word)
+	virtual bool TellListTooLong(User* user, Channel* chan, std::string &word)
 	{
 		user->WriteServ("939 %s %s %s :Channel spamfilter list is full",user->nick, chan->name, word.c_str());
 		return true;
 	}
 	
-	virtual void TellAlreadyOnList(userrec* user, chanrec* chan, std::string &word)
+	virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
 	{
 		user->WriteServ("937 %s %s :The word %s is already on the spamfilter list",user->nick, chan->name,word.c_str());
 	}
 	
-	virtual void TellNotSet(userrec* user, chanrec* chan, std::string &word)
+	virtual void TellNotSet(User* user, Channel* chan, std::string &word)
 	{
 		user->WriteServ("938 %s %s :No such spamfilter word is set",user->nick, chan->name);
 	}
@@ -70,27 +66,25 @@ class ModuleChanFilter : public Module
 		: Module(Me)
 	{
 		cf = new ChanFilter(ServerInstance);
-		if (!ServerInstance->AddMode(cf, 'g'))
+		if (!ServerInstance->AddMode(cf))
 			throw ModuleException("Could not add new modes!");
-	}
 
-	void Implements(char* List) 
-	{ 
-		cf->DoImplements(List);
-		List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
+		cf->DoImplements(this);
+		Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
+		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
 
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		cf->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		cf->DoRehash();
 	}
 
-	virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
+	virtual int ProcessMessages(User* user,Channel* chan,std::string &text)
 	{
 		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
 			return 0;
@@ -116,11 +110,11 @@ class ModuleChanFilter : public Module
 		return 0;
 	}
 
-	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 (target_type == TYPE_CHANNEL)
 		{
-			return ProcessMessages(user,(chanrec*)dest,text);
+			return ProcessMessages(user,(Channel*)dest,text);
 		}
 		else return 0;
 	}
@@ -130,12 +124,12 @@ class ModuleChanFilter : public Module
 		cf->DoCleanup(target_type, item);
 	}
 	
-	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 OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+	virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
 		cf->DoSyncChannel(chan, proto, opaque);
 	}
@@ -148,7 +142,7 @@ class ModuleChanFilter : public Module
 	virtual ~ModuleChanFilter()
 	{
 		ServerInstance->Modes->DelMode(cf);
-		DELETE(cf);
+		delete cf;
 	}
 };