Abstracted host/gecos changing to Server:: methods

[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 3bda79022e9d78b8a4461ba1d73a19fb1b2deb32..b16039abd108ea24ca1ee480f867f708c0089161 100644 (file)
--- 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,14 +56,11 @@ class ModuleFilter : public Module
                        {
                                std::string target = "";
                                std::string reason = MyConf->ReadValue("keyword","reason",index);
-                               std::string action = MyConf->ReadValue("keyword","action",index);
-                               std::string operaction = MyConf->ReadValue("keyword","operaction",index);
-                               std::string do_action = "none";
+                               std::string do_action = MyConf->ReadValue("keyword","action",index);
+
+                               if (do_action == "")
+                                       do_action = "none";
 
-                               if (action == "")
-                                       action = "none";
-                               if (operaction == "")
-                                       operaction = "none";
                                if (target_type == TYPE_USER)
                                {
                                        userrec* t = (userrec*)dest;
@@ -74,14 +71,6 @@ class ModuleFilter : public Module
                                        chanrec* t = (chanrec*)dest;
                                        target = std::string(t->name);
                                }
-                               if (strchr(user->modes,'o'))
-                               {
-                                       do_action = operaction;
-                               }
-                               else
-                               {
-                                       do_action = action;
-                               }       
                                if (do_action == "block")
                                {       
                                        Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
@@ -94,7 +83,7 @@ class ModuleFilter : public Module
 
                                Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+
                                                std::string(" had their message filtered, target was ")+
-                                               target+": "+reason);
+                                               target+": "+reason+" Action: "+do_action);
 
                                if (do_action == "kill")
                                {
@@ -116,14 +105,11 @@ class ModuleFilter : public Module
                        {
                                std::string target = "";
                                std::string reason = MyConf->ReadValue("keyword","reason",index);
-                               std::string action = MyConf->ReadValue("keyword","action",index);
-                               std::string operaction = MyConf->ReadValue("keyword","operaction",index);
-                               std::string do_action = "none";
+                               std::string do_action = MyConf->ReadValue("keyword","action",index);
 
-                               if (action == "")
-                                       action = "none";
-                               if (operaction == "")
-                                       operaction = "none";
+                               if (do_action == "")
+                                       do_action = "none";
+                                       
                                if (target_type == TYPE_USER)
                                {
                                        userrec* t = (userrec*)dest;
@@ -134,25 +120,17 @@ class ModuleFilter : public Module
                                        chanrec* t = (chanrec*)dest;
                                        target = std::string(t->name);
                                }
-                               if (strchr(user->modes,'o'))
-                               {
-                                       do_action = operaction;
-                               }
-                               else
-                               {
-                                       do_action = action;
-                               }
                                if (do_action == "block")
                                {       
                                        Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
                                                        std::string(" had their notice filtered, target was ")+
-                                                       target+": "+MyConf->ReadValue("keyword","reason",index));
+                                                       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")
                                {
@@ -172,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);
        }