Author: tdraier
Date: Wed Dec 19 15:37:00 2007
New Revision: 19383
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19383&repname=
=3Djahia
Log:
fixed auto-delogging when logging in, correctly checks guest user when swit=
ching site, always try to get logout page if available
Modified:
trunk/core/src/java/org/jahia/engines/logout/Logout_Engine.java
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/engines/logout/Logout_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/logout/Logout_Engine.java&rev=3D19383&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/engines/logout/Logout_Engine.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/logout/Logout_Engine.java Wed Dec=
19 15:37:00 2007
@@ -173,7 +173,7 @@
// change mode to normal
jParams.setOperationMode(ProcessingContext.NORMAL);
=
- JahiaPage logoutPage =3D null;
+ JahiaPage logoutPage =3D getLogoutPage(jData);
=
// if there is no engineparams, it just means that the engine is s=
till set to
// logout, but in fact the user wants to call "core". This is beca=
use a user
@@ -188,8 +188,6 @@
JahiaEvent theEvent =3D new JahiaEvent(this, jParams, jParams.=
getUser());
servicesRegistry.getJahiaEventService().fireLogout(theEvent);
=
- logoutPage =3D getLogoutPage(jData);
-
// now let's destroy the cookie authentification if there was =
one
// set for this user.
JahiaUser curUser =3D jParams.getUser();
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=3D19383&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 Wed Dec 19 15:37:00=
2007
@@ -111,6 +111,7 @@
import org.jahia.services.pages.ContentPage;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.usermanager.JahiaUser;
+import org.jahia.services.usermanager.JahiaUserManagerService;
import org.jahia.services.version.EntryLoadRequest;
import org.jahia.settings.SettingsBean;
import org.jahia.tools.files.FileUpload;
@@ -400,13 +401,10 @@
}
=
// handle the case where the site has changed
- if (isSiteHasChanged()) {
- // check if the user has access to the page
- if (getContentPage() !=3D null
- && !getContentPage().checkReadAccess(this.getUser(=
))) {
- // switch to guest user
+ if (isSiteHasChanged() &&
+ JahiaUserManagerService.GUEST_USERNAME.equals(getUser(=
).getUsername()) &&
+ getUser().getSiteID() !=3D getSiteID()) {
setUserGuest(this.getSiteID());
- }
}
=
resolveJahiaPage();
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=3D19383&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 Wed Dec 19 =
15:37:00 2007
@@ -467,13 +467,10 @@
}
=
// handle the case where the site has changed
- if (isSiteHasChanged()) {
- // check if the user has access to the page
- if (getContentPage() !=3D null
- && !getContentPage().checkReadAccess(getUser())) {
- // switch to guest user
- setUserGuest(getSiteID());
- }
+ if (isSiteHasChanged() &&
+ JahiaUserManagerService.GUEST_USERNAME.equals(getUser(=
).getUsername()) &&
+ getUser().getSiteID() !=3D getSiteID()) {
+ setUserGuest(this.getSiteID());
}
=
resolveJahiaPage();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
