Changeset 7723

Timestamp:

Jun 4, 2019, 1:58:03 PM (4 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2179: HTTP Status 400 - Bad request when logging in

Should be fixed now. There was an existing method that was already used when using the "view file" function. For some reason the "download file" function was not using the same.

File:

• branches/3.15-stable/www/filemanager/files/download_file.jsp (modified) (4 diffs)

branches/3.15-stable/www/filemanager/files/download_file.jsp

@@ -31 +31 @@
   import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.File"
+  import="net.sf.basedb.core.Path"
   import="net.sf.basedb.core.Location"
   import="net.sf.basedb.core.User"
@@ -61 +62 @@
 {
   File file = File.getById(dc, itemId);
-  String path = file.getPath().toString();
+  Path path = file.getPath();
   String title = "Download " + path;
   
@@ -70 +71 @@
   }
   
-  String downloadUrl = root + "filemanager/files/download/-"+ID+"-"+HTML.urlEncode(path);
+  String downloadUrl = root + "filemanager/files/download/-"+ID+"-"+path.toURLString("UTF-8");
   %>
   <base:page type="popup" title="<%=title%>">
@@ -85 +86 @@
       <tr>
         <th>File</th>
-        <td><a href="<%=downloadUrl%>"><%=HTML.encodeTags(path)%></a></td>
+        <td><a href="<%=downloadUrl%>"><%=HTML.encodeTags(path.toString())%></a></td>
       </tr>
       <tr>