From c0f47f892bc2d305b117d0cf5d32acb10a32a1cd Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 25 Jan 2017 14:34:57 +0300
Subject: [PATCH] nodejs: using method getServerUrl

---
 web/documentserver-example/nodejs/app.js                | 2 +-
 web/documentserver-example/nodejs/helpers/docManager.js | 4 ++--
 web/documentserver-example/nodejs/views/editor.ejs      | 2 +-
 web/documentserver-example/php/functions.php            | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js
index f2cc48f3..a36ff796 100644
--- a/web/documentserver-example/nodejs/app.js
+++ b/web/documentserver-example/nodejs/app.js
@@ -412,7 +412,7 @@ app.get("/editor", function (req, res) {
         if (fileExt != null) {
             var fileName = docManager.createDemo((req.query.sample ? "sample." : "new.") + fileExt, userid, name);
 
-            var redirectPath = docManager.getProtocol() + "://" + docManager.req.get("host") + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams();
+            var redirectPath = docManager.getServerUrl() + "/editor?fileName=" + encodeURIComponent(fileName) + docManager.getCustomParams();
             res.redirect(redirectPath);
             return;
         }
diff --git a/web/documentserver-example/nodejs/helpers/docManager.js b/web/documentserver-example/nodejs/helpers/docManager.js
index 8e0cae14..dfbc1766 100644
--- a/web/documentserver-example/nodejs/helpers/docManager.js
+++ b/web/documentserver-example/nodejs/helpers/docManager.js
@@ -152,7 +152,7 @@ docManager.getFileUri = function (fileName) {
 };
 
 docManager.getlocalFileUri = function (fileName, version) {
-    var serverPath = docManager.getProtocol() + "://" + docManager.req.get("host");
+    var serverPath = docManager.getServerUrl();
     var storagePath = storageFolder.length ? storageFolder + "/" : "";
     var hostAddress = docManager.curUserHostAddress();
     var url = serverPath + "/" + storagePath + hostAddress + "/" + encodeURIComponent(fileName);
@@ -167,7 +167,7 @@ docManager.getServerUrl = function () {
 };
 
 docManager.getCallback = function (fileName) {
-    var server = docManager.getProtocol() + "://" + docManager.req.get("host");
+    var server = docManager.getServerUrl();
     var hostAddress = docManager.curUserHostAddress();
     var handler = "/track?useraddress=" + encodeURIComponent(hostAddress) + "&filename=" + encodeURIComponent(fileName);
 
diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs
index 8e506b9b..361a4790 100644
--- a/web/documentserver-example/nodejs/views/editor.ejs
+++ b/web/documentserver-example/nodejs/views/editor.ejs
@@ -138,7 +138,7 @@
                             comments: true,
                             feedback: true,
                             goback: {
-                                url: ("<%= editor.type %>" == "embedded" ? null : "<%= editor.getServerUrl %>")
+                                url: "<%= editor.getServerUrl %>"
                             }
                         },
                         fileChoiceUrl: "<%= editor.fileChoiceUrl %>",
diff --git a/web/documentserver-example/php/functions.php b/web/documentserver-example/php/functions.php
index 687d04b9..cf6f7617 100644
--- a/web/documentserver-example/php/functions.php
+++ b/web/documentserver-example/php/functions.php
@@ -249,8 +249,8 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
     if (!function_exists('simplexml_load_file')){
          throw new Exception("Server can't read xml");
     }
-    $data = simplexml_load_string($response_xml_data);
-    if (!$data) {
+    $response_data = simplexml_load_string($response_xml_data);
+    if (!$response_data) {
         $exc = "Bad Response. Errors: ";
         foreach(libxml_get_errors() as $error) {
             $exc = $exc . "\t" . $error->message;
@@ -258,7 +258,7 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi
         throw new Exception ($exc);
     }
 
-    return $data;
+    return $response_data;
 }