From 5fa45757a497bf26b434d90b3fbd065ac9e2d53e Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 11 Mar 2009 03:22:35 +0000
Subject: [PATCH] Merged V3.1 to HEAD    12999: Fixed read-only bootstrap of
 SiteAVMBootstrap and removed incorrect use of 'assert'    13000: Added log4j
 to Eclipse classpath (unexported)    13001: Merged V2.1-A to V3.1       9127:
 Performance improvement to folder copy       9151: *RECORD-ONLY* Fix index
 back up failing with missing files    13002: Merged V2.1-A to V3.1      
 9174: Further fixes for ACT-2588 (Lucene backup read-write locks)       9279:
 Fix ADB-84. PHP module is not restricted by the upper version       10191:
 Fix for ADB-77: Need to have as the sender's email address the email address
 of the user triggering the rule    13006: Merged V2.1-A to V3.1       10893:
 Fixes for ADB-78 & ADB-98              - Fixed service getter/setter pattern
 as well       10903: Fix for ADB-115 ACT-4355    13010: Made
 AVMLockingBootstrap resilient to read-only mode    13011: Better message for
 InvalidStoreRefException    13013: Merged V2.1-A to V3.1       9189:
 Composite Conditions Support Part 1 of 2 (repo)       9190: Composite
 Conditions Support Part 1a of 2 ( missed file from repo)    13015: Port of
 Adobe CIFS/FTP configuration changes    13017: Convert avoids folders given
 by '--svn-status' option    13018: Merge V2.1A to V3.1       7746:
 (record-only) Added ability to specify a custom CIFS authenticator class     
  8533: (record-only) Added the <disableNativeCode/> configuration tag,
 disable use of JNI code on Windows       8700: (record-only) Update to
 prevent any native calls via configuration code       8705: (record-only)
 Filer out the '0.0.0.0' bind address       8864: (record-only) Added the
 getBean() method for custom authenticators to get access to beans       9054:
 (record-only) Added the 'AIX' platform type for use in the platforms="..."
 attribute       8863: (record-only) Fix passthru socket connection timeout,
 added 'protocolOrder' and 'offlineCheckInterval' config values       12144:
 (record-only) CIFS virtual circuit fixes    13020: Merged V2.1-A to V3.1
 (Composite Actions)       9191: Composite Conditions Support Part 2 of 2
 (client)       9243: Composite Conditions Support Part 1 of 2 (client)      
 9245: Composite Conditions Support Part 2 of 2 (repo)    13021: Merged V3.0
 to V3.1       13008: Merged V2.2 to V3.0          12824: (record only) Change
 admin access to the web project staging store to be read-only in the
 virtualization view - ETWOTWO-933    13024: Ported CIFS configuration changes
 from Adobe V2.1A, missed checkin.   
 ___________________________________________________________________   
 Modified: svn:mergeinfo       Merged
 /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
       Merged
 /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/webdav/GetMethod.java   | 25 ++++++++++---------
 .../alfresco/repo/webdav/WebDAVHelper.java    | 10 --------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/source/java/org/alfresco/repo/webdav/GetMethod.java b/source/java/org/alfresco/repo/webdav/GetMethod.java
index 1b970781a3..903199cb13 100644
--- a/source/java/org/alfresco/repo/webdav/GetMethod.java
+++ b/source/java/org/alfresco/repo/webdav/GetMethod.java
@@ -181,8 +181,9 @@ public class GetMethod extends WebDAVMethod
                 // it is a folder and no content is required
                 throw new WebDAVServerException(HttpServletResponse.SC_BAD_REQUEST);
             }
+            
             // Generate a folder listing
-            m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, "text/html");
+            m_response.setContentType("text/html;charset=UTF-8");
             generateDirectoryListing(nodeInfo);
         }
         else
@@ -326,7 +327,7 @@ public class GetMethod extends WebDAVMethod
 
             // Send back the start of the HTML
             writer.write("<html><head><title>");
-            writer.write(I18NUtil.getMessage("webdav.repository_title"));
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.repository_title")));
             writer.write("</title>");
             writer.write("<style>");
             writer.write("body { font-family: Arial, Helvetica; font-size: 12pt; background-color: white; }\n");
