From 7bb53f0620ad728582d1ba4a3e48f5e8c72947a1 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Fri, 9 Dec 2005 14:18:37 +0000
Subject: [PATCH] Fix to URLEncoder issues with UTF-8 characters for download
 content links and WebDav generated links

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/web/app/servlet/DownloadContentServlet.java | 5 +++--
 source/java/org/alfresco/web/ui/common/Utils.java            | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
index a9aeceb7f0..381ff3edbf 100644
--- a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java
@@ -42,6 +42,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.LoginBean;
+import org.alfresco.web.ui.common.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.context.WebApplicationContext;
@@ -255,7 +256,7 @@ public class DownloadContentServlet extends HttpServlet
                   ref.getStoreRef().getProtocol(),
                   ref.getStoreRef().getIdentifier(),
                   ref.getId(),
-                  URLEncoder.encode(name, "US-ASCII") } );
+                  Utils.replace(URLEncoder.encode(name, "UTF-8"), "+", "%20") } );
       }
       catch (UnsupportedEncodingException uee)
       {
@@ -285,7 +286,7 @@ public class DownloadContentServlet extends HttpServlet
                   ref.getStoreRef().getProtocol(),
                   ref.getStoreRef().getIdentifier(),
                   ref.getId(),
-                  URLEncoder.encode(name, "US-ASCII") } );
+                  Utils.replace(URLEncoder.encode(name, "UTF-8"), "+", "%20") } );
       }
       catch (UnsupportedEncodingException uee)
       {
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index eb11553ecc..a1d6753c56 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -17,6 +17,7 @@
 package org.alfresco.web.ui.common;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -511,7 +512,7 @@ public final class Utils
                   path.append("/").append(paths.get(x).getName());
                }
                
-               url = path.toString();
+               url = Utils.replace(URLEncoder.encode(path.toString(), "UTF-8"), "+", "%20");
             }
             catch (Exception e)
             {