All of insp now builds with -pedantic (theres some warnings to squash in modules...

[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 b21ec12a5762e2c1f086446683be17d98552b9b8..b1aa8e19a25cc3b2c4187173ed9a33c0da91e316 100644 (file)
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -23,13 +23,17 @@
 /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
 /* $ModDep: m_filter.h */
 
+#ifdef WINDOWS
+#pragma comment(lib, "pcre.lib")
+#endif
+
 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)
-                : FilterResult::FilterResult(pat, rea, act, gline_time), regexp(r)
+        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)
         {
         }
 
@@ -48,7 +52,7 @@ class ModuleFilterPCRE : public FilterBase
 
  public:
        ModuleFilterPCRE(InspIRCd* Me)
-       : FilterBase::FilterBase(Me, "m_filter_pcre.so")
+       : FilterBase(Me, "m_filter_pcre.so")
        {
                OnRehash(NULL,"");
        }
@@ -57,10 +61,15 @@ class ModuleFilterPCRE : public FilterBase
        {
        }
 
-       virtual FilterResult* FilterMatch(const std::string &text)
+       virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
        {
                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))
+                               continue;
+
                        if (pcre_exec(index->regexp, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) > -1)
                        {
                                fr = *index;
@@ -97,7 +106,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)
+       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)
        {
                for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
                {
@@ -117,12 +126,12 @@ class ModuleFilterPCRE : public FilterBase
                }
                else
                {
-                       filters.push_back(PCREFilter(re, reason, type, duration, freeform));
+                       filters.push_back(PCREFilter(re, reason, type, duration, freeform, flags));
                        return std::make_pair(true, "");
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {               
                ConfigReader MyConf(ServerInstance);
 
@@ -133,7 +142,12 @@ 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);
-                       long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index).c_str());
+                       std::string flags = MyConf.ReadValue("keyword", "flags", index);
+                       long gline_time = ServerInstance->Duration(MyConf.ReadValue("keyword", "duration", index));
+                       if (action.empty())
+                               action = "none";
+                       if (flags.empty())
+                               flags = "*";
 
                        re = pcre_compile(pattern.c_str(),0,&error,&erroffset,NULL);
 
@@ -144,47 +158,25 @@ class ModuleFilterPCRE : public FilterBase
                        }
                        else
                        {
-                               filters.push_back(PCREFilter(re, reason, action, gline_time, pattern));
+                               filters.push_back(PCREFilter(re, reason, action, gline_time, pattern, flags));
                                ServerInstance->Log(DEFAULT,"Regular expression %s loaded.", pattern.c_str());
                        }
                }
        }
 
-       virtual int OnStats(char symbol, userrec* user, string_list &results)
+       virtual int OnStats(char symbol, User* user, string_list &results)
        {
                if (symbol == 's')
                {
                        std::string sn = ServerInstance->Config->ServerName;
                        for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
                        {
-                               results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason);
+                               results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason);
                        }
                }
                return 0;
        }
 };
-       
-
-class ModuleFilterPCREFactory : public ModuleFactory
-{
- public:
-       ModuleFilterPCREFactory()
-       {
-       }
-       
-       ~ModuleFilterPCREFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleFilterPCRE(Me);
-       }
-       
-};
 
+MODULE_INIT(ModuleFilterPCRE)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleFilterPCREFactory;
-}