X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=e790a15d847a7aacfa176e14f654464b4463db95;hb=04cfaea87edd1b4b742cb607ea69ece760c460aa;hp=cd7300372315bd464babb52f7766b1464a6d3194;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index cd7300372..e790a15d8 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -18,14 +18,13 @@
 #include "u_listmode.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
-/* $ModDep: ../../include/u_listmode.h */
 
 /** Handles channel mode +g
  */
 class ChanFilter : public ListModeBase
 {
  public:
-	ChanFilter(Module* Creator) : ListModeBase(Creator, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
+	ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
 
 	virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
 	{
@@ -69,11 +68,10 @@ class ModuleChanFilter : public Module
 			throw ModuleException("Could not add new modes!");
 
 		cf.DoImplements(this);
-		Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 
 		OnRehash(NULL);
-		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 	}
 
 	virtual void OnRehash(User* user)
@@ -85,7 +83,10 @@ class ModuleChanFilter : public Module
 
 	virtual ModResult ProcessMessages(User* user,Channel* chan,std::string &text)
 	{
-		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT('g') && chan->GetPrefixValue(user) == OP_VALUE))
+		ModResult res;
+		FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,chan,"filter"));
+
+		if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
 		modelist* list = cf.extItem.get(chan);
@@ -122,11 +123,6 @@ class ModuleChanFilter : public Module
 		cf.DoCleanup(target_type, item);
 	}
 
-	virtual const char* OnRequest(Request* request)
-	{
-		return cf.DoOnRequest(request);
-	}
-
 	virtual ModResult 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);
@@ -139,13 +135,11 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);
 	}
 
 	virtual ~ModuleChanFilter()
 	{
-		ServerInstance->Modes->DelMode(&cf);
-		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };