This will royally fuck 1.2's linking right now, but..

[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 a3a03b4ceb8bd851471c285df1c8baf5851c69c7..a746644c20d5b5d82952cad55865582814faef12 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,24 +2,19 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
@@ -30,19 +25,19 @@ 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(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);
+       }
 
-        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, chanrec* 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)
        {
@@ -53,7 +48,7 @@ class Redirect : public ModeHandler
                        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;
                        }
 
@@ -66,12 +61,12 @@ 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
                                        {
-                                               for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
+                                               for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
                                                {
                                                        if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name)))
                                                        {
@@ -109,11 +104,12 @@ class ModuleRedirect : public Module
  public:
  
        ModuleRedirect(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                re = new Redirect(ServerInstance);
-               ServerInstance->AddMode(re, 'L');
+               if (!ServerInstance->AddMode(re, 'L'))
+                       throw ModuleException("Could not add new modes!");
        }
        
        void Implements(char* List)
@@ -130,8 +126,18 @@ class ModuleRedirect : public Module
                                if (chan->GetUserCounter() >= chan->limit)
                                {
                                        std::string channel = chan->GetModeParameter('L');
-                                       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);
+
+                                       /* sometimes broken ulines can make circular or chained +L, avoid this */
+                                       chanrec* destchan = NULL;
+                                       destchan = ServerInstance->FindChan(channel);
+                                       if (destchan && destchan->IsModeSet('L'))
+                                       {
+                                               user->WriteServ("470 %s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str());
+                                               return 1;
+                                       }
+
+                                       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));
                                        return 1;
                                }
                        }
@@ -151,28 +157,4 @@ class ModuleRedirect : public Module
        }
 };
 
-
-class ModuleRedirectFactory : public ModuleFactory
-{
- public:
-       ModuleRedirectFactory()
-       {
-       }
-       
-       ~ModuleRedirectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRedirect(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRedirectFactory;
-}
-
+MODULE_INIT(ModuleRedirect)