X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=9c68be7fdcb23a62771d0d9deb7377fbe58ec063;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=c980a1f454eaa67a7418c6d3f075b139d60f442b;hpb=267634cc1a5700787b53d0f8421aed63d08f7773;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index c980a1f45..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.
@@ -40,24 +40,18 @@ class CensorChannel : public SimpleChannelModeHandler
 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, I_OnRunTestSuite };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
@@ -65,53 +59,8 @@ class ModuleCensor : public Module
 
 	virtual ~ModuleCensor()
 	{
-		ServerInstance->Modes->DelMode(cu);
-		ServerInstance->Modes->DelMode(cc);
-		delete cu;
-		delete cc;
-	}
-
-	virtual void OnRunTestSuite()
-	{
-		std::cout << "Test suite for m_censor:" << std::endl;
-
-		irc::string text = "original text";
-		irc::string pattern = "text";
-		irc::string replace = "new";
-		std::cout << (ReplaceLine(text, pattern, replace) == "original new" ? "\nSUCCESS!\n" : "\nFAILURE '" + text + "' \n");
-		text = "original text here";
-		pattern = "text";
-		replace = "texts";
-		std::cout << (ReplaceLine(text, pattern, replace) == "original texts here" ? "\nSUCCESS!\n" : "\nFAILURE: '" + text + "' \n");
-		text = "original text";
-		pattern = "original";
-		replace = "new";
-		std::cout << (ReplaceLine(text, pattern, replace) == "new text" ? "\nSUCCESS!\n" : "\nFAILURE '" + text + "' \n");
-		std::cout << "end of test suite for m_censor" << std::endl;
-	}
-
-	/* This version of ReplaceLine won't loop forever if the replacement string contains the source pattern */
-	virtual const irc::string& ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
-	{
-		irc::string replacement;
-		if ((!pattern.empty()) && (!text.empty()))
-		{
-			for (std::string::size_type n = 0; n != text.length(); ++n)
-			{
-				if (text.length() >= pattern.length() && text.substr(n, pattern.length()) == pattern)
-				{
-					/* Found the pattern in the text, replace it, and advance */
-					replacement.append(replace);
-					n = n + pattern.length() - 1;
-				}
-				else
-				{
-					replacement += text[n];
-				}
-			}
-		}
-		text = replacement;
-		return text;
+		ServerInstance->Modes->DelMode(&cu);
+		ServerInstance->Modes->DelMode(&cc);
 	}
 
 	// format of a config entry is <badword text="shit" replace="poo">
@@ -148,7 +97,7 @@ class ModuleCensor : public Module
 					return 1;
 				}
 
-				this->ReplaceLine(text2,index->first,index->second);
+				SearchAndReplace(text2, index->first, index->second);
 			}
 		}
 		text = text2.c_str();
@@ -160,7 +109,7 @@ class ModuleCensor : public Module
 		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