X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=3521f668743be903d7c9f943eea39b4ec93fa92c;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=b82396dce5fb72760e26b3609c3181a745fde506;hpb=002f31f1dd4957d1e9353784bac1eb031a639b1b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index b82396dce..3521f6687 100644
--- 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"
 
@@ -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;
 	}
@@ -668,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)
 			{