Remove InspIRCd::WriteOpers in favour of snomask O

[user/henk/code/inspircd.git] / src / modules / m_safelist.cpp

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 5059b9f77c05933aa15867cb2f5c53c818301d41..b04701f5d9339c1a26f40b7aa7474fa37eb97955 100644 (file)
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.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
@@ -11,10 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h" 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "wildcard.h"
 
 /** Holds a users m_safelist state
@@ -45,13 +42,15 @@ class ModuleSafeList : public Module
        ModuleSafeList(InspIRCd* Me) : Module(Me)
        {
                OnRehash(NULL, "");
+               Implementation eventlist[] = { I_OnBufferFlushed, I_OnPreCommand, I_OnCleanup, I_OnUserQuit, I_On005Numeric, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
  
        virtual ~ModuleSafeList()
        {
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader MyConf(ServerInstance);
                ThrottleSecs = MyConf.ReadInteger("safelist", "throttle", "60", 0, true);
@@ -65,16 +64,12 @@ class ModuleSafeList : public Module
                return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
  
-       void Implements(char* List)
-       {
-               List[I_OnBufferFlushed] = List[I_OnPreCommand] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnRehash] = 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)
@@ -91,7 +86,7 @@ class ModuleSafeList : public Module
         * HandleList()
         *   Handle (override) the LIST command.
         */
-       int HandleList(const char** parameters, int pcnt, userrec* user)
+       int HandleList(const char** parameters, int pcnt, User* user)
        {
                int minusers = 0, maxusers = 0;
 
@@ -142,7 +137,7 @@ class ModuleSafeList : public Module
                                return 1;
                        }
 
-                       DELETE(last_list_time);
+                       delete last_list_time;
                        user->Shrink("safelist_last");
                }
 
@@ -164,14 +159,14 @@ class ModuleSafeList : public Module
                return 1;
        }
 
-       virtual void OnBufferFlushed(userrec* user)
+       virtual void OnBufferFlushed(User* user)
        {
                char buffer[MAXBUF];
                ListData* ld;
                if (user->GetExt("safelist_cache", ld))
                {
-                       chanrec* chan = NULL;
-                       long amount_sent = 0;
+                       Channel* chan = NULL;
+                       unsigned long amount_sent = 0;
                        do
                        {
                                chan = ServerInstance->GetChannelIndex(ld->list_position);
@@ -220,11 +215,11 @@ class ModuleSafeList : public Module
                                }
                                ld->list_position++;
                        }
-                       while ((chan != NULL) && (amount_sent < (user->sendqmax / 4)));
+                       while ((chan != NULL) && (amount_sent < (user->MyClass->GetSendqMax() / 4)));
                        if (ld->list_ended)
                        {
                                user->Shrink("safelist_cache");
-                               DELETE(ld);
+                               delete ld;
                                global_listing--;
                        }
                }
@@ -234,20 +229,20 @@ class ModuleSafeList : public Module
        {
                if(target_type == TYPE_USER)
                {
-                       userrec* u = (userrec*)item;
+                       User* u = (User*)item;
                        ListData* ld;
                        u->GetExt("safelist_cache", ld);
                        if (ld)
                        {
                                u->Shrink("safelist_cache");
-                               DELETE(ld);
+                               delete ld;
                                global_listing--;
                        }
                        time_t* last_list_time;
                        u->GetExt("safelist_last", last_list_time);
                        if (last_list_time)
                        {
-                               DELETE(last_list_time);
+                               delete last_list_time;
                                u->Shrink("safelist_last");
                        }
                }
@@ -258,7 +253,7 @@ class ModuleSafeList : public Module
                output.append(" SAFELIST");
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+       virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
        {
                this->OnCleanup(TYPE_USER,user);
        }