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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 5e78ccef2..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
@@ -97,12 +95,14 @@ class ModuleRedirect : public Module
 {
 	Redirect re;
 	AntiRedirect re_u;
+	ChanModeReference limitmode;
 	bool UseUsermode;
 
  public:
 	ModuleRedirect()
 		: re(this)
 		, re_u(this)
+		, limitmode(this, "limit")
 	{
 	}
 
@@ -118,23 +118,20 @@ class ModuleRedirect : public Module
 		if (UseUsermode)
 		{
 			/* Log noting that this breaks compatability. */
-			ServerInstance->Logs->Log("m_redirect", 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.");
+			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(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
 		{
-			if (chan->IsModeSet(re) && 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(&re);