Author: sshyrkov
Date: Sun Jan 13 18:09:30 2008
New Revision: 19495
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19495&repname=
=3Djahia
Log:
[trunk 19381-19400]: 1) fixed method getAllPagesInfosForWrite ( LEGRIS-1 ) =
- really get all pages infos, for all languages
2) Fix the non-breaking space issues in when updating ACLs even in case UTF=
-8 is used (discovered during Tria support days)
3) fixed auto-delogging when logging in, correctly checks guest user when s=
witching site, always try to get logout page if available
4) Reduce the log level from WARN to DEBUG in case we are performing a reco=
nnect (recreating directory context)
5) Escape the forward slash. Discovered during Tria support. The organizati=
onal unit (for users) had a forward slash in its name
6) JAHIA-2338: Sp3: unexisting pid do redirect the user to the home page in=
stead of generating a 404
http://www.jahia.net/jira/browse/JAHIA-2338
Resolution: do not set the page to home page in case of a wrong page URL key
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/logou=
t/Logout_Engine.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/right=
s/ManageRights.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/ParamB=
ean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/Proces=
singContext.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroupManagerLDAPProvider.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaUserManagerLDAPProvider.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines=
/logout/Logout_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/engines/logout/Logout_Engine.java&rev=
=3D19495&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/logou=
t/Logout_Engine.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/logou=
t/Logout_Engine.java Sun Jan 13 18:09:30 2008
@@ -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: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines=
/rights/ManageRights.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/engines/rights/ManageRights.java&rev=
=3D19495&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/right=
s/ManageRights.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/right=
s/ManageRights.java Sun Jan 13 18:09:30 2008
@@ -548,9 +548,7 @@
final boolean isUser; // Only used for clearer log messages
=
// Very nice way to kill weird non breaking space when non-utf8
- if (!Jahia.getSettings().isUtf8Encoding()) {
- aclEntry =3D JahiaTools.replacePattern(aclEntry, "\u00C2\u=
00A0", " ");
- }
+ aclEntry =3D JahiaTools.replacePattern(aclEntry, "\u00C2\u00A0=
", " ");
=
if (logger.isDebugEnabled()) logger.debug("Submited ACL entry =
: " + aclEntry);
int typeOffs =3D getVKey(userNameWidth) - 1;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/=
ParamBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/params/ParamBean.java&rev=3D19495&repn=
ame=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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/ParamB=
ean.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/ParamB=
ean.java Sun Jan 13 18:09:30 2008
@@ -135,6 +135,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;
@@ -412,13 +413,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: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/=
ProcessingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D19=
495&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/Proces=
singContext.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/Proces=
singContext.java Sun Jan 13 18:09:30 2008
@@ -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();
@@ -1329,9 +1326,10 @@
}
if (pageID > 0) {
setContentPage(ContentPage.getPage(pageID));
- } else {
- setContentPage(getSite().getHomeContentPage());
}
+// else {
+// setContentPage(getSite().getHomeContentPage());
+// }
}
=
protected void setSiteInfoFromSiteFound() {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/pages/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java&rev=3D=
19495&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java Sun Jan 13 18:09:30 2008
@@ -2382,13 +2382,13 @@
*/
private Vector getAllPageInfosForWrite(EntryLoadRequest loadRequest) {
Set languageCodes =3D new HashSet();
- String languageCode;
- if (loadRequest !=3D null) {
- Locale firstLocale =3D loadRequest.getFirstLocale(true);
- if (firstLocale !=3D null) {
- languageCode =3D firstLocale.toString();
- languageCodes.add(languageCode);
+ try {
+ List l =3D getSite().getLanguageSettingsAsLocales(true);
+ for (Iterator iterator =3D l.iterator(); iterator.hasNext();) {
+ Locale locale =3D (Locale) iterator.next();
+ languageCodes.add(locale.toString());
}
+ } catch (JahiaException e) {
}
return getAllPageInfosForWrite(languageCodes);
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/JahiaGroupManagerLDAPProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaGroupManager=
LDAPProvider.java&rev=3D19495&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroupManagerLDAPProvider.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaGroupManagerLDAPProvider.java Sun Jan 13 18:09:30 2008
@@ -992,19 +992,19 @@
filterString.toString (),
searchCtl);
} catch (NoInitialContextException nice) {
- logger.warn("Reconnection required", nice);
+ logger.debug("Reconnection required", nice);
return getGroups(getPublicContext(true), searchCtl, filterStri=
ng);
} catch (CannotProceedException cpe) {
- logger.warn("Reconnection required", cpe);
+ logger.debug("Reconnection required", cpe);
return getGroups(getPublicContext(true), searchCtl, filterStri=
ng);
} catch (ServiceUnavailableException sue) {
- logger.warn("Reconnection required", sue);
+ logger.debug("Reconnection required", sue);
return getGroups(getPublicContext(true), searchCtl, filterStri=
ng);
} catch (TimeLimitExceededException tlee) {
- logger.warn("Reconnection required", tlee);
+ logger.debug("Reconnection required", tlee);
return getGroups(getPublicContext(true), searchCtl, filterStri=
ng);
} catch (CommunicationException ce) {
- logger.warn("Reconnection required", ce);
+ logger.debug("Reconnection required", ce);
return getGroups(getPublicContext(true), searchCtl, filterStri=
ng);
}
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/usermanager/JahiaUserManagerLDAPProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/usermanager/JahiaUserManagerL=
DAPProvider.java&rev=3D19495&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaUserManagerLDAPProvider.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/user=
manager/JahiaUserManagerLDAPProvider.java Sun Jan 13 18:09:30 2008
@@ -667,19 +667,19 @@
filterString.toString (),
searchCtl);
} catch (javax.naming.NoInitialContextException nice) {
- logger.warn("Reconnection required", nice);
+ logger.debug("Reconnection required", nice);
return getUsers(getPublicContext(true), filterString, searchBa=
se, scope);
} catch (javax.naming.CannotProceedException cpe) {
- logger.warn("Reconnection required", cpe);
+ logger.debug("Reconnection required", cpe);
return getUsers(getPublicContext(true), filterString, searchBa=
se, scope);
} catch (javax.naming.ServiceUnavailableException sue) {
- logger.warn("Reconnection required", sue);
+ logger.debug("Reconnection required", sue);
return getUsers(getPublicContext(true), filterString, searchBa=
se, scope);
} catch (javax.naming.TimeLimitExceededException tlee) {
- logger.warn("Reconnection required", tlee);
+ logger.debug("Reconnection required", tlee);
return getUsers(getPublicContext(true), filterString, searchBa=
se, scope);
} catch (javax.naming.CommunicationException ce) {
- logger.warn("Reconnection required", ce);
+ logger.debug("Reconnection required", ce);
return getUsers(getPublicContext(true), filterString, searchBa=
se, scope);
}
}
@@ -938,21 +938,24 @@
private Attributes getUser (DirContext ctx, String dn)
throws NamingException {
try {
+ if (dn !=3D null && dn.indexOf('/') !=3D -1) {
+ dn =3D JahiaTools.replacePattern(dn, "/", "\\/");
+ }
return ctx.getAttributes(dn);
} catch (javax.naming.NoInitialContextException nice) {
- logger.warn("Reconnection required", nice);
+ logger.debug("Reconnection required", nice);
return getUser(getPublicContext(true), dn);
} catch (javax.naming.CannotProceedException cpe) {
- logger.warn("Reconnection required", cpe);
+ logger.debug("Reconnection required", cpe);
return getUser(getPublicContext(true), dn);
} catch (javax.naming.ServiceUnavailableException sue) {
- logger.warn("Reconnection required", sue);
+ logger.debug("Reconnection required", sue);
return getUser(getPublicContext(true), dn);
} catch (javax.naming.TimeLimitExceededException tlee) {
- logger.warn("Reconnection required", tlee);
+ logger.debug("Reconnection required", tlee);
return getUser(getPublicContext(true), dn);
} catch (javax.naming.CommunicationException ce) {
- logger.warn("Reconnection required", ce);
+ logger.debug("Reconnection required", ce);
return getUser(getPublicContext(true), dn);
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
