From bf4349d64d7782a7e7c264f2be8b0ffa4c3645e1 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 10 Sep 2007 12:33:37 +0000 Subject: [PATCH] Merged V2.1 to HEAD 6295, 6296: EHCache patch on 1.3.0 and related classpath fixes 6300: WCM-509 - Usernames with '@' 6301: FacesHelper.makeLegalId() 6302: Portlet fixes to remove hardcoded "Company Home" string 6305: Fix for AWC-1440 - Potential NullPointerException in workflow history 6306: Fix to error message when incorrect parameters are passed to number range constraint git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/FacesHelper.java | 12 ++++-------- .../web/ui/repo/component/UIWorkflowHistory.java | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/FacesHelper.java b/source/java/org/alfresco/web/app/servlet/FacesHelper.java index 1cc7326c42..297525162f 100644 --- a/source/java/org/alfresco/web/app/servlet/FacesHelper.java +++ b/source/java/org/alfresco/web/app/servlet/FacesHelper.java @@ -24,6 +24,8 @@ */ package org.alfresco.web.app.servlet; +import java.util.regex.Pattern; + import javax.faces.FactoryFinder; import javax.faces.component.UIComponent; import javax.faces.component.UIViewRoot; @@ -51,6 +53,7 @@ import org.apache.commons.logging.LogFactory; public final class FacesHelper { private static Log logger = LogFactory.getLog(FacesHelper.class); + private static Pattern FACES_ID_PATTERN = Pattern.compile("[^a-z^A-Z^_]?[^a-z^A-Z^_^-]"); /** * Private constructor @@ -167,14 +170,7 @@ public final class FacesHelper { if (id != null) { - // replace illegal ID characters with an underscore - id = id.replace(':', '_'); - id = id.replace(' ', '_'); - id = id.replace('.', '_'); - id = id.replace('+', '_'); - - // TODO: check all other illegal characters - only allowed dash and underscore - // TODO: use regular expression to do check and replacment of characters + id = FACES_ID_PATTERN.matcher(id).replaceAll("_"); } return id; diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java index 863e60f024..1bddb2d06f 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java +++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java @@ -201,7 +201,7 @@ public class UIWorkflowHistory extends SelfRenderingComponent out.write(""); out.write(Utils.getDateTimeFormat(context).format(createdDate)); out.write(""); - out.write(owner); + out.write(owner == null ? "" : owner); out.write(""); out.write(comment == null ? "" : comment); out.write("");