Apply CAP ACK/NAK stuff from nenolod, thanks :)

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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 492d39e58f242dee488ba5a45abaa267868f5fa0..9dc8aa5b72c8e0ba31a152f1a0cb9eeade722f14 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.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,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
@@ -25,30 +22,30 @@ class Redirect : public ModeHandler
  public:
        Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
-                if (channel->IsModeSet('L'))
-                        return std::make_pair(true, channel->GetModeParameter('L'));
-                else
-                        return std::make_pair(false, parameter);
-        }
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+       {
+               if (channel->IsModeSet('L'))
+                       return std::make_pair(true, channel->GetModeParameter('L'));
+               else
+                       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)
                {
-                       chanrec* c = NULL;
+                       Channel* c = NULL;
 
                        if (!ServerInstance->IsChannel(parameter.c_str()))
                        {
                                source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
-                               parameter = "";
+                               parameter.clear();
                                return MODEACTION_DENY;
                        }
 
@@ -61,7 +58,7 @@ class Redirect : public ModeHandler
                                        if ((c == channel) || (c->IsModeSet('L')))
                                        {
                                                source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick,parameter.c_str());
-                                               parameter = "";
+                                               parameter.clear();
                                                return MODEACTION_DENY;
                                        }
                                        else
@@ -108,16 +105,14 @@ class ModuleRedirect : public Module
        {
                
                re = new Redirect(ServerInstance);
-               if (!ServerInstance->AddMode(re, 'L'))
+               if (!ServerInstance->Modes->AddMode(re))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
        
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = 1;
-       }
 
-       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)
                {
@@ -128,7 +123,7 @@ class ModuleRedirect : public Module
                                        std::string channel = chan->GetModeParameter('L');
 
                                        /* sometimes broken ulines can make circular or chained +L, avoid this */
-                                       chanrec* destchan = NULL;
+                                       Channel* destchan = NULL;
                                        destchan = ServerInstance->FindChan(channel);
                                        if (destchan && destchan->IsModeSet('L'))
                                        {
@@ -137,7 +132,7 @@ class ModuleRedirect : public Module
                                        }
 
                                        user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick, cname, channel.c_str());
-                                       chanrec::JoinUser(ServerInstance, user, channel.c_str(), false, "", ServerInstance->Time(true));
+                                       Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
                                        return 1;
                                }
                        }
@@ -148,7 +143,7 @@ class ModuleRedirect : public Module
        virtual ~ModuleRedirect()
        {
                ServerInstance->Modes->DelMode(re);
-               DELETE(re);
+               delete re;
        }
        
        virtual Version GetVersion()
@@ -157,28 +152,4 @@ class ModuleRedirect : public Module
        }
 };
 
-
-class ModuleRedirectFactory : public ModuleFactory
-{
- public:
-       ModuleRedirectFactory()
-       {
-       }
-       
-       ~ModuleRedirectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRedirect(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleRedirectFactory;
-}
-
+MODULE_INIT(ModuleRedirect)