Remove InspIRCd* parameters and fields

[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 8885068babe4134ef721d4e8aa3045e54e846433..5e2d704bb6c404ac8ffb58643daa42ff6a41ec0b 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,76 +2,80 @@
  *       | 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-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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 "helperfuncs.h"
-#include "message.h"
-#include <vector>
- 
-extern time_t TIME;
+#include "inspircd.h"
 
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
- 
+
 class ModuleSecureList : public Module
 {
  private:
-        Server *Srv;
+       std::vector<std::string> allowlist;
+       time_t WaitTime;
  public:
-       ModuleSecureList(Server* Me) : Module::Module(Me)
-       {
-               Srv = Me;
+       ModuleSecureList()      {
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
- 
+
        virtual ~ModuleSecureList()
        {
        }
- 
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR,API_VERSION);
        }
- 
-       void Implements(char* List)
+
+       void OnRehash(User* user)
        {
-               List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+               ConfigReader* MyConf = new ConfigReader;
+               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;
        }
 
+
        /*
         * OnPreCommand()
         *   Intercept the LIST command.
-        */ 
-       virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated)
+        */
+       virtual ModResult OnPreCommand(std::string &command, 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") && (TIME < (user->signon+60)) && (!*user->oper))
+                       return MOD_RES_PASSTHRU;
+
+               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
                {
-                       WriteServ(user->fd,"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 (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
+                                       return MOD_RES_PASSTHRU;
+
+                       /* Not exempt, BOOK EM DANNO! */
+                       user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick.c_str(), (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.
                         */
-                       WriteServ(u->fd,"321 %s Channel :Users Name",user->nick);
-                       WriteServ(u->fd,"323 %s :End of channel list.",user->nick);
-                       return 1;
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
+                       return MOD_RES_DENY;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void On005Numeric(std::string &output)
@@ -79,36 +83,12 @@ class ModuleSecureList : public Module
                output.append(" SECURELIST");
        }
 
-       virtual Priority Prioritize()
+       void Prioritize()
        {
-               return Srv->PriorityBefore("m_safelist.so");
+               Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
+               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &safelist);
        }
 
 };
- 
- 
- 
-/******************************************************************************************************/
- 
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
-       ModuleSecureListFactory()
-       {
-       }
- 
-       ~ModuleSecureListFactory()
-       {
-       }
- 
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleSecureList(Me);
-       }
- 
-};
- 
-extern "C" void * init_module( void )
-{
-       return new ModuleSecureListFactory;
-}
+
+MODULE_INIT(ModuleSecureList)