From cbd464ad0a16ae39abb5139723106bd0702c52c0 Mon Sep 17 00:00:00 2001
From: sshakndr <aleksandr.kondratyev@onlyoffice.com>
Date: Mon, 17 Mar 2025 13:34:26 +0700
Subject: [PATCH] fix(php): correct download name of converted file. Fix Bug
 73522

---
 web/documentserver-example/php/assets/js/jscript.js |  3 +--
 web/documentserver-example/php/src/ajax.php         |  3 ++-
 web/documentserver-example/php/src/functions.php    | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/web/documentserver-example/php/assets/js/jscript.js b/web/documentserver-example/php/assets/js/jscript.js
index dae4fdc8..654dddc2 100644
--- a/web/documentserver-example/php/assets/js/jscript.js
+++ b/web/documentserver-example/php/assets/js/jscript.js
@@ -436,8 +436,7 @@ if (typeof jQuery != "undefined") {
                             jq("#beginViewConverted").removeClass("disable");
                             jq("#downloadConverted").attr("data","fromStorage");
                         } else {
-                            let newFilename = fileName.split('.').slice(0,-1).join('.')
-                            jq("#hiddenFileName").attr("data",response.filename.split("&filename=download").join(`&filename=${newFilename}`));
+                            jq("#hiddenFileName").attr("data",response.filename);
                             jq("#downloadConverted").attr("data","fromConverter");
                         }
                         jq("td[name='convertingTypeButton']").removeClass("disable orange");
diff --git a/web/documentserver-example/php/src/ajax.php b/web/documentserver-example/php/src/ajax.php
index 5ddb351d..116bf0e3 100644
--- a/web/documentserver-example/php/src/ajax.php
+++ b/web/documentserver-example/php/src/ajax.php
@@ -252,7 +252,8 @@ function convert()
                 true,
                 $newFileUri,
                 $filePass,
-                $lang
+                $lang,
+                $fileName
             );
         } catch (Exception $e) {
             $result["error"] = "error: " . $e->getMessage();
diff --git a/web/documentserver-example/php/src/functions.php b/web/documentserver-example/php/src/functions.php
index 210471b7..1f1b78cd 100644
--- a/web/documentserver-example/php/src/functions.php
+++ b/web/documentserver-example/php/src/functions.php
@@ -659,7 +659,8 @@ function sendRequestToConvertService(
     $documentRevisionID,
     $async,
     $filePass,
-    $lang
+    $lang,
+    $fileName = null
 ) {
     $configManager = new ConfigurationManager();
 
@@ -669,7 +670,7 @@ function sendRequestToConvertService(
     }
 
     // if title is undefined, then replace it with a random guid
-    $title = basename($documentURL);
+    $title = $fileName ?? basename($documentURL);
     if (empty($title)) {
         $title = guid();
     }
@@ -758,7 +759,8 @@ function getConvertedData(
     $async,
     &$convertedDocumentURL,
     $filePass,
-    $lang
+    $lang,
+    $fileName = null
 ) {
     $convertedDocumentURL = "";
     $responceFromConvertService = sendRequestToConvertService(
@@ -768,7 +770,8 @@ function getConvertedData(
         $documentRevisionID,
         $async,
         $filePass,
-        $lang
+        $lang,
+        $fileName
     );
     $json = json_decode($responceFromConvertService, true);