X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=3c16b013d0550aba81666a84608b2fb70331df2a;hb=f9c801f73939c3c0fd445d8f03d1670f2a3693c0;hp=31a30de0e7933bfa55235c2d2275002ddc9fd158;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 31a30de0e..3c16b013d 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -2,42 +2,40 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <string>
 #include <vector>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "hashcomp.h"
 #include "u_listmode.h"
+#include "inspircd.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(Server* serv) : ListModeBase(serv, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
+	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)
 	{
-		if (word.length() > 35)
+		if ((word.length() > 35) || (word.empty()))
 		{
-			user->WriteServ( "935 %s %s %s :word is too long for censor list",user->nick, chan->name,word.c_str());
+			user->WriteServ("935 %s %s %s :word is too %s for censor list",user->nick, chan->name,word.c_str(), (word.empty() ? "short" : "long"));
 			return false;
 		}
 		
@@ -63,27 +61,23 @@ class ChanFilter : public ListModeBase
 
 class ModuleChanFilter : public Module
 {
-	Server *Srv;
+	
 	ChanFilter* cf;
 	
  public:
  
-	ModuleChanFilter(Server* Me)
-	: Module::Module(Me), Srv(Me)
+	ModuleChanFilter(InspIRCd* Me)
+		: Module::Module(Me)
 	{
-		cf = new ChanFilter(Srv);
-		Srv->AddMode(cf, 'g');
+		cf = new ChanFilter(ServerInstance);
+		if (!ServerInstance->AddMode(cf, 'g'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List) 
 	{ 
 		cf->DoImplements(List);
-		List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
-	}
-	
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output,"g",1);
+		List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnSyncChannel] = 1;
 	}
 
 	virtual void OnChannelDelete(chanrec* chan)
@@ -91,13 +85,16 @@ class ModuleChanFilter : public Module
 		cf->DoChannelDelete(chan);
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		cf->DoRehash();
 	}
 
 	virtual int ProcessMessages(userrec* user,chanrec* chan,std::string &text)
 	{
+		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'g') && chan->GetStatus(user) == STATUS_OP)
+			return 0;
+
 		// Create a copy of the string in irc::string
 		irc::string line = text.c_str();
 
@@ -115,10 +112,11 @@ class ModuleChanFilter : public Module
 				}
 			}
 		}
+
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
@@ -132,9 +130,9 @@ class ModuleChanFilter : public Module
 		cf->DoCleanup(target_type, item);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
 	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
@@ -144,11 +142,12 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 	virtual ~ModuleChanFilter()
 	{
+		ServerInstance->Modes->DelMode(cf);
 		DELETE(cf);
 	}
 };
@@ -165,7 +164,7 @@ class ModuleChanFilterFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleChanFilter(Me);
 	}