@@ -345,7 +346,7 @@ public class GetMethod extends WebDAVMethod
             writer.write("<body>\n");
             writer.write("<table cellspacing='2' cellpadding='3' border='0' width='100%'>\n");
             writer.write("<tr><td colspan='4' class='textLocation'>");
-            writer.write(I18NUtil.getMessage("webdav.directory_listing"));
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.directory_listing")));
             writer.write(' ');
             writer.write(WebDAVHelper.encodeHTML(getPath()));
             writer.write("</td></tr>\n");
@@ -353,16 +354,16 @@ public class GetMethod extends WebDAVMethod
 
             writer.write("<table cellspacing='2' cellpadding='3' border='0' width='100%' class='listingTable'>\n");
             writer.write("<tr><td class='tableHeading' width='*'>");
-            writer.write(I18NUtil.getMessage("webdav.column.name"));
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.name")));
             writer.write("</td>");
             writer.write("<td class='tableHeading' width='10%'>");
-            writer.write(I18NUtil.getMessage("webdav.column.size"));
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.size")));
             writer.write("</td>");
             writer.write("<td class='tableHeading' width='20%'>");
-            writer.write(I18NUtil.getMessage("webdav.column.type"));
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.type")));
             writer.write("</td>");
             writer.write("<td class='tableHeading' width='25%'>");
-            writer.write(I18NUtil.getMessage("webdav.column.modifieddate"));
+            writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.modifieddate")));
             writer.write("</td>");
             writer.write("</tr>\n");
 
@@ -385,7 +386,7 @@ public class GetMethod extends WebDAVMethod
 
                 writer.write("\">");
                 writer.write("[");
-                writer.write(I18NUtil.getMessage("webdav.column.navigate_up"));
+                writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.column.navigate_up")));
                 writer.write("]</a>");
                 writer.write("</tr>\n");
             }
@@ -482,7 +483,7 @@ public class GetMethod extends WebDAVMethod
                 try
                 {
                     writer.write("</table><table><tr><td style='color:red'>");
-                    writer.write(I18NUtil.getMessage("webdav.err.dir"));
+                    writer.write(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.err.dir")));
                     writer.write("</td></tr></table></body></html>");
                     writer.flush();
                 }
@@ -506,7 +507,7 @@ public class GetMethod extends WebDAVMethod
         int length = strSize.length();
         if (length < 4)
         {
-            strFormattedSize = strSize + ' ' + I18NUtil.getMessage("webdav.size.bytes");
+            strFormattedSize = strSize + ' ' + WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.size.bytes"));
         }
         else if (length >= 4 && length < 7)
         {
@@ -519,7 +520,7 @@ public class GetMethod extends WebDAVMethod
                 buffer.append('.');
                 buffer.append(strRight);
             }
-            buffer.append(' ').append(I18NUtil.getMessage("webdav.size.kilobytes"));
+            buffer.append(' ').append(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.size.kilobytes")));
 
             strFormattedSize = buffer.toString();
         }
@@ -534,7 +535,7 @@ public class GetMethod extends WebDAVMethod
                 buffer.append('.');
                 buffer.append(strRight);
             }
-            buffer.append(' ').append(I18NUtil.getMessage("webdav.size.megabytes"));
+            buffer.append(' ').append(WebDAVHelper.encodeHTML(I18NUtil.getMessage("webdav.size.megabytes")));
 
             strFormattedSize = buffer.toString();
         }
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
index ac2ea685f8..e2d9ee25b1 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
@@ -466,17 +466,7 @@ public class WebDAVHelper
                 case '<': enc = "&lt;"; break;      //<
                 case '>': enc = "&gt;"; break;      //>
                 
-                //german umlauts
-                case '\u00E4' : enc = "&auml;";  break;
-                case '\u00C4' : enc = "&Auml;";  break;
-                case '\u00F6' : enc = "&ouml;";  break;
-                case '\u00D6' : enc = "&Ouml;";  break;
-                case '\u00FC' : enc = "&uuml;";  break;
-                case '\u00DC' : enc = "&Uuml;";  break;
-                case '\u00DF' : enc = "&szlig;"; break;
-                
                 //misc
-                //case 0x80: enc = "&euro;"; break;  sometimes euro symbol is ascii 128, should we suport it?
                 case '\u20AC': enc = "&euro;";  break;
                 case '\u00AB': enc = "&laquo;"; break;
                 case '\u00BB': enc = "&raquo;"; break;