Pedantic clean

[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 7e3f196ac414179f7e97bfb706af4599f483c160..30b339630df6c1188b4247832c9d2da05183fecc 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,25 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
- 
-#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. */
@@ -28,11 +18,12 @@ using namespace std;
 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,"");
        }
  
        virtual ~ModuleSecureList()
@@ -43,25 +34,43 @@ class ModuleSecureList : public Module
        {
                return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
+
+       void OnRehash(User* user, const std::string &parameter)
+       {
+               ConfigReader* MyConf = new ConfigReader(ServerInstance);
+               allowlist.clear();
+
+               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;
+       }
  
        void Implements(char* List)
        {
-               List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+               List[I_OnRehash] = List[I_OnPreCommand] = List[I_On005Numeric] = 1;
        }
 
        /*
         * 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+60)) && (!*user->oper))
+               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
                {
-                       user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
+                       /* Normally wouldnt be allowed here, are they exempt? */
+                       for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
+                               if (ServerInstance->MatchText(user->MakeHost(), *x))
+                                       return 0;
+
+                       /* Not exempt, BOOK EM DANNO! */
+                       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.
                         */
@@ -79,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)