X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_filter_pcre.cpp;h=b1aa8e19a25cc3b2c4187173ed9a33c0da91e316;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=e35094ac0ecc701581297b65cacf30731bb7a5b8;hpb=5289be42682b6d80bc54b3667e3e4d8530119f16;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index e35094ac0..b1aa8e19a 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -11,13 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include <pcre.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "m_filter.h"
 
 /* $ModDesc: m_filter with regexps */
@@ -25,13 +23,21 @@
 /* $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)
+	 {
+	 }
+
+	 PCREFilter()
 	 {
 	 }
 };
@@ -42,10 +48,11 @@ class ModuleFilterPCRE : public FilterBase
 	pcre *re;
 	const char *error;
 	int erroffset;
+	PCREFilter fr;
 
  public:
 	ModuleFilterPCRE(InspIRCd* Me)
-	: FilterBase::FilterBase(Me, "m_filter_pcre.so")
+	: FilterBase(Me, "m_filter_pcre.so")
 	{
 		OnRehash(NULL,"");
 	}
@@ -54,20 +61,24 @@ 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)
 			{
-				PCREFilter* fr = &(*index);
+				fr = *index;
 				if (index != filters.begin())
 				{
 					filters.erase(index);
-					filters.insert(filters.begin(), *fr);
-					index = filters.begin();
+					filters.insert(filters.begin(), fr);
 				}
-				return &(*index);
+				return &fr;
 			}
 		}
 		return NULL;
@@ -95,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++)
 		{
@@ -115,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);
 
@@ -131,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);
 
@@ -142,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;
-}