svn commit: [jahia] r18466 - in /trunk/core/src/java/org/jahia/params: ParamBean.java ProcessingContext.java

[tdraier]

Author: tdraier
Date: Fri Sep 14 13:04:03 2007
New Revision: 18466

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18466&repname=
=3Djahia
Log:
fixed parambean construction when access is denied to the page (port 18265)

Modified:
    trunk/core/src/java/org/jahia/params/ParamBean.java
    trunk/core/src/java/org/jahia/params/ProcessingContext.java

Modified: trunk/core/src/java/org/jahia/params/ParamBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ParamBean.java&rev=3D18466&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/params/ParamBean.java (original)
+++ trunk/core/src/java/org/jahia/params/ParamBean.java Fri Sep 14 13:04:03=
 2007
@@ -105,6 +105,7 @@
 import org.apache.log4j.Logger;
 import org.apache.struts.Globals;
 import org.jahia.bin.Jahia;
+import org.jahia.engines.login.Login_Engine;
 import org.jahia.exceptions.*;
 import org.jahia.security.license.LicenseActionChecker;
 import org.jahia.services.applications.ServletIncludeRequestWrapper;
@@ -430,6 +431,9 @@
 =

             processActivationAction();
 =

+            if(contentPage!=3Dnull && getPage()=3D=3Dnull && !getEngine().=
equals(Login_Engine.ENGINE_NAME)) {
+                throw new JahiaForbiddenAccessException();
+            }
             //////////////////////////////////////////////////////////////=
/////////////////////////
             // FIXME -Fulco-
             //

Modified: trunk/core/src/java/org/jahia/params/ProcessingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ProcessingContext.java&rev=3D18466&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/params/ProcessingContext.java (original)
+++ trunk/core/src/java/org/jahia/params/ProcessingContext.java Fri Sep 14 =
13:04:03 2007
@@ -3082,6 +3082,9 @@
 =

     protected void resolveJahiaPage() throws JahiaException {
         if (getContentPage() !=3D null) {
+            if(getPage()=3D=3Dnull && !getEngine().equals(Login_Engine.ENG=
INE_NAME)) {
+                throw new JahiaForbiddenAccessException();
+            }
             setThePage(getContentPage().getPage(getEntryLoadRequest(),
                     getOperationMode(), getUser()));
         }
@@ -3168,6 +3171,11 @@
             setContentPage(getSite().getHomeContentPage());
         }
 =

+        if(contentPage!=3Dnull && getPage()=3D=3Dnull && !getEngine().equa=
ls(Login_Engine.ENGINE_NAME)) {
+            throw new JahiaForbiddenAccessException();
+        }
+        if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(pageI=
D);
+
         // last requested page
         Integer lrpID =3D (Integer) getSessionState().getAttribute(
                 SESSION_LAST_REQUESTED_PAGE_ID);

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list