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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index d7f82f38e..cf0174cc6 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,36 +2,28 @@
  *       | 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 <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
-extern InspIRCd* ServerInstance;
-
+/** Handle channel mode +L
+ */
 class Redirect : public ModeHandler
 {
-	Server* Srv;
  public:
-	Redirect(Server* s) : ModeHandler('L', 1, 0, false, MODETYPE_CHANNEL, false), Srv(s) { }
+	Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
         ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
         {
@@ -53,14 +45,14 @@ class Redirect : public ModeHandler
 		{
 			chanrec* c = NULL;
 
-			if (!IsValidChannelName(parameter.c_str()))
+			if (!ServerInstance->IsChannel(parameter.c_str()))
 			{
 				source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str());
 				parameter = "";
 				return MODEACTION_DENY;
 			}
 
-			c = Srv->FindChannel(parameter);
+			c = ServerInstance->FindChan(parameter);
 			if (c)
 			{
 				/* Fix by brain: Dont let a channel be linked to *itself* either */
@@ -74,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)))
 							{
@@ -106,40 +98,46 @@ class Redirect : public ModeHandler
 
 class ModuleRedirect : public Module
 {
-	Server *Srv;
+	
 	Redirect* re;
 	
  public:
  
-	ModuleRedirect(Server* Me)
+	ModuleRedirect(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		re = new Redirect(Me);
-		Srv->AddMode(re, 'L');
+		
+		re = new Redirect(ServerInstance);
+		if (!ServerInstance->AddMode(re, 'L'))
+			throw ModuleException("Could not add new modes!");
 	}
 	
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+		List[I_OnUserPreJoin] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output, "L", 3);
-	}
-	
-	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)
 		{
-			if (chan->IsModeSet('L'))
+			if (chan->IsModeSet('L') && chan->limit)
 			{
 				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(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);
 					return 1;
 				}
 			}
@@ -149,12 +147,13 @@ class ModuleRedirect : public Module
 
 	virtual ~ModuleRedirect()
 	{
+		ServerInstance->Modes->DelMode(re);
 		DELETE(re);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
@@ -170,7 +169,7 @@ class ModuleRedirectFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleRedirect(Me);
 	}