X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=f4a5bd620e32f18ae18c27fac7f04786157ceda0;hb=df4f0dc888a2a24e7f8b42a1c21670679e633506;hp=4df2db95e4ec38e2c6d8e43720f28e8198126bcc;hpb=67878d628c15f2adec41b6d3b266830a636c2ed0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 4df2db95e..f4a5bd620 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -11,12 +11,13 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#define _CRT_SECURE_NO_DEPRECATE
+#define _SCL_SECURE_NO_DEPRECATE
+
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -92,11 +93,11 @@ class ModuleCensor : public Module
  
  public:
 	ModuleCensor(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		/* Read the configuration file on startup.
 		 */
-		OnRehash("");
+		OnRehash(NULL,"");
 		cu = new CensorUser(ServerInstance);
 		cc = new CensorChannel(ServerInstance);
 		if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G'))
@@ -132,6 +133,9 @@ 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)
 	{
+		if (!IS_LOCAL(user))
+			return 0;
+
 		bool active = false;
 
 		if (target_type == TYPE_USER)
@@ -147,6 +151,12 @@ class ModuleCensor : public Module
 		{ 
 			if (text2.find(index->first) != irc::string::npos)
 			{
+				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());
+					return 1;
+				}
+				
 				this->ReplaceLine(text2,index->first,index->second);
 			}
 		}
@@ -159,7 +169,7 @@ class ModuleCensor : public Module
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 	
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		/*
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
@@ -183,28 +193,4 @@ class ModuleCensor : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCensorFactory : public ModuleFactory
-{
- public:
-	ModuleCensorFactory()
-	{
-	}
-	
-	~ModuleCensorFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCensor(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleCensorFactory;
-}
+MODULE_INIT(ModuleCensor)