X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=cf0174cc600e1e49148fbd74ed9c27bae0c3d281;hb=7c197db72eab03321e4f3e847054e13126520504;hp=efd9b8b1c5a4497b2155f2ce4164957889bb8365;hpb=e7c31868d1787071a063c31eae0a8de5389a9419;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index efd9b8b1c..cf0174cc6 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,20 +2,15 @@
  *       | 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 "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -23,6 +18,8 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
+/** Handle channel mode +L
+ */
 class Redirect : public ModeHandler
 {
  public:
@@ -69,7 +66,7 @@ class Redirect : public ModeHandler
 					}
 					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)))
 							{
@@ -111,7 +108,8 @@ class ModuleRedirect : public Module
 	{
 		
 		re = new Redirect(ServerInstance);
-		ServerInstance->AddMode(re, 'L');
+		if (!ServerInstance->AddMode(re, 'L'))
+			throw ModuleException("Could not add new modes!");
 	}
 	
 	void Implements(char* List)
@@ -119,7 +117,7 @@ class ModuleRedirect : public Module
 		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
@@ -128,7 +126,17 @@ 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());
+
+					/* 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);
 					return 1;
 				}
@@ -145,7 +153,7 @@ class ModuleRedirect : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };