Newly revamped ziplinks module, work of psychon.. resolves (a lot) of problems with...

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

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 64bb949bc68ad9f862a9ab30656fc44b183156bf..4710d7a33b5836d67ff69274f94c8c0363be0cf9 100644 (file)
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -32,8 +32,8 @@ class PCREFilter : public FilterResult
  public:
         pcre* regexp;
 
-        PCREFilter(pcre* r, const std::string &rea, const std::string &act, long gline_time, const std::string &pat, const std::string &flags)
-                : FilterResult(pat, rea, act, gline_time, flags), regexp(r)
+        PCREFilter(pcre* r, const std::string &rea, const std::string &act, long glinetime, const std::string &pat, const std::string &flgs)
+                : FilterResult(pat, rea, act, glinetime, flgs), regexp(r)
         {
         }
 
@@ -62,13 +62,13 @@ class ModuleFilterPCRE : public FilterBase
        {
        }
 
-       virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
+       virtual FilterResult* FilterMatch(User* user, const std::string &text, int flgs)
        {
                for (std::vector<PCREFilter>::iterator index = filters.begin(); index != filters.end(); index++)
                {
                        /* Skip ones that dont apply to us */
 
-                       if (!FilterBase::AppliesToMe(user, dynamic_cast<FilterResult*>(&(*index)), flags))
+                       if (!FilterBase::AppliesToMe(user, dynamic_cast<FilterResult*>(&(*index)), flgs))
                                continue;
 
                        if (pcre_exec(index->regexp, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) > -1)
@@ -107,7 +107,7 @@ class ModuleFilterPCRE : public FilterBase
                }
        }
 
-       virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags)
+       virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flgs)
        {
                for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
                {
@@ -121,19 +121,19 @@ class ModuleFilterPCRE : public FilterBase
 
                if (!re)
                {
-                       ServerInstance->Log(DEFAULT,"Error in regular expression: %s at offset %d: %s\n", freeform.c_str(), erroffset, error);
-                       ServerInstance->Log(DEFAULT,"Regular expression %s not loaded.", freeform.c_str());
+                       ServerInstance->Logs->Log("m_filter_pcre", DEFAULT,"Error in regular expression: %s at offset %d: %s\n", freeform.c_str(), erroffset, error);
+                       ServerInstance->Logs->Log("m_filter_pcre", DEFAULT,"Regular expression %s not loaded.", freeform.c_str());
                        return std::make_pair(false, "Error in regular expression at offset " + ConvToStr(erroffset) + ": "+error);
                }
                else
                {
-                       filters.push_back(PCREFilter(re, reason, type, duration, freeform, flags));
+                       filters.push_back(PCREFilter(re, reason, type, duration, freeform, flgs));
                        return std::make_pair(true, "");
                }
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
-       {               
+       {
                ConfigReader MyConf(ServerInstance);
 
                for (int index = 0; index < MyConf.Enumerate("keyword"); index++)
@@ -143,24 +143,24 @@ class ModuleFilterPCRE : public FilterBase
                        std::string pattern = MyConf.ReadValue("keyword", "pattern", index);
                        std::string reason = MyConf.ReadValue("keyword", "reason", index);
                        std::string action = MyConf.ReadValue("keyword", "action", index);
-                       std::string flags = MyConf.ReadValue("keyword", "flags", index);
+                       std::string flgs = MyConf.ReadValue("keyword", "flags", index);
                        long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index));
                        if (action.empty())
                                action = "none";
-                       if (flags.empty())
-                               flags = "*";
+                       if (flgs.empty())
+                               flgs = "*";
 
                        re = pcre_compile(pattern.c_str(),0,&error,&erroffset,NULL);
 
                        if (!re)
                        {
-                               ServerInstance->Log(DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error);
-                               ServerInstance->Log(DEFAULT,"Regular expression %s not loaded.", pattern.c_str());
+                               ServerInstance->Logs->Log("CONFIG",DEFAULT,"Error in regular expression: %s at offset %d: %s\n", pattern.c_str(), erroffset, error);
+                               ServerInstance->Logs->Log("CONFIG",DEFAULT,"Regular expression %s not loaded.", pattern.c_str());
                        }
                        else
                        {
-                               filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flags));
-                               ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str());
+                               filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flgs));
+                               ServerInstance->Logs->Log("CONFIG",DEFAULT,"Regular expression %s loaded.", pattern.c_str());
                        }
                }
                FilterBase::OnRehash(user, parameter);