Show reasons in xline expiry messages.

[user/henk/code/inspircd.git] / src / modules / m_censor.cpp

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index fce00dfc73551e07cd056da29e782def43e943ce..fedc0f7130f7d7a6e04760e48d02677b63063a6f 100644 (file)
--- 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
 {
@@ -63,22 +63,21 @@ class ModuleCensor : public Module
                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(ERR_CANNOTSENDTOCHAN, targname, "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;
        }
 
@@ -94,10 +93,12 @@ class ModuleCensor : public Module
                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())
+                               continue;
+
+                       const std::string replace = tag->getString("replace");
+                       censors[text] = replace;
                }
        }