From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 13 Jul 2018 13:36:18 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=52fb1df106a21da0b7d8b504dddc1e598ed303b4;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31164
---

diff --git a/server/user.jobengine.osgi.server/pages/login.jsp b/server/user.jobengine.osgi.server/pages/login.jsp
deleted file mode 100644
index ad3623ec..00000000
--- a/server/user.jobengine.osgi.server/pages/login.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil, org.apache.logging.log4j.*"%>
-<%
-	//do login ++++
-	String targetPath = null;
-	if (SessionUtil.isAuthenticated())
-		targetPath = "/pages/index.zul";
-	else
-		targetPath = "/pages/login.zul";
-	
-	String queryString = request.getQueryString();
-	if (queryString != null)
-		targetPath += "?" + queryString;
-	LogManager.getLogger().info("Forwaring to {}", targetPath);
-	pageContext.forward(targetPath);
-	
-%>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
index 8c9da5e0..169e81e9 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/IndexModel.java
@@ -70,15 +70,12 @@ public class IndexModel extends BaseModel {
 	}
 
 	public void route(String action, String query) {
+		String queryString = query == null ? "" : query;
 		String actionString = action == null ? "/" : action;
 		String page = (String) pathMap.get(actionString);
-		if (query != null)
-			page = String.format("/pages/%s.zul%s", page, query);
-		else
-			page = String.format("/pages/%s.zul", page);
-		setPage(page);
-		pushClientHistory(actionString, query);
-		SessionUtil.pushHistory(actionString, query);
+		setPage(String.format("/pages/%s.zul%s", page, queryString));
+		pushClientHistory(actionString, queryString);
+		SessionUtil.pushHistory(actionString, queryString);
 	}
 
 	public void setPage(String page) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
index 95fbee3a..2ea85860 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java
@@ -3,6 +3,7 @@ package user.jobengine.zk.util;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -84,10 +85,7 @@ public class SessionUtil {
 	}
 
 	static public String getQueryString() {
-		HttpServletRequest request = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
-		String result = request.getQueryString();
-		result = result == null ? "" : "?" + result;
-		return result;
+		return getQueryString(null);
 	}
 
 	static public String getQueryString(List<String> exclude) {
@@ -96,8 +94,11 @@ public class SessionUtil {
 		Map<String, String[]> parameters = request.getParameterMap();
 		if (parameters != null && parameters.size() > 0) {
 			StringBuilder sb = new StringBuilder();
-			for (String key : parameters.keySet()) {
-				if (exclude.contains(key))
+
+			ArrayList<String> keys = new ArrayList<>(parameters.keySet());
+			Collections.sort(keys);
+			for (String key : keys) {
+				if (exclude != null && exclude.contains(key))
 					continue;
 				if (sb.length() == 0)
 					sb.append("?");