m_noctcp Make extban 'C' work as intended

[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 5e832cc8b6007e12c6197d91ebd97c45caefe355..03a211ad8dec9cbaf47533b9fbacb9fa17379b8a 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -123,14 +123,16 @@ 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.
                 */
-               ConfigReader MyConf;
                censors.clear();
 
-               for (int index = 0; index < MyConf.Enumerate("badword"); index++)
+               ConfigTagList badwords = ServerInstance->Config->ConfTags("badword");
+               for (ConfigIter i = badwords.first; i != badwords.second; ++i)
                {
-                       irc::string pattern = (MyConf.ReadValue("badword","text",index)).c_str();
-                       irc::string replace = (MyConf.ReadValue("badword","replace",index)).c_str();
-                       censors[pattern] = replace;
+                       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());
                }
        }