X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=599144448833c1aea22837fbfd4543b915151672;hb=bbbd6c9ac46c040b9769c227f0f3ffbfcd43b0e7;hp=81022a9076ad5fbe7cceb2d13895123779718f84;hpb=f19dd8310e0b14dd679aba0dc054a4314ca53c5a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 81022a907..599144448 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -108,12 +108,13 @@ class CommandJumpserver : public Command
 			if (redirect_all_immediately)
 			{
 				/* Redirect everyone but the oper sending the command */
-				for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
+				const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+				for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 				{
 					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 +153,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