Broken code commented out by brain until we can fix it.

[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 eaa07c7c30071ac4beec0e5dea600c8484e150e9..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)
        {
@@ -150,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);
        }