Dont echo the JOIN to the user whos speaking

[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 bfed8f46e2798b3ce98a13eadeea176ed3e1b5ca..30b339630df6c1188b4247832c9d2da05183fecc 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -10,12 +10,7 @@
  *
  * ---------------------------------------------------
  */
- 
-#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. */
@@ -24,9 +19,9 @@ class ModuleSecureList : public Module
 {
  private:
        std::vector<std::string> allowlist;
-       unsigned int WaitTime;
+       time_t WaitTime;
  public:
-       ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
+       ModuleSecureList(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL,"");
        }
@@ -40,14 +35,16 @@ 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("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);
+               delete MyConf;
        }
  
        void Implements(char* List)
@@ -59,13 +56,13 @@ class ModuleSecureList : public Module
         * 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** 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)
                        return 0;
  
-               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!*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++)
@@ -91,34 +88,9 @@ class ModuleSecureList : public Module
 
        virtual Priority Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
+               return (Priority)ServerInstance->Modules->PriorityBefore("m_safelist.so");
        }
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-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)