X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=9c68be7fdcb23a62771d0d9deb7377fbe58ec063;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=4eaf1e3b47406a4f982cd1ce9b44779c58e8cf5a;hpb=0b58bc2585ccc96219a238a9ef9ff73a125fa531;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 4eaf1e3b4..9c68be7fd 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -15,6 +15,7 @@
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
+#include <iostream>
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -22,111 +23,44 @@ typedef std::map<irc::string,irc::string> censor_t;
 
 /** Handles usermode +G
  */
-class CensorUser : public ModeHandler
+class CensorUser : public SimpleUserModeHandler
 {
  public:
-	CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('G'))
-			{
-				dest->SetMode('G',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('G'))
-			{
-				dest->SetMode('G',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	CensorUser(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'G') { }
 };
 
 /** Handles channel mode +G
  */
-class CensorChannel : public ModeHandler
+class CensorChannel : public SimpleChannelModeHandler
 {
  public:
-	CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('G'))
-			{
-				channel->SetMode('G',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('G'))
-			{
-				channel->SetMode('G',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
+	CensorChannel(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'G') { }
 };
 
 class ModuleCensor : public Module
 {
-
-	
 	censor_t censors;
-	CensorUser *cu;
-	CensorChannel *cc;
- 
+	CensorUser cu;
+	CensorChannel cc;
+
  public:
 	ModuleCensor(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), cu(Me), cc(Me)
 	{
 		/* Read the configuration file on startup.
 		 */
-		OnRehash(NULL,"");
-		cu = new CensorUser(ServerInstance);
-		cc = new CensorChannel(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc))
-		{
-			delete cu;
-			delete cc;
+		OnRehash(NULL);
+		if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc))
 			throw ModuleException("Could not add new modes!");
-		}
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
 
 	virtual ~ModuleCensor()
 	{
-		ServerInstance->Modes->DelMode(cu);
-		ServerInstance->Modes->DelMode(cc);
-		delete cu;
-		delete cc;
-	}
-
-	virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
-	{
-		if ((!pattern.empty()) && (!text.empty()))
-		{
-			std::string::size_type pos;
-			while ((pos = text.find(pattern)) != irc::string::npos)
-			{
-				text.erase(pos,pattern.length());
-				text.insert(pos,replace);
-			}
-		}
+		ServerInstance->Modes->DelMode(&cu);
+		ServerInstance->Modes->DelMode(&cc);
 	}
 
 	// format of a config entry is <badword text="shit" replace="poo">
@@ -154,28 +88,28 @@ class ModuleCensor : public Module
 
 		irc::string text2 = text.c_str();
 		for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
-		{ 
+		{
 			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, ((Channel*)dest)->name, index->first.c_str());
+					user->WriteNumeric(ERR_WORDFILTERED, "%s %s %s :Your message contained a censored word, and was blocked", user->nick.c_str(), ((Channel*)dest)->name.c_str(), index->first.c_str());
 					return 1;
 				}
-				
-				this->ReplaceLine(text2,index->first,index->second);
+
+				SearchAndReplace(text2, index->first, index->second);
 			}
 		}
 		text = text2.c_str();
 		return 0;
 	}
-	
+
 	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 OnRehash(User* user, const std::string &parameter)
+
+	virtual void OnRehash(User* user)
 	{
 		/*
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
@@ -193,12 +127,12 @@ class ModuleCensor : public Module
 
 		delete MyConf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleCensor)