Strip SUPPORT_IP6LINKS #define

[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 95227e770bb9f2d083585e48c06b9425079a5791..6c3114860fab1688dd559e3ff5579003eed9484c 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -23,21 +23,21 @@ class ModuleSecureList : public Module
  public:
        ModuleSecureList(InspIRCd* Me) : Module(Me)
        {
-               OnRehash(NULL,"");
+               OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
- 
+
        virtual ~ModuleSecureList()
        {
        }
- 
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
-       void OnRehash(User* user, const std::string &parameter)
+       void OnRehash(User* user)
        {
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowlist.clear();
@@ -48,32 +48,32 @@ class ModuleSecureList : public Module
                WaitTime = MyConf->ReadInteger("securelist", "waittime", "60", 0, true);
                delete MyConf;
        }
- 
+
 
        /*
         * OnPreCommand()
         *   Intercept the LIST command.
-        */ 
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+        */
+       virtual int 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") && (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++)
-                               if (ServerInstance->MatchText(user->MakeHost(), *x))
+                               if (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
                                        return 0;
 
                        /* Not exempt, BOOK EM DANNO! */
-                       user->WriteServ("NOTICE %s :*** You cannot list within the first %ld 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.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.
                         */
-                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                        return 1;
                }
                return 0;
@@ -87,9 +87,9 @@ class ModuleSecureList : public Module
        void Prioritize()
        {
                Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
-               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIO_BEFORE, &safelist);
+               ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &safelist);
        }
 
 };
- 
+
 MODULE_INIT(ModuleSecureList)