Fix SetModeParam to use std::string and handle edge cases.

[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 c81ab2a706e953c29c2b4539c2cb011f82e2704d..00c191d26a74c30cebe3143662d4f5696160d63c 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -50,40 +50,32 @@ class Redirect : public ModeHandler
                        }
 
                        c = ServerInstance->FindChan(parameter);
-                       if (c)
+                       if (!c && !IS_OPER(source))
                        {
-                               /* Fix by brain: Dont let a channel be linked to *itself* either */
-                               if (IS_LOCAL(source))
-                               {
-                                       if ((c == channel) || (c->IsModeSet('L')))
-                                       {
-                                               source->WriteNumeric(690, "%s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick.c_str(),parameter.c_str());
-                                               parameter.clear();
-                                               return MODEACTION_DENY;
-                                       }
-                                       else
-                                       {
-                                               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()) == channel->name))
-                                                       {
-                                                               source->WriteNumeric(690, "%s :Circular or chained +L to %s not allowed (Already forwarded here from %s). Angry monkeys dispatched.",source->nick.c_str(), parameter.c_str(), i->second->name.c_str());
-                                                               return MODEACTION_DENY;
-                                                       }
-                                               }
-                                       }
-                               }
+                               source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),parameter.c_str());
+                               parameter.clear();
+                               return MODEACTION_DENY;
+                       }
+
+                       if (c && c->GetStatus(source) < STATUS_OP && !IS_OPER(source))
+                       {
+                               source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(),parameter.c_str());
+                               parameter.clear();
+                               return MODEACTION_DENY;
                        }
 
-                       channel->SetMode('L', true);
-                       channel->SetModeParam('L', parameter.c_str(), true);
+                       /*
+                        * We used to do some checking for circular +L here, but there is no real need for this any more especially as we
+                        * now catch +L looping in PreJoin. Remove it, since O(n) logic makes me sad, and we catch it anyway. :) -- w00t
+                        */
+                       channel->SetMode('L', parameter);
                        return MODEACTION_ALLOW;
                }
                else
                {
                        if (channel->IsModeSet('L'))
                        {
-                               channel->SetMode('L', false);
+                               channel->SetMode('L', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -127,11 +119,11 @@ class ModuleRedirect : public Module
                                        destchan = ServerInstance->FindChan(channel);
                                        if (destchan && destchan->IsModeSet('L'))
                                        {
-                                               user->WriteNumeric(470, "%s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick.c_str(), cname, channel.c_str());
+                                               user->WriteNumeric(470, "%s %s * :You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.", user->nick.c_str(), cname);
                                                return 1;
                                        }
 
-                                       user->WriteNumeric(470, "%s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick.c_str(), cname, channel.c_str());
+                                       user->WriteNumeric(470, "%s %s %s :You may not join this channel, so you are automatically being transferred to the redirect channel.", user->nick.c_str(), cname, channel.c_str());
                                        Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
                                        return 1;
                                }
@@ -148,7 +140,7 @@ class ModuleRedirect : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };