Add support for blacklists and whitelists, just http password auth to go (the most...

[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..1f9ac15e9a2f91ed4e896dc6b8bd0399d41b10bb 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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,11 +19,13 @@ 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,"");
+               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
  
        virtual ~ModuleSecureList()
@@ -37,35 +34,33 @@ class ModuleSecureList : public Module
  
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+               return Version(1,2,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)
-       {
-               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 std::vector<std::string> &parameters, 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++)
@@ -73,12 +68,12 @@ class ModuleSecureList : public Module
                                        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);
+                       user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick, (unsigned long) 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.
                         */
-                       user->WriteServ("321 %s Channel :Users Name",user->nick);
-                       user->WriteServ("323 %s :End of channel list.",user->nick);
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
                        return 1;
                }
                return 0;
@@ -89,36 +84,12 @@ class ModuleSecureList : public Module
                output.append(" SECURELIST");
        }
 
-       virtual Priority Prioritize()
+       void Prioritize()
        {
-               return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
+               Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
+               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIO_BEFORE, &safelist);
        }
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-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)