X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_censor.cpp;h=31309ed2f013a56e71fea5c90c4f814c42fc65a7;hb=965c81baee0fb6f46aa788f45742d558f50c8b15;hp=fce00dfc73551e07cd056da29e782def43e943ce;hpb=2fcb5ff4389a9a82d253acdff02a388ddcf14653;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index fce00dfc7..31309ed2f 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -23,7 +23,7 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-typedef insp::flat_map<irc::string, irc::string> censor_t;
+typedef insp::flat_map<std::string, std::string, irc::insensitive_swo> censor_t;
 
 class ModuleCensor : public Module
 {
@@ -46,39 +46,55 @@ class ModuleCensor : public Module
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		bool active = false;
+		int numeric = 0;
+		const char* targetname = NULL;
 
-		if (target.type == MessageTarget::TYPE_USER)
-			active = target.Get<User>()->IsModeSet(cu);
-		else if (target.type == MessageTarget::TYPE_CHANNEL)
+		switch (target.type)
 		{
-			Channel* c = target.Get<Channel>();
-			active = c->IsModeSet(cc);
-			ModResult res = CheckExemption::Call(exemptionprov, user, c, "censor");
+			case MessageTarget::TYPE_USER:
+			{
+				User* targuser = target.Get<User>();
+				if (!targuser->IsModeSet(cu))
+					return MOD_RES_PASSTHRU;
+
+				numeric = ERR_CANTSENDTOUSER;
+				targetname = targuser->nick.c_str();
+				break;
+			}
+
+			case MessageTarget::TYPE_CHANNEL:
+			{
+				Channel* targchan = target.Get<Channel>();
+				if (!targchan->IsModeSet(cc))
+					return MOD_RES_PASSTHRU;
+
+				ModResult result = CheckExemption::Call(exemptionprov, user, targchan, "censor");
+				if (result == MOD_RES_ALLOW)
+					return MOD_RES_PASSTHRU;
 
-			if (res == MOD_RES_ALLOW)
+				numeric = ERR_CANNOTSENDTOCHAN;
+				targetname = targchan->name.c_str();
+				break;
+			}
+
+			default:
 				return MOD_RES_PASSTHRU;
 		}
 
-		if (!active)
-			return MOD_RES_PASSTHRU;
-
-		irc::string text2 = details.text.c_str();
 		for (censor_t::iterator index = censors.begin(); index != censors.end(); index++)
 		{
-			if (text2.find(index->first) != irc::string::npos)
+			size_t censorpos;
+			while ((censorpos = irc::find(details.text, index->first)) != std::string::npos)
 			{
 				if (index->second.empty())
 				{
-					const std::string targname = target.type == MessageTarget::TYPE_CHANNEL ? target.Get<Channel>()->name : target.Get<User>()->nick;
-					user->WriteNumeric(ERR_WORDFILTERED, targname, index->first.c_str(), "Your message contained a censored word, and was blocked");
+					user->WriteNumeric(numeric, targetname, "Your message contained a censored word (" + index->first + "), and was blocked");
 					return MOD_RES_DENY;
 				}
 
-				stdalgo::string::replace_all(text2, index->first, index->second);
+				details.text.replace(censorpos, index->first.size(), index->second);
 			}
 		}
-		details.text = text2.c_str();
 		return MOD_RES_PASSTHRU;
 	}
 
@@ -88,17 +104,20 @@ class ModuleCensor : public Module
 		 * reload our config file on rehash - we must destroy and re-allocate the classes
 		 * to call the constructor again and re-read our data.
 		 */
-		censors.clear();
+		censor_t newcensors;
 
 		ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
 		for (ConfigIter i = badwords.first; i != badwords.second; ++i)
 		{
 			ConfigTag* tag = i->second;
-			std::string str = tag->getString("text");
-			irc::string pattern(str.c_str());
-			str = tag->getString("replace");
-			censors[pattern] = irc::string(str.c_str());
+			const std::string text = tag->getString("text");
+			if (text.empty())
+				throw ModuleException("<badword:text> is empty! at " + tag->getTagLocation());
+
+			const std::string replace = tag->getString("replace");
+			newcensors[text] = replace;
 		}
+		censors.swap(newcensors);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE