X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=a746644c20d5b5d82952cad55865582814faef12;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=e6a89ef4094dad1a3cb88892f3e760f14a881fc9;hpb=0547af0d7e4afaa4883e0a57e728fd395ef9b844;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index e6a89ef40..a746644c2 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -11,10 +11,10 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
 
@@ -25,19 +25,19 @@ 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(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);
+	}
 
-        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, chanrec* 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)
 	{
@@ -48,7 +48,7 @@ class Redirect : public ModeHandler
 			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;
 			}
 
@@ -61,7 +61,7 @@ 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
@@ -104,7 +104,7 @@ class ModuleRedirect : public Module
  public:
  
 	ModuleRedirect(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		re = new Redirect(ServerInstance);
@@ -132,12 +132,12 @@ class ModuleRedirect : public Module
 					destchan = ServerInstance->FindChan(channel);
 					if (destchan && destchan->IsModeSet('L'))
 					{
-						user->WriteServ("470 %s :%s has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str());
-						return 0;
+						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);
+					chanrec::JoinUser(ServerInstance, user, channel.c_str(), false, "", ServerInstance->Time(true));
 					return 1;
 				}
 			}
@@ -157,28 +157,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)