X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=6bd375f88e96fd12dad3a5b80714c15958b62541;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=fc743402e8290abb6404365e75dce514c2f034c2;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index fc743402e..6bd375f88 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -20,7 +20,7 @@
 class Redirect : public ModeHandler
 {
  public:
-	Redirect(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
+	Redirect(Module* Creator) : ModeHandler(Creator, 'L', PARAM_SETONLY, MODETYPE_CHANNEL) { }
 
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
@@ -30,7 +30,7 @@ class Redirect : public ModeHandler
 			return std::make_pair(false, parameter);
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool server)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -44,7 +44,7 @@ class Redirect : public ModeHandler
 				}
 			}
 
-			if (IS_LOCAL(source) && !IS_OPER(source) && !server)
+			if (IS_LOCAL(source) && !IS_OPER(source))
 			{
 				Channel* c = ServerInstance->FindChan(parameter);
 				if (!c)
@@ -53,7 +53,7 @@ class Redirect : public ModeHandler
 					parameter.clear();
 					return MODEACTION_DENY;
 				}
-				else if (c->GetStatus(source) < STATUS_OP)
+				else if (c->GetPrefixValue(source) < OP_VALUE)
 				{
 					source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(),parameter.c_str());
 					parameter.clear();
@@ -89,8 +89,8 @@ class ModuleRedirect : public Module
 
  public:
 
-	ModuleRedirect(InspIRCd* Me)
-		: Module(Me), re(Me, this)
+	ModuleRedirect()
+		: re(this)
 	{
 
 		if (!ServerInstance->Modes->AddMode(&re))
@@ -100,7 +100,7 @@ class ModuleRedirect : public Module
 	}
 
 
-	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
 	{
 		if (chan)
 		{
@@ -116,16 +116,16 @@ class ModuleRedirect : public Module
 					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);
-						return 1;
+						return MOD_RES_DENY;
 					}
 
 					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(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
-					return 1;
+					Channel::JoinUser(user, channel.c_str(), false, "", false, ServerInstance->Time());
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual ~ModuleRedirect()
@@ -135,7 +135,7 @@ class ModuleRedirect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };