php: fix filename in url (178133a292)

web/documentserver-example/nodejs/views/index.ejs

@@ -164,10 +164,8 @@
                                     <% } %>
                                 </td>
                                 <td class="contentCells contentCells-shift contentCells-icon">
-                                    <% if (storedFiles[i].documentType == "text" || storedFiles[i].documentType == "presentation") { %>
                                     <a href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) + params %>" target="_blank">
                                         <img src="images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment" /></a>
-                                    <% } %>
                                 </td>
                                 <% } else { %>
                                     <td class="contentCells contentCells-shift contentCells-icon" colspan="4"></td>

web/documentserver-example/php/common.php

@@ -150,7 +150,7 @@ function getClientIp() {
 function serverPath($forDocumentServer = NULL) {
     return $forDocumentServer && isset($GLOBALS['EXAMPLE_URL']) && $GLOBALS['EXAMPLE_URL'] != ""
         ? $GLOBALS['EXAMPLE_URL']
-        : ('http://' . $_SERVER['HTTP_HOST']);
+        : (getScheme() . '://' . $_SERVER['HTTP_HOST']);
 }
 
 function getCurUserHostAddress($userAddress = NULL) {
@@ -257,7 +257,7 @@ function getVirtualPath($forDocumentServer) {
 }
 
 function FileUri($file_name, $forDocumentServer = NULL) {
-    $uri = getVirtualPath($forDocumentServer) . $file_name;
+    $uri = getVirtualPath($forDocumentServer) . rawurlencode($file_name);
     return $uri;
 }
 

web/documentserver-example/php/index.php

@@ -177,7 +177,7 @@
                                     echo '  <a class="stored-edit '.$storeFile->documentType.'" href="doceditor.php?fileID='.urlencode($storeFile->name).'&user='.$user.'" target="_blank">';
                                     echo '   <span title="'.$storeFile->name.'">'.$storeFile->name.'</span>';
                                     echo '  </a>';
-                                    echo '  <a href="webeditor-ajax.php?type=download&filename='.$storeFile->name.'">';
+                                    echo '  <a href="'.FileUri($storeFile->name).'">';
                                     echo '   <img class="icon-download" src="css/images/download-24.png" alt="Download" title="Download" /></a>';
                                     echo '  </a>';
                                     echo '  <a class="delete-file" data="'.$storeFile->name.'">';

web/documentserver-example/php/webeditor-ajax.php

@@ -61,9 +61,6 @@ if (isset($_GET["type"]) && !empty($_GET["type"])) { //Checks if type value exis
             $response_array = upload();
             $response_array['status'] = isset($response_array['error']) ? 'error' : 'success';
             die (json_encode($response_array));
-        case "download":
-            download();
-            exit;
         case "convert":
             $response_array = convert();
             $response_array['status'] = 'success';
@@ -128,21 +125,6 @@ function upload() {
     return $result;
 }
 
-function download() {
-    $fileName = $_GET["filename"];
-
-    $filePath = getStoragePath($fileName);
-    if (!file_exists($filePath)) {
-        http_response_code(404);
-        return;
-    }
-    header("Content-Length: " . filesize($filePath));
-    header("Content-Type: " . mime_content_type($fileName));
-
-    header("Content-Disposition: attachment; filename=\"".basename($filePath)."\"");
-    readfile($filePath);
-}
-
 function track() {
     sendlog("Track START", "webedior-ajax.log");
     sendlog("_GET params: " . serialize( $_GET ), "webedior-ajax.log");