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

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 2d599fbd5938b8518b30efbe1682e53e52fcbc84..8350e8d8d877ec9d487e491a30656e2e1f64f51c 100644 (file)
--- 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
@@ -2,19 +2,20 @@ package user.jobengine.zk.util;
 \r
 import java.util.Map;\r
 \r
-import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.Page;\r
 import org.zkoss.zk.ui.util.Initiator;\r
 \r
+import user.jobengine.zk.model.IndexModel;\r
+\r
 public class AdminAuthInitiator implements Initiator {\r
 \r
        @Override\r
        public void doInit(Page page, Map<String, Object> args) throws Exception {\r
                if (!SessionUtil.isAuthenticated())\r
-                       Executions.sendRedirect("/pages/login.jsp");\r
+                       IndexModel.redirect("/pages/login.jsp");\r
 \r
                if (!SessionUtil.isAdmin())\r
-                       Executions.sendRedirect("/");\r
+                       IndexModel.redirect("/pages/access-denied.zul");\r
        }\r
 \r
 }
\ 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 dad1518aa9ba7e867e809c6896b3e61527d7d88c..e0219ff8f4c26b48d23c484030e3dc1b4ffbbf20 100644 (file)
--- 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
@@ -2,10 +2,11 @@ package user.jobengine.zk.util;
 \r
 import java.util.Map;\r
 \r
-import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.Page;\r
 import org.zkoss.zk.ui.util.Initiator;\r
 \r
+import user.jobengine.zk.model.IndexModel;\r
+\r
 /**\r
  * Ellenorzi, hogy van e beloginelt user, ha nincs, akkor -> login.zul Minden oldal belinkeli ezt az ellenorzest.\r
  */\r
@@ -13,7 +14,7 @@ public class AuthInitiator implements Initiator {
        @Override\r
        public void doInit(Page page, Map<String, Object> args) throws Exception {\r
                if (!SessionUtil.isAuthenticated())\r
-                       Executions.sendRedirect("/pages/login.jsp");\r
+                       IndexModel.redirect("/pages/login.jsp");\r
        }\r
 \r
 }
\ 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 5ab217346f57b20c74760368576e926acfe3b831..8c713091698dac984e7698ca42de31d22d2f506f 100644 (file)
--- 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
@@ -2,6 +2,8 @@ package user.jobengine.zk.util;
 \r
 import java.io.FileInputStream;\r
 import java.io.InputStream;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
 import java.util.Properties;\r
 \r
 import javax.servlet.http.HttpSession;\r
@@ -11,6 +13,8 @@ import org.apache.logging.log4j.Logger;
 import org.zkoss.zk.ui.Session;\r
 import org.zkoss.zk.ui.Sessions;\r
 \r
+import com.ibm.nosql.json.api.BasicDBObject;\r
+\r
 import user.jobengine.server.IJobChangedListener;\r
 import user.jobengine.server.JobEngine;\r
 \r
@@ -21,6 +25,7 @@ public class SessionUtil {
        private static final String AUTH_LOCATION = "mediacube.auth.location";\r
        public static final String JOBLISTENER = "joblistener";\r
        public static final String MENUMODEL = "menuModel";\r
+       public static final String HISTORY = "hitory";\r
 \r
        public static boolean authenticate(String account, String password) {\r
                Properties cfg = getConfiguration();\r
@@ -105,7 +110,37 @@ public class SessionUtil {
        }\r
 \r
        public static void logout() {\r
-               setAttribute(SessionUtil.USERPRINCIPAL, null);\r
+               setAttribute(USERPRINCIPAL, null);\r
+               setAttribute(HISTORY, null);\r
+               cleanup();\r
+       }\r
+\r
+       @SuppressWarnings("unchecked")\r
+       static public BasicDBObject popHistory() {\r
+               List<BasicDBObject> history = (List<BasicDBObject>) getAttribute(HISTORY);\r
+               if (history == null)\r
+                       return null;\r
+\r
+               BasicDBObject result = null;\r
+               if (history.size() > 0) {\r
+                       history.remove(history.size() - 1);\r
+                       if (history.size() > 0) {\r
+                               result = history.get(history.size() - 1);\r
+                               history.remove(history.size() - 1);\r
+                       }\r
+               }\r
+\r
+               return result;\r
+       }\r
+\r
+       @SuppressWarnings("unchecked")\r
+       static public void pushHistory(String action, String query, boolean useQueryString) {\r
+               List<BasicDBObject> history = (List<BasicDBObject>) getAttribute(HISTORY);\r
+               if (history == null)\r
+                       history = new ArrayList<>();\r
+\r
+               setAttribute(HISTORY, history);\r
+               history.add(new BasicDBObject("action", action).append("query", query).append("useQueryString", useQueryString));\r
        }\r
 \r
        static public void registerJobChangedListener(IJobChangedListener listener) {\r
@@ -125,5 +160,4 @@ public class SessionUtil {
                if (session != null)\r
                        session.setAttribute(name, obj);\r
        }\r
-\r
 }
\ 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 016ee5848af67e99cfabcd6bd499d596c394a005..e1aeffaaa28f1100b9d138a8fa9fd7f954c310ff 100644 (file)
--- 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
@@ -2,19 +2,20 @@ package user.jobengine.zk.util;
 \r
 import java.util.Map;\r
 \r
-import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.Page;\r
 import org.zkoss.zk.ui.util.Initiator;\r
 \r
+import user.jobengine.zk.model.IndexModel;\r
+\r
 public class SubmitterAuthInitiator implements Initiator {\r
 \r
        @Override\r
        public void doInit(Page page, Map<String, Object> args) throws Exception {\r
                if (!SessionUtil.isAuthenticated())\r
-                       Executions.sendRedirect("/pages/login.jsp");\r
+                       IndexModel.redirect("/pages/login.jsp");\r
 \r
                if (!SessionUtil.isSubmitter())\r
-                       Executions.sendRedirect("/");\r
+                       IndexModel.redirect("/pages/access-denied.zul");\r
        }\r
 \r
 }
\ No newline at end of file