Review and optimize

[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 fc4272e3dff09e40a496146e83e9008f870bdbb7..d43ad7373b05bfe3edd4057ce9fb915866eb8109 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -35,20 +35,21 @@ class ModuleFilter : public Module
  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!");
+                       printf("Error, could not find <filter file=\"\"> definition in your config file!\n");
                        log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
                        return;
                }
@@ -57,7 +58,6 @@ class ModuleFilter : public Module
        
        virtual ~ModuleFilter()
        {
-               delete Srv;
                delete MyConf;
                delete Conf;
        }
@@ -201,9 +201,9 @@ class ModuleFilterFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleFilter;
+               return new ModuleFilter(Me);
        }
        
 };