Remove the size argument from IsChannel and IsNick.

[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 c13e1a8928fa3bf6a878c90ce50d8b0968299f5e..875e7fb75652641ac6364f9b5134692edb4b1e9b 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -21,38 +21,35 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
 
 class ModuleSecureList : public Module
 {
- private:
        std::vector<std::string> allowlist;
        time_t WaitTime;
+
  public:
-       ModuleSecureList()      {
+       void init() CXX11_OVERRIDE
+       {
                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()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR);
+               return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
        }
 
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
-               ConfigReader MyConf;
                allowlist.clear();
 
-               for (int i = 0; i < MyConf.Enumerate("securehost"); i++)
-                       allowlist.push_back(MyConf.ReadValue("securehost", "exception", i));
+               ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
+                       allowlist.push_back(i->second->getString("exception"));
 
-               WaitTime = MyConf.ReadInteger("securelist", "waittime", "60", 0, true);
+               WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
        }
 
 
@@ -60,13 +57,13 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */
-       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                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++)
@@ -74,7 +71,7 @@ class ModuleSecureList : public Module
                                        return MOD_RES_PASSTHRU;
 
                        /* Not exempt, BOOK EM DANNO! */
-                       user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick.c_str(), (unsigned long) WaitTime);
+                       user->WriteNotice("*** You cannot list within the first " + ConvToStr(WaitTime) + " seconds of connecting. Please try again later.");
                        /* Some crap clients (read: mIRC, various java chat applets) muck up if they don't
                         * receive these numerics whenever they send LIST, so give them an empty LIST to mull over.
                         */
@@ -85,9 +82,9 @@ class ModuleSecureList : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output.append(" SECURELIST");
+               tokens["SECURELIST"];
        }
 };