X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=2be2cfeca39a912d8d3d5366a6cf50d7ba1e3458;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=b0c932ada1c88f3c9aaa09aa5318e93342abc94e;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index b0c932ada..2be2cfeca 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "m_filter.h"
 
@@ -34,18 +29,23 @@ class ModuleFilter : public FilterBase
 	: FilterBase(Me, "m_filter.so")
 	{
 		OnRehash(NULL,"");
+
 	}
 	
 	virtual ~ModuleFilter()
 	{
 	}
 
-	virtual FilterResult* FilterMatch(const std::string &text)
+	virtual FilterResult* FilterMatch(User* user, const std::string &text, int iflags)
 	{
-		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, iflags))
+				continue;
+
+			if (ServerInstance->MatchText(text,index->first))
 			{
 				FilterResult* fr = index->second;
 				if (index != filters.begin())
@@ -71,18 +71,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 &sflags)
 	{
 		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, sflags);
 		filters[freeform] = x;
 
 		return std::make_pair(true, "");
@@ -96,7 +92,7 @@ class ModuleFilter : public FilterBase
 		}
 	}
 
-	virtual void OnRehash(userrec* user, const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
 		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 
@@ -107,56 +103,32 @@ 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 sflags = 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 (sflags.empty())
+				sflags = "*";
+			FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, sflags);
 			filters[pattern] = x;
 		}
-		DELETE(MyConf);
+		delete MyConf;
+		FilterBase::OnRehash(user, parameter);
 	}
 
-	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 (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" DllExport void * init_module( void )
-{
-	return new ModuleFilterFactory;
-}
 
+MODULE_INIT(ModuleFilter)