X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=9dc8aa5b72c8e0ba31a152f1a0cb9eeade722f14;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=a3a03b4ceb8bd851471c285df1c8baf5851c69c7;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index a3a03b4ce..9dc8aa5b7 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -2,23 +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-2008 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"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
@@ -30,30 +22,30 @@ 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(User* source, User* dest, Channel* 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, Channel* 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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
 		if (adding)
 		{
-			chanrec* c = NULL;
+			Channel* c = NULL;
 
 			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 +58,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,19 +101,18 @@ class ModuleRedirect : public Module
  public:
  
 	ModuleRedirect(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		re = new Redirect(ServerInstance);
-		ServerInstance->AddMode(re, 'L');
+		if (!ServerInstance->Modes->AddMode(re))
+			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 	
-	void Implements(char* List)
-	{
-		List[I_OnUserPreJoin] = 1;
-	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
@@ -130,8 +121,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 */
+					Channel* 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());
+					Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
 					return 1;
 				}
 			}
@@ -142,7 +143,7 @@ class ModuleRedirect : public Module
 	virtual ~ModuleRedirect()
 	{
 		ServerInstance->Modes->DelMode(re);
-		DELETE(re);
+		delete re;
 	}
 	
 	virtual Version GetVersion()
@@ -151,28 +152,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)