Add option to allow +q to +q users, +a to +a users.

[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 57e5d8fdbe25e6e52159214fd61258db196f8713..3c53cccd755139fa8438b49de34e7b2d1af31ffb 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "xline.h"
 #include "m_regex.h"
 
@@ -133,7 +130,7 @@ class CommandFilter : public Command
 {
        FilterBase* Base;
  public:
-       CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1), Base(f)
+       CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1, 5), Base(f)
        {
                this->source = ssource;
                this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
@@ -563,12 +560,13 @@ class ModuleFilter : public FilterBase
                for (std::vector<ImplFilter>::iterator index = filters.begin(); index != filters.end(); index++)
                {
                        /* Skip ones that dont apply to us */
-
                        if (!FilterBase::AppliesToMe(user, dynamic_cast<FilterResult*>(&(*index)), flgs))
                                continue;
 
+                       //ServerInstance->Logs->Log("m_filter", DEBUG, "Match '%s' against '%s'", text.c_str(), index->freeform.c_str());
                        if (index->regex->Matches(text))
                        {
+                               //ServerInstance->Logs->Log("m_filter", DEBUG, "MATCH");
                                fr = *index;
                                if (index != filters.begin())
                                {
@@ -578,6 +576,7 @@ class ModuleFilter : public FilterBase
                                }
                                return &fr;
                        }
+                       //ServerInstance->Logs->Log("m_filter", DEBUG, "NO MATCH");
                }
                return NULL;
        }
@@ -588,6 +587,7 @@ class ModuleFilter : public FilterBase
                {
                        if (i->freeform == freeform)
                        {
+                               delete i->regex;
                                filters.erase(i);
                                return true;
                        }
@@ -667,7 +667,7 @@ class ModuleFilter : public FilterBase
                        std::string sn = ServerInstance->Config->ServerName;
                        for (std::vector<ImplFilter>::iterator i = filters.begin(); i != filters.end(); i++)
                        {
-                               results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason);
+                               results.push_back(sn+" 223 "+user->nick+" :"+RegexEngine+":"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason);
                        }
                        for (std::vector<std::string>::iterator i = exemptfromfilter.begin(); i != exemptfromfilter.end(); ++i)
                        {