X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=b71a2f3db608570e591876f46fa4af83ebb27901;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=e822676bf7357c102233cbcd69f5768110a4daf7;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index e822676bf..b71a2f3db 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -32,13 +32,13 @@ class Redirect : public ParamMode<Redirect, LocalStringExt>
 	Redirect(Module* Creator)
 		: ParamMode<Redirect, LocalStringExt>(Creator, "redirect", 'L') { }
 
-	ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
 	{
 		if (IS_LOCAL(source))
 		{
 			if (!ServerInstance->IsChannel(parameter))
 			{
-				source->WriteNumeric(ERR_NOSUCHCHANNEL, "%s :Invalid channel name", parameter.c_str());
+				source->WriteNumeric(Numerics::NoSuchChannel(parameter));
 				return MODEACTION_DENY;
 			}
 		}
@@ -48,12 +48,12 @@ class Redirect : public ParamMode<Redirect, LocalStringExt>
 			Channel* c = ServerInstance->FindChan(parameter);
 			if (!c)
 			{
-				source->WriteNumeric(690, ":Target channel %s must exist to be set as a redirect.",parameter.c_str());
+				source->WriteNumeric(690, InspIRCd::Format("Target channel %s must exist to be set as a redirect.", parameter.c_str()));
 				return MODEACTION_DENY;
 			}
 			else if (c->GetPrefixValue(source) < OP_VALUE)
 			{
-				source->WriteNumeric(690, ":You must be opped on %s to set it as a redirect.",parameter.c_str());
+				source->WriteNumeric(690, InspIRCd::Format("You must be opped on %s to set it as a redirect.", parameter.c_str()));
 				return MODEACTION_DENY;
 			}
 		}
@@ -72,46 +72,27 @@ class Redirect : public ParamMode<Redirect, LocalStringExt>
 	}
 };
 
-/** Handles usermode +L to stop forced redirection and print an error.
-*/
-class AntiRedirect : public SimpleUserModeHandler
-{
-	public:
-		AntiRedirect(Module* Creator) : SimpleUserModeHandler(Creator, "antiredirect", 'L')
-		{
-			if (!ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect"))
-				DisableAutoRegister();
-		}
-};
-
 class ModuleRedirect : public Module
 {
 	Redirect re;
-	AntiRedirect re_u;
+	SimpleUserModeHandler antiredirectmode;
 	ChanModeReference limitmode;
-	bool UseUsermode;
 
  public:
 	ModuleRedirect()
 		: re(this)
-		, re_u(this)
+		, antiredirectmode(this, "antiredirect", 'L')
 		, limitmode(this, "limit")
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		/* Setting this here so it isn't changable by rehasing the config later. */
-		UseUsermode = ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect");
-	}
-
 	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(limitmode))
 			{
-				if (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limitmode)))
+				if (chan->GetUserCounter() >= ConvToNum<size_t>(chan->GetModeParameter(limitmode)))
 				{
 					const std::string& channel = *re.ext.get(chan);
 
@@ -119,19 +100,18 @@ class ModuleRedirect : public Module
 					Channel* destchan = ServerInstance->FindChan(channel);
 					if (destchan && destchan->IsModeSet(re))
 					{
-						user->WriteNumeric(470, "%s * :You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.", cname.c_str());
+						user->WriteNumeric(470, cname, '*', "You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.");
 						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(re_u))
+
+					if (user->IsModeSet(antiredirectmode))
 					{
-						user->WriteNumeric(470, "%s %s :Force redirection stopped.", cname.c_str(), channel.c_str());
+						user->WriteNumeric(470, cname, channel, "Force redirection stopped.");
 						return MOD_RES_DENY;
 					}
 					else
 					{
-						user->WriteNumeric(470, "%s %s :You may not join this channel, so you are automatically being transferred to the redirect channel.", cname.c_str(), channel.c_str());
+						user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirect channel.");
 						Channel::JoinUser(user, channel);
 						return MOD_RES_DENY;
 					}