X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=89097ade4cc07b318cea5722f90e4dc076dbb1d4;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=8076bb2a139d7e171f6f28668fb96f2b488c3783;hpb=1cb05553e286227e6bbd463d0b4b8cae40ff3940;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 8076bb2a1..89097ade4 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -24,8 +24,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel mode +L (limit redirection) and usermode +L (no forced redirection) */
-
 /** Handle channel mode +L
  */
 class Redirect : public ModeHandler
@@ -39,7 +37,7 @@ class Redirect : public ModeHandler
 		{
 			if (IS_LOCAL(source))
 			{
-				if (!ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax))
+				if (!ServerInstance->IsChannel(parameter))
 				{
 					source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str());
 					parameter.clear();
@@ -47,7 +45,7 @@ class Redirect : public ModeHandler
 				}
 			}
 
-			if (IS_LOCAL(source) && !IS_OPER(source))
+			if (IS_LOCAL(source) && !source->IsOper())
 			{
 				Channel* c = ServerInstance->FindChan(parameter);
 				if (!c)
@@ -64,20 +62,18 @@ class Redirect : public ModeHandler
 				}
 			}
 
-			if (channel->GetModeParameter('L') == parameter)
+			if (channel->GetModeParameter(this) == parameter)
 				return MODEACTION_DENY;
 			/*
 			 * 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->SetModeParam('L', parameter);
 			return MODEACTION_ALLOW;
 		}
 		else
 		{
-			if (channel->IsModeSet('L'))
+			if (channel->IsModeSet(this))
 			{
-				channel->SetModeParam('L', "");
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -97,19 +93,20 @@ class AntiRedirect : public SimpleUserModeHandler
 
 class ModuleRedirect : public Module
 {
-
 	Redirect re;
 	AntiRedirect re_u;
+	ChanModeReference limitmode;
 	bool UseUsermode;
 
  public:
-
 	ModuleRedirect()
-		: re(this), re_u(this)
+		: re(this)
+		, re_u(this)
+		, limitmode(this, "limit")
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		/* Setting this here so it isn't changable by rehasing the config later. */
 		UseUsermode = ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect");
@@ -121,37 +118,33 @@ class ModuleRedirect : public Module
 		if (UseUsermode)
 		{
 			/* Log noting that this breaks compatability. */
-			ServerInstance->Logs->Log("m_redirect", DEFAULT, "REDIRECT: Enabled usermode +L. This breaks linking with servers that do not have this enabled. This is disabled by default in the 2.0 branch but will be enabled in the next version.");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "REDIRECT: Enabled usermode +L. This breaks linking with servers that do not have this enabled. This is disabled by default in the 2.0 branch but will be enabled in the next version.");
 
 			/* Try to add the usermode */
 			ServerInstance->Modules->AddService(re_u);
 		}
-
-		Implementation eventlist[] = { I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
 		{
-			if (chan->IsModeSet('L') && chan->IsModeSet('l'))
+			if (chan->IsModeSet(re) && chan->IsModeSet(limitmode))
 			{
-				if (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter('l')))
+				if (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limitmode)))
 				{
-					std::string channel = chan->GetModeParameter('L');
+					std::string channel = chan->GetModeParameter(&re);
 
 					/* sometimes broken ulines can make circular or chained +L, avoid this */
-					Channel* destchan = NULL;
-					destchan = ServerInstance->FindChan(channel);
-					if (destchan && destchan->IsModeSet('L'))
+					Channel* destchan = ServerInstance->FindChan(channel);
+					if (destchan && destchan->IsModeSet(re))
 					{
 						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.c_str());
 						return MOD_RES_DENY;
 					}
 					/* We check the bool value here to make sure we have it enabled, if we don't then
 						usermode +L might be assigned to something else. */
-					if (UseUsermode && user->IsModeSet('L'))
+					if (UseUsermode && user->IsModeSet(re_u))
 					{
 						user->WriteNumeric(470, "%s %s %s :Force redirection stopped.", user->nick.c_str(), cname.c_str(), channel.c_str());
 						return MOD_RES_DENY;
@@ -159,7 +152,7 @@ class ModuleRedirect : public Module
 					else
 					{
 						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.c_str(), channel.c_str());
-						Channel::JoinUser(user, channel, false, "", false, ServerInstance->Time());
+						Channel::JoinUser(user, channel);
 						return MOD_RES_DENY;
 					}
 				}
@@ -168,11 +161,7 @@ class ModuleRedirect : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleRedirect()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel mode +L (limit redirection) and user mode +L (no forced redirection)", VF_VENDOR);
 	}