and a little tweak to remote MOTD too.

[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 a8a9508c12f20127be67f03bee2554a23b695fa4..8feb5be41faad343d0da79083f688fba2f4b7377 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -38,10 +38,15 @@ class ModuleFilter : public FilterBase
        {
        }
 
-       virtual FilterResult* FilterMatch(const std::string &text)
+       virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
        {
                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))
+                               continue;
+
                        if (ServerInstance->MatchText(text,index->first))
                        {
                                FilterResult* fr = index->second;
@@ -68,19 +73,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, bool operexclusion)
+       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)
        {
                if (filters.find(freeform) != filters.end())
                {
                        return std::make_pair(false, "Filter already exists");
                }
 
-               FilterResult* x = new FilterResult;
-               x->reason = reason;
-               x->action = type;
-               x->gline_time = duration;
-               x->freeform = freeform;
-               x->opers_exempt = operexclusion;
+               FilterResult* x = new FilterResult(freeform, reason, type, duration, flags);
                filters[freeform] = x;
 
                return std::make_pair(true, "");
@@ -105,14 +105,13 @@ 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);
                        long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index).c_str());
-                       if (do_action == "")
+                       if (do_action.empty())
                                do_action = "none";
-                       FilterResult* x = new FilterResult;
-                       x->reason = reason;
-                       x->action = do_action;
-                       x->gline_time = gline_time;
-                       x->freeform = pattern;
+                       if (flags.empty())
+                               flags = "*";
+                       FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
                        filters[pattern] = x;
                }
                DELETE(MyConf);