X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=c8d5633ffbfc02758557b6df5a90fd32f860343d;hb=fe96061b003b7064b3e17c468a8851784890f7b8;hp=054d779639c2778aca7ba3ff00caa88ddc76aeb1;hpb=4754d3371f209ce31ca417a8c557e29805d3cc49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 054d77963..c8d5633ff 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 // Message and notice filtering using glob patterns
 // a module based on the original work done by Craig Edwards in 2003
 // for the chatspike network.
@@ -23,94 +25,64 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
 
+class FilterException : public ModuleException
+{
+ public:
+	virtual char* GetReason()
+	{
+		return "Could not find <filter file=\"\"> definition in your config file!";
+	}
+};
+
 class ModuleFilter : public Module
 {
  Server *Srv;
  ConfigReader *Conf, *MyConf;
  
  public:
-	ModuleFilter()
+	ModuleFilter(Server* Me)
+		: Module::Module(Me)
 	{
 		// read the configuration file on startup.
 		// it is perfectly valid to set <filter file> to the value of the
 		// main config file, then append your <keyword> tags to the bottom
 		// of the main config... but rather messy. That's why the capability
 		// of using a seperate config file is provided.
-		Srv = new Server;
+		Srv = Me;
 		Conf = new ConfigReader;
 		std::string filterfile = Conf->ReadValue("filter","file",0);
 		MyConf = new ConfigReader(filterfile);
 		if ((filterfile == "") || (!MyConf->Verify()))
 		{
-			printf("Error, could not find <filter file=\"\"> definition in your config file!");
-			log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
-			return;
+			FilterException e;
+			throw(e);
 		}
 		Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
 	}
 	
 	virtual ~ModuleFilter()
 	{
-		delete Srv;
 		delete MyConf;
 		delete Conf;
 	}
+
+	void Implements(char* List)
+	{
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1;
+	}
 	
 	// format of a config entry is <keyword pattern="*glob*" reason="Some reason here" action="kill/block">
 	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		std::string text2 = text+" ";
-		for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
-		{
-			std::string pattern = MyConf->ReadValue("keyword","pattern",index);
-			if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
-			{
-				std::string target = "";
-				std::string reason = MyConf->ReadValue("keyword","reason",index);
-				std::string do_action = MyConf->ReadValue("keyword","action",index);
-
-				if (do_action == "")
-					do_action = "none";
-
-				if (target_type == TYPE_USER)
-				{
-					userrec* t = (userrec*)dest;
-					target = std::string(t->nick);
-				}
-				else if (target_type == TYPE_CHANNEL)
-				{
-					chanrec* t = (chanrec*)dest;
-					target = std::string(t->name);
-				}
-				if (do_action == "block")
-	      			{	
-					Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
-							std::string(" had their message filtered, target was ")+
-							target+": "+reason);
-					// this form of SendTo (with the source as NuLL) sends a server notice
-					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+
-							" :Your message has been filtered and opers notified: "+reason);
-				}
-
-				Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+
-    						std::string(" had their message filtered, target was ")+
-    						target+": "+reason+" Action: "+do_action);
-
-				if (do_action == "kill")
-				{
-					Srv->QuitUser(user,reason);
-				}
-				return 1;
-			}
-		}
-		return 0;
+		return OnUserPreNotice(user,dest,target_type,text,status);
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		std::string text2 = text+" ";
 		for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
@@ -157,7 +129,7 @@ class ModuleFilter : public Module
 		return 0;
 	}
 	
-	virtual void OnRehash()
+	virtual void OnRehash(std::string parameter)
 	{
 		// reload our config file on rehash - we must destroy and re-allocate the classes
 		// to call the constructor again and re-read our data.
@@ -170,9 +142,8 @@ class ModuleFilter : public Module
 		if ((filterfile == "") || (!MyConf->Verify()))
 		{
 			// bail if the user forgot to create a config file
-			printf("Error, could not find <filter file=\"\"> definition in your config file!");
-			log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
-			return;
+			FilterException e;
+			throw(e);
 		}
 		Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
 	}
@@ -198,9 +169,9 @@ class ModuleFilterFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleFilter;
+		return new ModuleFilter(Me);
 	}
 	
 };