PROPAGATE this fix

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

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 9822f693733a8cf9093c5ef050de9a0d609b1ae6..e4fc76478f656ab7033effc0da6f1c118a6bba0a 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -11,10 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h" 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
 
@@ -42,10 +39,12 @@ class ModuleSecureList : public Module
        {
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowlist.clear();
-               for (int i = 0; i < MyConf->Enumerate("securelist"); i++)
-                       allowlist.push_back(MyConf->ReadValue("securelist", "exception", i));
+
+               for (int i = 0; i < MyConf->Enumerate("securehost"); i++)
+                       allowlist.push_back(MyConf->ReadValue("securehost", "exception", i));
+
                WaitTime = MyConf->ReadInteger("securelist", "waittime", "60", 0, true);
-               DELETE(MyConf);
+               delete MyConf;
        }
  
        void Implements(char* List)
@@ -89,34 +88,9 @@ class ModuleSecureList : public Module
 
        virtual Priority Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
+               return (Priority)ServerInstance->Modules->PriorityBefore("m_safelist.so");
        }
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
-       ModuleSecureListFactory()
-       {
-       }
- 
-       ~ModuleSecureListFactory()
-       {
-       }
- 
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSecureList(Me);
-       }
- 
-};
- 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleSecureListFactory;
-}
+MODULE_INIT(ModuleSecureList)