X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=70de88e2cb8ac405d3a4614b4d6514d9e67a36e2;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=79e98d2952dbcfad430f92d9cf4f1cf79b70bc58;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 79e98d295..70de88e2c 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "m_filter.h"
 
 /* $ModDesc: An advanced spam filtering module */
@@ -31,23 +29,34 @@ class ModuleFilter : public FilterBase
 
  public:
 	ModuleFilter(InspIRCd* Me)
-	: FilterBase::FilterBase(Me, "m_filter.so")
+	: FilterBase(Me, "m_filter.so")
 	{
-		OnRehash("");
+		OnRehash(NULL,"");
 	}
 	
 	virtual ~ModuleFilter()
 	{
 	}
 
-	virtual FilterResult* FilterMatch(const std::string &text)
+	virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
 	{
-		std::string text2 = text+" ";
 		for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
 		{
-			if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first)))
+
+			/* Skip ones that dont apply to us */
+			if (!FilterBase::AppliesToMe(user, index->second, flags))
+				continue;
+
+			if (ServerInstance->MatchText(text,index->first))
 			{
-				return index->second;
+				FilterResult* fr = index->second;
+				if (index != filters.begin())
+				{
+					std::string pat = index->first;
+					filters.erase(index);
+					filters.insert(filters.begin(), std::make_pair(pat,fr));
+				}
+				return fr;
 			}
 		}
 		return NULL;
@@ -64,18 +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)
+	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;
+		FilterResult* x = new FilterResult(freeform, reason, type, duration, flags);
 		filters[freeform] = x;
 
 		return std::make_pair(true, "");
@@ -89,7 +94,7 @@ class ModuleFilter : public FilterBase
 		}
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 
@@ -100,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);
-			long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index).c_str());
-			if (do_action == "")
+			std::string flags = MyConf->ReadValue("keyword","flags",index);
+			long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
+			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);
@@ -120,36 +124,12 @@ class ModuleFilter : public FilterBase
 			std::string sn = ServerInstance->Config->ServerName;
 			for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
 			{
-				results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+				results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->flags+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
 			}
 		}
 		return 0;
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleFilterFactory : public ModuleFactory
-{
- public:
-	ModuleFilterFactory()
-	{
-	}
-	
-	~ModuleFilterFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleFilter(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleFilterFactory;
-}
 
+MODULE_INIT(ModuleFilter)