From e78125b9e5f472cf5ef98913a2ed59f4c5b2ade3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 13 Jul 2018 13:26:24 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31163

---
 server/user.jobengine.osgi.server/index.jsp   | 13 +--
 .../pages/mediaplayer.jsp                     |  6 +-
 .../pages/searchitems.zul                     |  2 +-
 .../user/jobengine/zk/model/IndexModel.java   | 83 ++++++-------------
 .../user/jobengine/zk/model/LoginModel.java   |  8 +-
 .../user/jobengine/zk/model/MenuModel.java    |  2 +-
 .../user/jobengine/zk/model/SearchModel.java  | 21 ++---
 .../jobengine/zk/util/AdminAuthInitiator.java |  6 +-
 .../user/jobengine/zk/util/AuthInitiator.java |  4 +-
 .../user/jobengine/zk/util/SessionUtil.java   | 46 +++++++++-
 .../zk/util/SubmitterAuthInitiator.java       |  6 +-
 11 files changed, 98 insertions(+), 99 deletions(-)

diff --git a/server/user.jobengine.osgi.server/index.jsp b/server/user.jobengine.osgi.server/index.jsp
index 07d46254..985886f6 100644
--- a/server/user.jobengine.osgi.server/index.jsp
+++ b/server/user.jobengine.osgi.server/index.jsp
@@ -1,10 +1,11 @@
 <%@ page import="java.util.*, java.io.*, java.net.*, user.jobengine.zk.util.SessionUtil, org.apache.logging.log4j.*"%>
 <link rel="shortcut icon" href="/img/mediacube_logo_small.ico">
 <%
-	String targetPath = "/pages/index.zul";
-	String queryString = request.getQueryString();
-	if (queryString != null)
-		targetPath += "?" + queryString;
-	LogManager.getLogger().info("Forwaring to {}", targetPath);
-	pageContext.forward(targetPath);
+// 	String targetPath = "/pages/index.zul";
+// 	String queryString = request.getQueryString();
+// 	if (queryString != null)
+// 		targetPath += "?" + queryString;
+// 	LogManager.getLogger().info("Forwaring to {}", targetPath);
+
+	pageContext.forward("/pages/index.zul");
 %>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
index d51833ef..1d5d0bca 100644
--- a/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
+++ b/server/user.jobengine.osgi.server/pages/mediaplayer.jsp
@@ -37,11 +37,13 @@
 		//console.log('URL is: <%=mediaURL%> ');
 	</script>
 	<center>
-	<video id="myVideoDiv"
-		class="video-js vjs-default-skin vjs-big-play-centered"
+	<video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered"
 		<%if (poster != null && !poster.isEmpty()) {%> 
 		poster="<%=poster%>"
 		<%}%>>
+		<%if (mediaURL != null && !mediaURL.isEmpty()) {%> 
+		poster="<%=poster%>"
+		<%}%>>
 		<source src="<%=mediaURL%>" type='video/mp4'>
 		<!--source src="/zk/media_oceans.mp4" type='video/mp4' -->
 		<!--source src="MY_VIDEO.webm" type='video/webm' -->
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 5eacbd0a..e3a88aa8 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -104,7 +104,7 @@
 					</popup>
 					<groupbox vflex="true" closable="false">
 						<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
-							model="@load(vm.searchResult)" activePage="@bind(vm.activePage)" emptyMessage="Nincs találat!" onAfterRender="@command('onPaging')" pageSize="50"
+							model="@load(vm.searchResult)" emptyMessage="Nincs találat!" onAfterRender="@command('onPaging')" pageSize="50"
 							style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">
 							<columns>
 								<column hflex="min">
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 ff5d473c..8c9da5e0 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
@@ -1,5 +1,6 @@
 package user.jobengine.zk.model;
 
