Framework for central regex module, and a bare-bone implementation based on InspIRCd...

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

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 58edcbff0f438247a220858d553c2f9ea97893b7..480d9975ad12799d30d18e80c1f6da906237fc62 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,7 +21,7 @@ typedef std::map<std::string,FilterResult*> filter_t;
 
 class ModuleFilter : public FilterBase
 {
- 
+
  filter_t filters;
 
  public:
@@ -31,21 +31,21 @@ class ModuleFilter : public FilterBase
                OnRehash(NULL,"");
 
        }
-       
+
        virtual ~ModuleFilter()
        {
        }
 
-       virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
+       virtual FilterResult* FilterMatch(User* user, const std::string &text, int iflags)
        {
                for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
                {
 
                        /* Skip ones that dont apply to us */
-                       if (!FilterBase::AppliesToMe(user, index->second, flags))
+                       if (!FilterBase::AppliesToMe(user, index->second, iflags))
                                continue;
 
-                       if (ServerInstance->MatchText(text,index->first))
+                       if (InspIRCd::Match(text,index->first))
                        {
                                FilterResult* fr = index->second;
                                if (index != filters.begin())
@@ -71,14 +71,14 @@ class ModuleFilter : public FilterBase
                return false;
        }
 
-       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 &sflags)
        {
                if (filters.find(freeform) != filters.end())
                {
                        return std::make_pair(false, "Filter already exists");
                }
 
-               FilterResult* x = new FilterResult(freeform, reason, type, duration, flags);
+               FilterResult* x = new FilterResult(freeform, reason, type, duration, sflags);
                filters[freeform] = x;
 
                return std::make_pair(true, "");
@@ -103,16 +103,17 @@ class ModuleFilter : public FilterBase
                        std::string pattern = MyConf->ReadValue("keyword","pattern",index);
                        std::string reason = MyConf->ReadValue("keyword","reason",index);
                        std::string do_action = MyConf->ReadValue("keyword","action",index);
-                       std::string flags = MyConf->ReadValue("keyword","flags",index);
+                       std::string sflags = MyConf->ReadValue("keyword","flags",index);
                        long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
                        if (do_action.empty())
                                do_action = "none";
-                       if (flags.empty())
-                               flags = "*";
-                       FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
+                       if (sflags.empty())
+                               sflags = "*";
+                       FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, sflags);
                        filters[pattern] = x;
                }
                delete MyConf;
+               FilterBase::OnRehash(user, parameter);
        }
 
        virtual int OnStats(char symbol, User* user, string_list &results)