YAY for LDAP oper blocks! :D

[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 d98870425e49f8f593af1b206723c2e96ba628f3..8ba9f9232b3226f9e157fb15ccc161d69b4ad1da 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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. */
 
@@ -27,6 +24,8 @@ class ModuleSecureList : public Module
        ModuleSecureList(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL,"");
+               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
  
        virtual ~ModuleSecureList()
@@ -38,26 +37,24 @@ class ModuleSecureList : public Module
                return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
 
-       void OnRehash(userrec* user, const std::string &parameter)
+       void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowlist.clear();
+
                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)
-       {
-               List[I_OnRehash] = List[I_OnPreCommand] = List[I_On005Numeric] = 1;
-       }
 
        /*
         * OnPreCommand()
         *   Intercept the LIST command.
         */ 
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)
@@ -87,36 +84,12 @@ class ModuleSecureList : public Module
                output.append(" SECURELIST");
        }
 
-       virtual Priority Prioritize()
+       void Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
+               Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
+               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIO_BEFORE, &safelist);
        }
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-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)