X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.cpp;h=b16039abd108ea24ca1ee480f867f708c0089161;hb=3103cfb80135cbc2a0f47566ec0cb88affc7bac1;hp=d208e7a5a13e1680790da37af9498f172bc7dea5;hpb=bd4c18aa1554e4fec0913b3c5f742080cbf0eab4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index d208e7a5a..b16039abd 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -28,12 +28,12 @@ class ModuleFilter : public Module
 		Srv = new Server;
 		Conf = new ConfigReader;
 		std::string filterfile = Conf->ReadValue("filter","file",0);
-		if (filterfile == "")
+		MyConf = new ConfigReader(filterfile);
+		if ((filterfile == "") || (!MyConf->Verify()))
 		{
 			printf("Error, could not find <filter file=\"\"> definition in your config file!");
 			exit(0);
 		}
-		MyConf = new ConfigReader(filterfile);
 		Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
 	}
 	
@@ -44,7 +44,7 @@ class ModuleFilter : public Module
 		delete Conf;
 	}
 	
-	// format of a config entry is <keyword pattern="*glob*" reason="Some reason here">
+	// 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)
 	{
@@ -56,6 +56,11 @@ class ModuleFilter : public Module
 			{
 				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;
@@ -66,15 +71,24 @@ class ModuleFilter : public Module
 					chanrec* t = (chanrec*)dest;
 					target = std::string(t->name);
 				}
-				Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
-    						std::string(" had their message filtered, target was ")+
-    						target+": "+reason);
+				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);
-				// 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);
+    						target+": "+reason+" Action: "+do_action);
+
+				if (do_action == "kill")
+				{
+					Srv->QuitUser(user,reason);
+				}
 				return 1;
 			}
 		}
@@ -91,6 +105,11 @@ class ModuleFilter : public Module
 			{
 				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;
@@ -101,14 +120,22 @@ class ModuleFilter : public Module
 					chanrec* t = (chanrec*)dest;
 					target = std::string(t->name);
 				}
-				Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
-    						std::string(" had their notice filtered, target was ")+
-    						target+": "+MyConf->ReadValue("keyword","reason",index));
+				if (do_action == "block")
+	      			{	
+					Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
+    							std::string(" had their notice filtered, target was ")+
+    							target+": "+reason);
+					Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+
+    							" :Your notice has been filtered and opers notified: "+reason);
+    				}
 				Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+
     						std::string(" had their notice filtered, target was ")+
-    						target+": "+MyConf->ReadValue("keyword","reason",index));
-				Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+
-    						" :Your notice has been filtered and opers notified: "+reason);
+    						target+": "+reason+" Action: "+do_action);
+
+				if (do_action == "kill")
+				{
+					Srv->QuitUser(user,reason);
+				}
 				return 1;
 			}
 		}
@@ -123,14 +150,14 @@ class ModuleFilter : public Module
 		delete MyConf;
 		Conf = new ConfigReader;
 		std::string filterfile = Conf->ReadValue("filter","file",0);
-		if (filterfile == "")
+		// this automatically re-reads the configuration file into the class
+		MyConf = new ConfigReader(filterfile);
+		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!");
 			exit(0);
 		}
-		// this automatically re-reads the configuration file into the class
-		MyConf = new ConfigReader(filterfile);
 		Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
 	}