Now with added ANGRY MONKEYS.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4777 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 8abb7a77e2285bd105f5ab7c8991d83bec304093..8d2d152c204d7c282c3a2cb96bb0523a83e8cb83 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -24,6 +24,8 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
+extern chan_hash chanlist;
+
 class Redirect : public ModeHandler
 {
        Server* Srv;
@@ -63,10 +65,21 @@ class Redirect : public ModeHandler
                                /* Fix by brain: Dont let a channel be linked to *itself* either */
                                if ((c == channel) || (c->IsModeSet('L')))
                                {
-                                       WriteServ(source->fd,"690 %s :Circular or chained +L to %s not allowed. Pack of wild dogs has been unleashed.",source->nick,parameter.c_str());
+                                       WriteServ(source->fd,"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 = "";
                                        return MODEACTION_DENY;
                                }
+                               else
+                               {
+                                       for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
+                                       {
+                                               if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name)))
+                                               {
+                                                       WriteServ(source->fd,"690 %s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick,parameter.c_str(),i->second->name);
+                                                       return MODEACTION_DENY;
+                                               }
+                                       }
+                               }
                        }
 
                        channel->SetMode('L', true);