Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 32017d591bc40d1ea934caf98db56f7f4b7ff56a..7e3f196ac414179f7e97bfb706af4599f483c160 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -19,22 +19,20 @@ 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;
+        
  public:
-       ModuleSecureList(Server* Me) : Module::Module(Me)
+       ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
+               
        }
  
        virtual ~ModuleSecureList()
@@ -43,7 +41,7 @@ class ModuleSecureList : public Module
  
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
  
        void Implements(char* List)
@@ -55,20 +53,20 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */ 
-       virtual int OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *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))
+               if ((command == "LIST") && (ServerInstance->Time() < (user->signon+60)) && (!*user->oper))
                {
-                       WriteServ(user->fd,"NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
+                       user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
                        /* 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(user->fd,"321 %s Channel :Users Name",user->nick);
-                       WriteServ(user->fd,"323 %s :End of channel list.",user->nick);
+                       user->WriteServ("321 %s Channel :Users Name",user->nick);
+                       user->WriteServ("323 %s :End of channel list.",user->nick);
                        return 1;
                }
                return 0;
@@ -81,7 +79,7 @@ class ModuleSecureList : public Module
 
        virtual Priority Prioritize()
        {
-               return Srv->PriorityBefore("m_safelist.so");
+               return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
        }
 
 };
@@ -101,7 +99,7 @@ class ModuleSecureListFactory : public ModuleFactory
        {
        }
  
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSecureList(Me);
        }