Added version flags

[user/henk/code/inspircd.git] / src / modules / m_filter.cpp

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index d2714ee018d1940a3d9022206aaa24e6b1eb9132..91efe49c03066d9073a30b31f4ca278e09bf08b0 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 // Message and notice filtering using glob patterns
 // a module based on the original work done by Craig Edwards in 2003
 // for the chatspike network.
@@ -28,12 +44,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,17 +60,23 @@ 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)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
        {
-               text = text + " ";
+               std::string text2 = text + " ";
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
                {
                        std::string pattern = MyConf->ReadValue("keyword","pattern",index);
-                       if (Srv->MatchText(text,pattern))
+                       if (Srv->MatchText(text2,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;
@@ -65,27 +87,45 @@ 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+": "+MyConf->ReadValue("keyword","reason",index));
+                               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+": "+MyConf->ReadValue("keyword","reason",index));
+                                               target+": "+reason+" Action: "+do_action);
+
+                               if (do_action == "kill")
+                               {
+                                       Srv->QuitUser(user,reason);
+                               }
                                return 1;
                        }
                }
                return 0;
        }
        
-       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)
        {
-               text = text + " ";
+               std::string text2 = text + " ";
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
                {
                        std::string pattern = MyConf->ReadValue("keyword","pattern",index);
-                       if (Srv->MatchText(text,pattern))
+                       if (Srv->MatchText(text2,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;
@@ -96,12 +136,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));
+                                               target+": "+reason+" Action: "+do_action);
+
+                               if (do_action == "kill")
+                               {
+                                       Srv->QuitUser(user,reason);
+                               }
                                return 1;
                        }
                }
@@ -116,21 +166,21 @@ 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);
        }
        
        virtual Version GetVersion()
        {
                // This is version 2 because version 1.x is the unreleased unrealircd module
-               return Version(2,0,0,0);
+               return Version(2,0,0,0,0);
        }
        
 };