X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=c3cbf1b6ab6c3eea30d36fdf235fc1886ce73818;hb=45805210f8c9bbce6222c50863a1671f562ccfbb;hp=161dfe2c34d039db5ee0310ab08bc6f13381fea0;hpb=5458e9684da2c5e20908b8bf3ffb9178212020d0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 161dfe2c3..c3cbf1b6a 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -82,41 +82,41 @@ class CommandJumpserver : public Command
 					break;
 				}
 			}
-		}
 
-		if (redirect_all_immediately)
-		{
-			/* Redirect everyone but the oper sending the command */
-			for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+			if (redirect_all_immediately)
 			{
-				User* t = *i;
-				if (!IS_OPER(t))
+				/* Redirect everyone but the oper sending the command */
+				for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+				{
+					User* t = *i;
+					if (!IS_OPER(t))
+					{
+						t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str());
+						ServerInstance->Users->QuitUser(t, reason);
+						n_done++;
+					}
+				}
+				if (n_done)
 				{
-					t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str());
-					ServerInstance->Users->QuitUser(t, reason);
-					n_done++;
+					n_done_s = ConvToStr(n_done);
 				}
 			}
-			if (n_done)
+
+			if (redirect_new_users)
 			{
-				n_done_s = ConvToStr(n_done);
+				redirect_to = parameters[0];
+				port = atoi(parameters[1].c_str());
 			}
-		}
 
-		if (redirect_new_users)
-		{
-			redirect_to = parameters[0];
-			port = atoi(parameters[1].c_str());
+			user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str(),
+					redirect_all_immediately ? "a" : "",
+					redirect_new_users ? "n" : "",
+					n_done ? " (" : "",
+					n_done ? n_done_s.c_str() : "",
+					n_done ? " user(s) redirected)" : "",
+					reason.c_str());
 		}
 
-		user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[1].c_str(),
-				redirect_all_immediately ? "a" : "",
-				redirect_new_users ? "n" : "",
-				n_done ? " (" : "",
-				n_done ? n_done_s.c_str() : "",
-				n_done ? " user(s) redirected)" : "",
-				reason.c_str());
-
 		return CMD_LOCALONLY;
 	}
 };
@@ -154,7 +154,7 @@ class ModuleJumpServer : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
 };