Changeset 4927 for branches/2.11-stable

Timestamp:

May 13, 2009, 11:22:41 AM (14 years ago)

Author:

Martin Svensson

Message:

Fixes #1307 File view fails if a file name contains non-ascii characters

Location:

branches/2.11-stable

Files:

• src/core/net/sf/basedb/core/Path.java (modified) (2 diffs)
• www/filemanager/files/index.jsp (modified) (1 diff)
• www/filemanager/index.jsp (modified) (1 diff)

branches/2.11-stable/src/core/net/sf/basedb/core/Path.java

@@ -23 +23 @@
 package net.sf.basedb.core;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.regex.Pattern;
 
@@ -283 +285 @@
     return sb.toString();
   }
+  
+  /**
+    Get this Path's URL-string encoded with a given 
+    character encoding.
+    
+    @param enc The encoding to use. UTF-8 is used is this is null.
+    @return The encoded URL-string.
+      @throws UnsupportedEncodingException If the give encoding is not supported
+      @since 2.11.1
+   */
+  public String toURLString(String enc) 
+    throws UnsupportedEncodingException
+  {
+    StringBuilder sb = new StringBuilder();
+    enc = (enc == null || enc.length() == 0) ? "UTF-8" : enc;
+    if (userlogin != null)
+    {
+      sb.append("~").append(URLEncoder.encode(userlogin, enc));
+    }
+    for (String directory : directories)
+    {
+      sb.append("/").append(URLEncoder.encode(directory, enc));
+    }
+    if (filename != null && getType() == Type.FILE)
+    {
+      sb.append("/").append(URLEncoder.encode(filename, enc));
+    }
+    if (sb.length() == 0) sb.append("/"); // For the root directory
+    return sb.toString();
+  }
 
   /**

branches/2.11-stable/www/filemanager/files/index.jsp

@@ -465 +465 @@
     dc = sc.newDbControl();
     File f = File.getById(dc, cc.getId());
-    redirect = root + "filemanager/files/view/-"+ID+"-"+HTML.urlEncode(f.getPath().toString());
+    redirect = root + "filemanager/files/view/-"+ID+"-"+ f.getPath().toURLString("UTF-8");
     dc.close();
   }

branches/2.11-stable/www/filemanager/index.jsp

@@ -89 +89 @@
     dc = sc.newDbControl();
     File f = File.getById(dc, cc.getId());
-    redirect = root + "filemanager/files/view/-"+ID+"-"+HTML.urlEncode(f.getPath().toString());
+    redirect = root + "filemanager/files/view/-"+ID+"-"+ f.getPath().toURLString("UTF-8");
     dc.close();
   }