A few more I missed.

[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 efa44829014610924954b704a1da2f21a9901e8d..8761716c02dafd2bfd88727a1c7bce8882a22b1c 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -10,22 +10,21 @@
  *
  * ---------------------------------------------------
  */
- 
+
+#include "inspircd.h" 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include <vector>
-#include "inspircd.h"
-
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
 
 class ModuleSecureList : public Module
 {
  private:
        std::vector<std::string> allowlist;
+       time_t WaitTime;
  public:
-       ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
+       ModuleSecureList(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL,"");
        }
@@ -43,8 +42,9 @@ 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);
        }
  
@@ -63,7 +63,7 @@ class ModuleSecureList : public Module
                if (!validated)
                        return 0;
  
-               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+60)) && (!*user->oper))
+               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
                {
                        /* Normally wouldnt be allowed here, are they exempt? */
                        for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
@@ -71,7 +71,7 @@ class ModuleSecureList : public Module
                                        return 0;
 
                        /* Not exempt, BOOK EM DANNO! */
-                       user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
+                       user->WriteServ("NOTICE %s :*** You cannot list within the first %d seconds of connecting. Please try again later.",user->nick, WaitTime);
                        /* 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.
                         */
@@ -94,29 +94,4 @@ class ModuleSecureList : public Module
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
-       ModuleSecureListFactory()
-       {
-       }
- 
-       ~ModuleSecureListFactory()
-       {
-       }
- 
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSecureList(Me);
-       }
- 
-};
- 
-extern "C" void * init_module( void )
-{
-       return new ModuleSecureListFactory;
-}
+MODULE_INIT(ModuleSecureList)