From 52ce1ce17b735310db1559bc04eb1d707f2f9688 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 17 Jul 2007 14:40:20 +0000 Subject: [PATCH] Fix for AWC-1145 HTTPS support for community logo in PageTag footer. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/ui/repo/tag/PageTag.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java index 5f8241c8b0..40a136f3bb 100644 --- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java +++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java @@ -27,6 +27,7 @@ package org.alfresco.web.ui.repo.tag; import java.io.IOException; import java.io.Writer; +import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.TagSupport; @@ -54,9 +55,10 @@ public class PageTag extends TagSupport * Please ensure you understand the terms of the license before changing the contents of this file. */ + private final static String ALF_LOGO_HTTP = "http://www.alfresco.com/images/alfresco_community_horiz21.gif"; + private final static String ALF_LOGO_HTTPS = "https://www.alfresco.com/images/alfresco_community_horiz21.gif"; private final static String ALF_URL = "http://www.alfresco.com"; - private final static String ALF_LOGO = "http://www.alfresco.com/images/alfresco_community_horiz21.gif"; - private final static String SF_LOGO = "/images/logo/sflogo.php.png"; + private final static String SF_LOGO = "/images/logo/sflogo.php.png"; private final static String ALF_TEXT = "Alfresco Community"; private final static String ALF_COPY = "Supplied free of charge with " + "no support, " + @@ -259,14 +261,15 @@ public class PageTag extends TagSupport { if (alfresco == null) { - String reqPath = ((HttpServletRequest)pageContext.getRequest()).getContextPath(); + HttpServletRequest req = (HttpServletRequest)pageContext.getRequest(); alfresco = "
" + "" + - "" + - "" + + "" +"" + "" + ALF_COPY + "" + + req.getContextPath() + SF_LOGO + "'>" + "
"; }