+import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.logging.log4j.LogManager;
@@ -10,7 +11,6 @@ import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zk.ui.Execution;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.select.Selectors;
@@ -24,42 +24,18 @@ import user.jobengine.zk.util.SessionUtil;
 public class IndexModel extends BaseModel {
 	private static final Logger logger = LogManager.getLogger();
 
-	static public void redirect(String path) {
-		String query = IndexModel.toQueryString(Executions.getCurrent().getParameterMap());
-		if (query != null)
-			path += query;
-		logger.info("Redirecting to {}", path);
-		Executions.sendRedirect(path);
-	}
-
-	static public BasicDBObject toParamObject(Map<String, String[]> parameters) {
-		BasicDBObject result = null;
-		if (parameters != null && parameters.size() > 0) {
-			result = new BasicDBObject();
-			for (String key : parameters.keySet()) {
-				result.put(key, parameters.get(key)[0]);
-				//logger.info("{}:{}", key, parameters.get(key)[0]);
-			}
-		}
-		return result;
-	}
-
-	static public String toQueryString(Map<String, String[]> parameters) {
-		String result = null;
-		if (parameters != null && parameters.size() > 0) {
-			StringBuilder sb = new StringBuilder("?");
-			for (String key : parameters.keySet()) {
-				if (sb.length() > 1)
-					sb.append("&");
-				sb.append(key);
-				sb.append("=");
-				sb.append(parameters.get(key)[0]);
-				//logger.info("{}:{}", key, parameters.get(key)[0]);
-			}
-			result = sb.toString();
-		}
-		return result;
-	}
+	//	static public BasicDBObject toParamObject(Map<String, String[]> parameters) {
+	//		BasicDBObject result = null;
+	//		if (parameters != null && parameters.size() > 0) {
+	//			result = new BasicDBObject();
+	//			for (String key : parameters.keySet()) {
+	//				result.put(key, parameters.get(key)[0]);
+	//				//logger.info("{}:{}", key, parameters.get(key)[0]);
+	//			}
+	//		}
+	//		return result;
+	//	}
+	//
 
 	private String page;
 
@@ -70,12 +46,7 @@ public class IndexModel extends BaseModel {
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
-
-		Execution execution = Executions.getCurrent();
-		String action = execution.getParameter("action");
-		Map<String, String[]> parameters = execution.getParameterMap();
-		route(action, toQueryString(parameters), true);
-
+		route(Executions.getCurrent().getParameter("action"), SessionUtil.getQueryString(Arrays.asList("action")));
 		SessionUtil.setAttribute(IndexModel.class.getCanonicalName(), this);
 	}
 
@@ -88,30 +59,26 @@ public class IndexModel extends BaseModel {
 		BasicDBObject h = SessionUtil.popHistory();
 		if (h == null)
 			return;
-		route(h.getString("action"), h.getString("query"), h.getBoolean("useQueryString"));
+		route(h.getString("action"), h.getString("query"));
 	}
 
-	public void pushClientHistory(String action, String query, boolean useQueryString) {
-		if (!action.equals("/"))
-			action = "/actions/" + action;
-		if (useQueryString && query != null)
-			action += query;
-		Clients.evalJavaScript(String.format("window.history.pushState('%s', null, '%s');", query, action));
-		logger.info("Pushed to client: {} {}", action, query);
+	public void pushClientHistory(String action, String query) {
+		String realAction = action.equals("/") ? action : "/actions/" + action;
+		realAction += query;
+		Clients.evalJavaScript(String.format("window.history.pushState(null, null, '%s');", realAction));
+		logger.info("Pushed to client: {}", realAction);
 	}
 
-	public void route(String action, String query, boolean useQueryString) {
-		//		HttpServletRequest r = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
-		//		String pathInfo = r.getPathInfo();
+	public void route(String action, String query) {
 		String actionString = action == null ? "/" : action;
 		String page = (String) pathMap.get(actionString);
-		if (useQueryString && query != null)
-			page = String.format("/pages/%s.zul?%s", page, query);
+		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, useQueryString);
-		SessionUtil.pushHistory(actionString, query, useQueryString);
+		pushClientHistory(actionString, query);
+		SessionUtil.pushHistory(actionString, query);
 	}
 
 	public void setPage(String page) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/LoginModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/LoginModel.java
index 6688cfcf..ef48a143 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/LoginModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/LoginModel.java
@@ -21,7 +21,7 @@ public class LoginModel extends BaseModel {
 
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
-		query = IndexModel.toQueryString(Executions.getCurrent().getParameterMap());
+		query = SessionUtil.getQueryString();
 	}
 
 	@Command
@@ -31,10 +31,8 @@ public class LoginModel extends BaseModel {
 			setMessage("Hibás fiókadatok!");
 			return;
 		}
-		String path = "/";
-		if (query != null)
-			path += query;
-		Executions.sendRedirect(path);
+
+		Executions.sendRedirect("/" + query);
 	}
 
 	public String getAccount() {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
index ec5c5a87..16de942a 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
@@ -67,7 +67,7 @@ public class MenuModel extends BaseModel {
 	public void navigate(@BindingParam("action") String action) {
 		IndexModel indexModel = (IndexModel) SessionUtil.getAttribute(IndexModel.class.getCanonicalName());
 		if (indexModel != null) {
-			indexModel.route(action, null, false);
+			indexModel.route(action, null);
 		}
 	}
 
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 8ec7b570..be621395 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -25,6 +25,7 @@ import org.zkoss.zk.ui.event.MouseEvent;
 import org.zkoss.zk.ui.event.SortEvent;
 import org.zkoss.zk.ui.select.Selectors;
 import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Column;
 import org.zkoss.zul.Detail;
@@ -69,7 +70,6 @@ public class SearchModel extends AsyncBaseModel {
 	private Validator allFilterCheckedValidator;
 	private Validator itemSelectedValidator;
 	private boolean allChecked = true;
-	private int activePage;
 	private boolean rowsExpanded = true;
 	private boolean allSelected;
 
@@ -145,6 +145,9 @@ public class SearchModel extends AsyncBaseModel {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
 		itemsGrid.getPagingChild().setAutohide(false);
+		itemsGrid.getPaginal().addEventListener("onPaging ", pe -> {
+			logger.info("PAGING");
+		});
 		for (Component child : itemsGrid.getColumns().getChildren()) {
 			Column column = (Column) child;
 			column.addEventListener("onSort", evt -> doSort(evt));
@@ -163,7 +166,7 @@ public class SearchModel extends AsyncBaseModel {
 	}
 
 	@Command
-	@NotifyChange({ "activePage", "searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath" })
+	@NotifyChange({ "searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath" })
 	public void doSearch() {
 		try {
 			this.selectedObject = null;
@@ -189,7 +192,7 @@ public class SearchModel extends AsyncBaseModel {
 		orderBy = columnHeaders.get(column.getLabel());
 		orderAscending = evt.isAscending();
 		doSearch();
-		NotifyChange("activePage", "searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath");
+		NotifyChange("searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath");
 
 		evt.stopPropagation();
 	}
@@ -207,10 +210,6 @@ public class SearchModel extends AsyncBaseModel {
 		model.selectArchivedMedia(this.selectedObject, true);
 	}
 
-	public int getActivePage() {
-		return activePage;
-	}
-
 	public Validator getAllFilterCheckedValidator() {
 		return allFilterCheckedValidator;
 	}
@@ -369,8 +368,8 @@ public class SearchModel extends AsyncBaseModel {
 
 	@Command
 	public void onPaging() {
-		// if (rows != null)
-		// Clients.scrollIntoView(rows);
+		if (rows != null)
+			Clients.scrollIntoView(rows);
 	}
 
 	@Command
@@ -399,10 +398,6 @@ public class SearchModel extends AsyncBaseModel {
 		highlight(this.selectedObject, true);
 	}
 
-	public void setActivePage(int activePage) {
-		this.activePage = activePage;
-	}
-
 	@NotifyChange("typeFilters")
 	public void setAllChecked(boolean allChecked) {
 		this.allChecked = allChecked;
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AdminAuthInitiator.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AdminAuthInitiator.java
index 8350e8d8..51c36df9 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AdminAuthInitiator.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AdminAuthInitiator.java
@@ -5,17 +5,15 @@ import java.util.Map;
 import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.util.Initiator;
 
-import user.jobengine.zk.model.IndexModel;
-
 public class AdminAuthInitiator implements Initiator {
 
 	@Override
 	public void doInit(Page page, Map<String, Object> args) throws Exception {
 		if (!SessionUtil.isAuthenticated())
-			IndexModel.redirect("/pages/login.jsp");
+			SessionUtil.redirect("/pages/login.zul");
 
 		if (!SessionUtil.isAdmin())
-			IndexModel.redirect("/pages/access-denied.zul");
+			SessionUtil.redirect("/pages/access-denied.zul");
 	}
 
 }
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AuthInitiator.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AuthInitiator.java
index e0219ff8..7d4f3f04 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AuthInitiator.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/AuthInitiator.java
@@ -5,8 +5,6 @@ import java.util.Map;
 import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.util.Initiator;
 
-import user.jobengine.zk.model.IndexModel;
-
 /**
  * Ellenorzi, hogy van e beloginelt user, ha nincs, akkor -> login.zul Minden oldal belinkeli ezt az ellenorzest.
  */
@@ -14,7 +12,7 @@ public class AuthInitiator implements Initiator {
 	@Override
 	public void doInit(Page page, Map<String, Object> args) throws Exception {
 		if (!SessionUtil.isAuthenticated())
-			IndexModel.redirect("/pages/login.jsp");
+			SessionUtil.redirect("/pages/login.zul");
 	}
 
 }
\ No newline at end of file
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 b7ff5630..95fbee3a 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
@@ -4,12 +4,15 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.Session;
 import org.zkoss.zk.ui.Sessions;
 
@@ -54,6 +57,11 @@ public class SessionUtil {
 		//setAttribute(SessionUtil.USERPRINCIPAL, null);
 	}
 
+	static public void dumpQueryString() {
+		HttpServletRequest request = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
+		logger.info(request.getQueryString());
+	}
+
 	static public Object getAttribute(String name) {
 		//HttpSession session = (HttpSession) (Executions.getCurrent()).getDesktop().getSession().getNativeSession();
 		Session zkSession = Sessions.getCurrent();
@@ -75,6 +83,35 @@ public class SessionUtil {
 		return cfg;
 	}
 
+	static public String getQueryString() {
+		HttpServletRequest request = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
+		String result = request.getQueryString();
+		result = result == null ? "" : "?" + result;
+		return result;
+	}
+
+	static public String getQueryString(List<String> exclude) {
+		String result = "";
+		HttpServletRequest request = (HttpServletRequest) Executions.getCurrent().getNativeRequest();
+		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))
+					continue;
+				if (sb.length() == 0)
+					sb.append("?");
+				if (sb.length() > 1)
+					sb.append("&");
+				sb.append(key);
+				sb.append("=");
+				sb.append(parameters.get(key)[0]);
+			}
+			result = sb.toString();
+		}
+		return result;
+	}
+
 	static public UserPrincipal getUserPrincipal() {
 		return (UserPrincipal) getAttribute(USERPRINCIPAL);
 	}
@@ -136,13 +173,17 @@ public class SessionUtil {
 	}
 
 	@SuppressWarnings("unchecked")
-	static public void pushHistory(String action, String query, boolean useQueryString) {
+	static public void pushHistory(String action, String query) {
 		List<BasicDBObject> history = (List<BasicDBObject>) getAttribute(HISTORY);
 		if (history == null)
 			history = new ArrayList<>();
 
 		setAttribute(HISTORY, history);
-		history.add(new BasicDBObject("action", action).append("query", query).append("useQueryString", useQueryString));
+		history.add(new BasicDBObject("action", action).append("query", query));
+	}
+
+	static public void redirect(String path) {
+		Executions.sendRedirect(path + getQueryString());
 	}
 
 	static public void registerJobChangedListener(IJobChangedListener listener) {
@@ -162,4 +203,5 @@ public class SessionUtil {
 		if (session != null)
 			session.setAttribute(name, obj);
 	}
+
 }
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SubmitterAuthInitiator.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SubmitterAuthInitiator.java
index e1aeffaa..aadb6a31 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SubmitterAuthInitiator.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SubmitterAuthInitiator.java
@@ -5,17 +5,15 @@ import java.util.Map;
 import org.zkoss.zk.ui.Page;
 import org.zkoss.zk.ui.util.Initiator;
 
-import user.jobengine.zk.model.IndexModel;
-
 public class SubmitterAuthInitiator implements Initiator {
 
 	@Override
 	public void doInit(Page page, Map<String, Object> args) throws Exception {
 		if (!SessionUtil.isAuthenticated())
-			IndexModel.redirect("/pages/login.jsp");
+			SessionUtil.redirect("/pages/login.zul");
 
 		if (!SessionUtil.isSubmitter())
-			IndexModel.redirect("/pages/access-denied.zul");
+			SessionUtil.redirect("/pages/access-denied.zul");
 	}
 
 }
\ No newline at end of file
-- 
2.54.0