X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=a045af8f83b1a5e723f5058e57c96026eb28c10b;hb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;hp=4c44e630c53dcc972a8feb8647ae8318df71024d;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 4c44e630c..a045af8f8 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -39,7 +39,7 @@ class Redirect : public ModeHandler
 		{
 			if (IS_LOCAL(source))
 			{
-				if (!ServerInstance->IsChannel(parameter.c_str(), ServerInstance->Config->Limits.ChanMax))
+				if (!ServerInstance->IsChannel(parameter, ServerInstance->Config->Limits.ChanMax))
 				{
 					source->WriteNumeric(403, "%s %s :Invalid channel name", source->nick.c_str(), parameter.c_str());
 					parameter.clear();
@@ -47,7 +47,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)
@@ -115,25 +115,23 @@ class ModuleRedirect : public Module
 		UseUsermode = ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect");
 
 		/* Channel mode */
-		if (!ServerInstance->Modes->AddMode(&re))
-			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->AddService(re);
 
 		/* Check to see if the usermode is enabled in the config */
 		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("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.");
 
 			/* Try to add the usermode */
-			if (!ServerInstance->Modes->AddMode(&re_u))
-				throw ModuleException("Could not add new modes!");
+			ServerInstance->Modules->AddService(re_u);
 		}
 
 		Implementation eventlist[] = { I_OnUserPreJoin };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* 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)
 	{
 		if (chan)
 		{
@@ -144,25 +142,23 @@ class ModuleRedirect : public Module
 					std::string channel = chan->GetModeParameter('L');
 
 					/* sometimes broken ulines can make circular or chained +L, avoid this */
-					Channel* destchan = NULL;
-					destchan = ServerInstance->FindChan(channel);
+					Channel* destchan = ServerInstance->FindChan(channel);
 					if (destchan && destchan->IsModeSet('L'))
 					{
-						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);
+						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'))
 					{
-						user->WriteNumeric(470, "%s %s %s :Force redirection stopped.",
-						user->nick.c_str(), cname, channel.c_str());
+						user->WriteNumeric(470, "%s %s %s :Force redirection stopped.", user->nick.c_str(), cname.c_str(), channel.c_str());
 						return MOD_RES_DENY;
 					}
 					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, channel.c_str());
-						Channel::JoinUser(user, channel.c_str(), false, "", false, ServerInstance->Time());
+						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);
 						return MOD_RES_DENY;
 					}
 				}
@@ -171,10 +167,6 @@ class ModuleRedirect : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleRedirect()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides channel mode +L (limit redirection) and user mode +L (no forced redirection)", VF_VENDOR);