X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanfilter.cpp;h=19e1fe3d92bdf14526262b6eed988d86b0d7002f;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=c4a69cc10dfd4e5f90ee4dbd09737b3f84c43911;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index c4a69cc10..19e1fe3d9 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -11,15 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "u_listmode.h"
+#define _CRT_SECURE_NO_DEPRECATE
+#define _SCL_SECURE_NO_DEPRECATE
+
 #include "inspircd.h"
+#include "u_listmode.h"
 
 /* $ModDesc: Provides channel-specific censor lists (like mode +G but varies from channel to channel) */
 /* $ModDep: ../../include/u_listmode.h */
@@ -67,10 +63,11 @@ class ModuleChanFilter : public Module
  public:
  
 	ModuleChanFilter(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		cf = new ChanFilter(ServerInstance);
-		ServerInstance->AddMode(cf, 'g');
+		if (!ServerInstance->AddMode(cf, 'g'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List) 
@@ -84,13 +81,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();
 
@@ -108,6 +108,7 @@ class ModuleChanFilter : public Module
 				}
 			}
 		}
+
 		return 0;
 	}
 
@@ -147,27 +148,4 @@ class ModuleChanFilter : public Module
 	}
 };
 
-
-class ModuleChanFilterFactory : public ModuleFactory
-{
- public:
-	ModuleChanFilterFactory()
-	{
-	}
-	
-	~ModuleChanFilterFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChanFilter(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleChanFilterFactory;
-}
+MODULE_INIT(ModuleChanFilter)