Merge pull request #495 from SaberUK/master+fix-libcpp

[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 6501893f3a0a93e34b218e1dc3772f43002bc474..382968355f1a88979d233a8a91462f72a6f14725 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -25,18 +25,15 @@
 
 class ModuleSecureList : public Module
 {
- private:
        std::vector<std::string> allowlist;
        time_t WaitTime;
+
  public:
-       ModuleSecureList()      {
+       void init()
+       {
                OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-       }
-
-       virtual ~ModuleSecureList()
-       {
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual Version GetVersion()
@@ -66,7 +63,7 @@ class ModuleSecureList : public Module
                if (!validated)
                        return MOD_RES_PASSTHRU;
 
-               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
+               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!user->IsOper()))
                {
                        /* Normally wouldnt be allowed here, are they exempt? */
                        for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
@@ -85,9 +82,9 @@ class ModuleSecureList : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void On005Numeric(std::string &output)
+       virtual void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               output.append(" SECURELIST");
+               tokens["SECURELIST"];
        }
 };