X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=3b7545b58e4c2ab7f41fdcf8e5e81fc555d2d0fa;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=657ad7f443385e80570658adbc045afc3dfd8a28;hpb=2e52ff280dca14d1598b84fab7a8c2e93fa30910;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 657ad7f44..3b7545b58 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -2,20 +2,15 @@
  *       | 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 "users.h"
@@ -36,10 +31,6 @@ class CensorUser : public ModeHandler
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
-		/* Only opers can change other users modes */
-		if ((source != dest) && (!*source->oper))
-			return MODEACTION_DENY;
-
 		if (adding)
 		{
 			if (!dest->IsModeSet('G'))
@@ -74,7 +65,7 @@ class CensorChannel : public ModeHandler
 		{
 			if (!channel->IsModeSet('G'))
 			{
-				channel->SetMode('G',false);
+				channel->SetMode('G',true);
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -105,11 +96,11 @@ class ModuleCensor : public Module
 	{
 		/* Read the configuration file on startup.
 		 */
-		OnRehash("");
+		OnRehash(NULL,"");
 		cu = new CensorUser(ServerInstance);
 		cc = new CensorChannel(ServerInstance);
-		ServerInstance->AddMode(cu, 'G');
-		ServerInstance->AddMode(cc, 'G');
+		if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G'))
+			throw ModuleException("Could not add new modes!");
 	}
 
 	void Implements(char* List)
@@ -127,11 +118,11 @@ class ModuleCensor : public Module
 
 	virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
 	{
-		if ((pattern != "") && (text != ""))
+		if ((!pattern.empty()) && (!text.empty()))
 		{
-			while (text.find(pattern) != irc::string::npos)
+			std::string::size_type pos;
+			while ((pos = text.find(pattern)) != irc::string::npos)
 			{
-				int pos = text.find(pattern);
 				text.erase(pos,pattern.length());
 				text.insert(pos,replace);
 			}
@@ -141,30 +132,28 @@ 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)
+			active = ((userrec*)dest)->IsModeSet('G');
+		else if (target_type == TYPE_CHANNEL)
+			active = ((chanrec*)dest)->IsModeSet('G');
+
+		if (!active)
+			return 0;
+
 		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 (target_type == TYPE_USER)
-				{
-					userrec* t = (userrec*)dest;
-					active = t->IsModeSet('G');
-				}
-				else if (target_type == TYPE_CHANNEL)
-				{
-					chanrec* t = (chanrec*)dest;
-					active = t->IsModeSet('G');
-				}
-				
-				if (active)
-				{
-					this->ReplaceLine(text2,index->first,index->second);
-					text = text2.c_str();
-				}
+				this->ReplaceLine(text2,index->first,index->second);
 			}
 		}
+		text = text2.c_str();
 		return 0;
 	}
 	
@@ -173,7 +162,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