X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=523500e504abc367d8abc9d4b5a129d87a037846;hb=ea590a5d80741c3bc030cb0a2fcb3c59da4fd078;hp=81022a9076ad5fbe7cceb2d13895123779718f84;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 81022a907..523500e50 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -113,7 +113,7 @@ class CommandJumpserver : public Command
 					LocalUser* t = *i;
 					if (!t->IsOper())
 					{
-						t->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", t->nick.c_str(), parameters[0].c_str(), GetPort(t));
+						t->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", parameters[0].c_str(), GetPort(t));
 						ServerInstance->Users->QuitUser(t, reason);
 						n_done++;
 					}
@@ -152,28 +152,24 @@ class ModuleJumpServer : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(js);
-	}
-
 	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
 		if (js.redirect_new_users)
 		{
 			int port = js.GetPort(user);
-			user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead",
-				user->nick.c_str(), js.redirect_to.c_str(), port);
+			user->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead",
+				js.redirect_to.c_str(), port);
 			ServerInstance->Users->QuitUser(user, js.reason);
 			return MOD_RES_PASSTHRU;
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		// Emergency way to unlock
-		if (!user) js.redirect_new_users = false;
+		if (!status.srcuser)
+			js.redirect_new_users = false;
 	}
 
 	Version GetVersion() CXX11_OVERRIDE