Use CommandBase::Params instead of std::vector<std::string>.

[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 e36b9e403b8f487f47ebac69aff60a0cd901b027..b1aeeb9d44678905a9d961ba592302adf238497c 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -20,11 +20,13 @@
 
 
 #include "inspircd.h"
+#include "modules/account.h"
 
 class ModuleSecureList : public Module
 {
        std::vector<std::string> allowlist;
-       time_t WaitTime;
+       bool exemptregistered;
+       unsigned int WaitTime;
 
  public:
        Version GetVersion() CXX11_OVERRIDE
@@ -40,7 +42,9 @@ class ModuleSecureList : public Module
                for (ConfigIter i = tags.first; i != tags.second; ++i)
                        allowlist.push_back(i->second->getString("exception"));
 
-               WaitTime = ServerInstance->Config->ConfValue("securelist")->getDuration("waittime", 60);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("securelist");
+               exemptregistered = tag->getBool("exemptregistered");
+               WaitTime = tag->getDuration("waittime", 60, 1);
        }
 
 
@@ -48,7 +52,7 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& 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)
@@ -61,6 +65,10 @@ class ModuleSecureList : public Module
                                if (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
                                        return MOD_RES_PASSTHRU;
 
+                       const AccountExtItem* ext = GetAccountExtItem();
+                       if (exemptregistered && ext && ext->get(user))
+                               return MOD_RES_PASSTHRU;
+
                        /* Not exempt, BOOK EM DANNO! */
                        user->WriteNotice("*** You cannot list within the first " + ConvToStr(WaitTime) + " seconds of connecting. Please try again later.");
                        /* Some clients (e.g. mIRC, various java chat applets) muck up if they don't