Support CAP LS

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 6a684206f2bede7928c32a90d82527e4b1347201..c828ade7b0098da7efd35b32539f971c8465cbda 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.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
@@ -23,7 +23,7 @@ inline int strtoint(const std::string &str)
        return result;
 }
 
-typedef std::map<userrec*, time_t> delaylist;
+typedef std::map<User*, time_t> delaylist;
 
 /** Handles channel mode +J
  */
@@ -32,7 +32,7 @@ class KickRejoin : public ModeHandler
  public:
        KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
                if (channel->IsModeSet('J'))
                        return std::make_pair(true, channel->GetModeParameter('J'));
@@ -40,13 +40,13 @@ class KickRejoin : public ModeHandler
                        return std::make_pair(false, parameter);
        } 
 
-       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
        {
                /* When TS is equal, the alphabetically later one wins */
                return (their_param < our_param);
        }
        
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (!adding)
                {
@@ -55,7 +55,7 @@ class KickRejoin : public ModeHandler
                        
                        if (channel->GetExt("norejoinusers", dl))
                        {
-                               DELETE(dl);
+                               delete dl;
                                channel->Shrink("norejoinusers");
                        }
                        
@@ -124,18 +124,20 @@ public:
        {
                
                kr = new KickRejoin(ServerInstance);
-               if (!ServerInstance->AddMode(kr, 'J'))
+               if (!ServerInstance->Modes->AddMode(kr))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {
                        delaylist* dl;
                        if (chan->GetExt("norejoinusers", dl))
                        {
-                               std::vector<userrec*> itemstoremove;
+                               std::vector<User*> itemstoremove;
                        
                                for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
                                {
@@ -160,7 +162,7 @@ public:
                                if (!dl->size())
                                {
                                        // Now it's empty..
-                                       DELETE(dl);
+                                       delete dl;
                                        chan->Shrink("norejoinusers");
                                }
                        }
@@ -168,7 +170,7 @@ public:
                return 0;
        }
                
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+       virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
        {
                if (chan->IsModeSet('J') && (source != user))
                {
@@ -182,13 +184,13 @@ public:
                }
        }
        
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                delaylist* dl;
                        
                if (chan->GetExt("norejoinusers", dl))
                {
-                       DELETE(dl);
+                       delete dl;
                        chan->Shrink("norejoinusers");
                }
        }
@@ -196,18 +198,14 @@ public:
        virtual void OnCleanup(int target_type, void* item)
        {
                if(target_type == TYPE_CHANNEL)
-                       OnChannelDelete((chanrec*)item);
+                       OnChannelDelete((Channel*)item);
        }
 
-       virtual void Implements(char* List)
-       {
-               List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
-       }
 
        virtual ~ModuleKickNoRejoin()
        {
                ServerInstance->Modes->DelMode(kr);
-               DELETE(kr);
+               delete kr;
        }
        
        virtual Version GetVersion()