Merge pull request #99 from ONLYOFFICE/developv1.1.4

Release/1.1.4

60 files changed, 304 insertions, 268 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23fb4c1..4227201 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## 1.1.4
+## Added
+- extended list of languages for new files
+- work with self-signed certificates
+
+## Changed
+- files of new presentations
+- fix German l10n
+- changed verification of settings
+
 ## 1.1.3
 ## Added
 - fixing bug
diff --git a/appinfo/app.php b/appinfo/app.php
index 68ebda6..c7ce9b0 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
diff --git a/appinfo/application.php b/appinfo/application.php
index 52b815f..b71b43f 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
diff --git a/appinfo/info.xml b/appinfo/info.xml
index fb4c0a1..25e8621 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
     <description>ONLYOFFICE integration app enables users to edit Office documents within ONLYOFFICE from OwnCloud. This will create a new Open in ONLYOFFICE action within the document library for Office documents. This allows multiple users to collaborate in real time and to save back those changes to OwnCloud.</description>
     <licence>AGPL</licence>
     <author>Ascensio System SIA</author>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 1f96457..125bcac 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
diff --git a/assets/az/new.docx b/assets/az/new.docx
deleted file mode 100644
index 1bec95e..0000000
--- a/assets/az/new.docx
+++ /dev/null
diff --git a/assets/az/new.pptx b/assets/az/new.pptx
deleted file mode 100644
index 1c40671..0000000
--- a/assets/az/new.pptx
+++ /dev/null
diff --git a/assets/cs/new.docx b/assets/cs/new.docx
new file mode 100644
index 0000000..c55264b
--- /dev/null
+++ b/assets/cs/new.docx
diff --git a/assets/cs/new.pptx b/assets/cs/new.pptx
new file mode 100644
index 0000000..825dd3b
--- /dev/null
+++ b/assets/cs/new.pptx
diff --git a/assets/az/new.xlsx b/assets/cs/new.xlsx
index 3b301e7..3b301e7 100644
--- a/assets/az/new.xlsx
+++ b/assets/cs/new.xlsx
diff --git a/assets/de/new.pptx b/assets/de/new.pptx
index 1c40671..914a6cc 100644
--- a/assets/de/new.pptx
+++ b/assets/de/new.pptx
diff --git a/assets/de_DE/new.docx b/assets/de_DE/new.docx
new file mode 100644
index 0000000..0c83b58
--- /dev/null
+++ b/assets/de_DE/new.docx
diff --git a/assets/de_DE/new.pptx b/assets/de_DE/new.pptx
new file mode 100644
index 0000000..914a6cc
--- /dev/null
+++ b/assets/de_DE/new.pptx
diff --git a/assets/lv/new.xlsx b/assets/de_DE/new.xlsx
index 3b301e7..3b301e7 100644
--- a/assets/lv/new.xlsx
+++ b/assets/de_DE/new.xlsx
diff --git a/assets/el/new.docx b/assets/el/new.docx
new file mode 100644
index 0000000..b66945d
--- /dev/null
+++ b/assets/el/new.docx
diff --git a/assets/el/new.pptx b/assets/el/new.pptx
new file mode 100644
index 0000000..eaca76f
--- /dev/null
+++ b/assets/el/new.pptx
diff --git a/assets/pt/new.xlsx b/assets/el/new.xlsx
index 3b301e7..3b301e7 100644
--- a/assets/pt/new.xlsx
+++ b/assets/el/new.xlsx
diff --git a/assets/en/new.pptx b/assets/en/new.pptx
index 1c40671..904db46 100644
--- a/assets/en/new.pptx
+++ b/assets/en/new.pptx
diff --git a/assets/es/new.pptx b/assets/es/new.pptx
index 1c40671..ce9934e 100644
--- a/assets/es/new.pptx
+++ b/assets/es/new.pptx
diff --git a/assets/fr/new.pptx b/assets/fr/new.pptx
index 1c40671..6eaf4e0 100644
--- a/assets/fr/new.pptx
+++ b/assets/fr/new.pptx
diff --git a/assets/it/new.pptx b/assets/it/new.pptx
index 1c40671..457b1a1 100644
--- a/assets/it/new.pptx
+++ b/assets/it/new.pptx
diff --git a/assets/ko/new.docx b/assets/ko/new.docx
new file mode 100644
index 0000000..c2130ce
--- /dev/null
+++ b/assets/ko/new.docx
diff --git a/assets/ko/new.pptx b/assets/ko/new.pptx
new file mode 100644
index 0000000..5b4ac96
--- /dev/null
+++ b/assets/ko/new.pptx
diff --git a/assets/ko/new.xlsx b/assets/ko/new.xlsx
new file mode 100644
index 0000000..3b301e7
--- /dev/null
+++ b/assets/ko/new.xlsx
diff --git a/assets/lv/new.docx b/assets/lv/new.docx
deleted file mode 100644
index b3edf0b..0000000
--- a/assets/lv/new.docx
+++ /dev/null
diff --git a/assets/lv/new.pptx b/assets/lv/new.pptx
deleted file mode 100644
index 1c40671..0000000
--- a/assets/lv/new.pptx
+++ /dev/null
diff --git a/assets/pl/new.pptx b/assets/pl/new.pptx
index 1c40671..1686a4f 100644
--- a/assets/pl/new.pptx
+++ b/assets/pl/new.pptx
diff --git a/assets/pt/new.pptx b/assets/pt/new.pptx
deleted file mode 100644
index 1c40671..0000000
--- a/assets/pt/new.pptx
+++ /dev/null
diff --git a/assets/pt/new.docx b/assets/pt_BR/new.docx
index 133b3b5..133b3b5 100644
--- a/assets/pt/new.docx
+++ b/assets/pt_BR/new.docx
diff --git a/assets/pt_BR/new.pptx b/assets/pt_BR/new.pptx
new file mode 100644
index 0000000..0f18234
--- /dev/null
+++ b/assets/pt_BR/new.pptx
diff --git a/assets/pt_BR/new.xlsx b/assets/pt_BR/new.xlsx
new file mode 100644
index 0000000..3b301e7
--- /dev/null
+++ b/assets/pt_BR/new.xlsx
diff --git a/assets/pt_PT/new.docx b/assets/pt_PT/new.docx
new file mode 100644
index 0000000..bf7b7af
--- /dev/null
+++ b/assets/pt_PT/new.docx
diff --git a/assets/pt_PT/new.pptx b/assets/pt_PT/new.pptx
new file mode 100644
index 0000000..988986e
--- /dev/null
+++ b/assets/pt_PT/new.pptx
diff --git a/assets/pt_PT/new.xlsx b/assets/pt_PT/new.xlsx
new file mode 100644
index 0000000..3b301e7
--- /dev/null
+++ b/assets/pt_PT/new.xlsx
diff --git a/assets/ru/new.pptx b/assets/ru/new.pptx
index 1c40671..c8b074e 100644
--- a/assets/ru/new.pptx
+++ b/assets/ru/new.pptx
diff --git a/assets/zh_CN/new.docx b/assets/zh_CN/new.docx
new file mode 100644
index 0000000..7dc9fd7
--- /dev/null
+++ b/assets/zh_CN/new.docx
diff --git a/assets/zh_CN/new.pptx b/assets/zh_CN/new.pptx
new file mode 100644
index 0000000..d4b5985
--- /dev/null
+++ b/assets/zh_CN/new.pptx
diff --git a/assets/zh_CN/new.xlsx b/assets/zh_CN/new.xlsx
new file mode 100644
index 0000000..3b301e7
--- /dev/null
+++ b/assets/zh_CN/new.xlsx
diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
index 335e8c0..07b5a70 100644
--- a/controller/callbackcontroller.php
+++ b/controller/callbackcontroller.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -168,6 +168,9 @@ class CallbackController extends Controller {
             return new JSONResponse(["message" => $this->trans->t("Invalid request")], Http::STATUS_BAD_REQUEST);
         }
 
+        $fileId = $hashData->fileId;
+        $this->logger->debug("Download: " . $fileId, array("app" => $this->appName));
+
         if (!empty($this->config->GetDocumentServerSecret())) {
             $header = \OC::$server->getRequest()->getHeader("Authorization");
             if (empty($header)) {
@@ -185,7 +188,6 @@ class CallbackController extends Controller {
             }
         }
 
-        $fileId = $hashData->fileId;
         $ownerId = $hashData->ownerId;
 
         $files = $this->root->getUserFolder($ownerId)->getById($fileId);
@@ -222,6 +224,7 @@ class CallbackController extends Controller {
      * @CORS
      */
     public function emptyfile($doc) {
+        $this->logger->debug("Download empty", array("app" => $this->appName));
 
         list ($hashData, $error) = $this->crypt->ReadHash($doc);
         if ($hashData === NULL) {
@@ -294,6 +297,9 @@ class CallbackController extends Controller {
             return new JSONResponse(["message" => $this->trans->t("Invalid request")], Http::STATUS_BAD_REQUEST);
         }
 
+        $fileId = $hashData->fileId;
+        $this->logger->debug("Track: " . $fileId . " status " . $status, array("app" => $this->appName));
+
         if (!empty($this->config->GetDocumentServerSecret())) {
             $header = \OC::$server->getRequest()->getHeader("Authorization");
             if (empty($header)) {
@@ -324,8 +330,11 @@ class CallbackController extends Controller {
         switch ($trackerStatus) {
             case "MustSave":
             case "Corrupted":
+                if (empty($url)) {
+                    $this->logger->info("Track without url: " . $fileId . " status " . $trackerStatus, array("app" => $this->appName));
+                    return new JSONResponse(["message" => $this->trans->t("Url not found")], Http::STATUS_BAD_REQUEST);
+                }
 
-                $fileId = $hashData->fileId;
                 $ownerId = $hashData->ownerId;
 
                 \OC_Util::tearDownFS();
@@ -347,21 +356,20 @@ class CallbackController extends Controller {
                 $curExt = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
                 $downloadExt = strtolower(pathinfo($url, PATHINFO_EXTENSION));
 
+                $documentService = new DocumentService($this->trans, $this->config);
                 if ($downloadExt !== $curExt) {
-                    $documentService = new DocumentService($this->trans, $this->config);
                     $key =  DocumentService::GenerateRevisionId($fileId . $url);
 
                     try {
-                        $newFileUri;
-                        $documentService->GetConvertedUri($url, $downloadExt, $curExt, $key, FALSE, $newFileUri);
-                        $url = $newFileUri;
+                        $url = $documentService->GetConvertedUri($url, $downloadExt, $curExt, $key);
                     } catch (\Exception $e) {
-                        $this->logger->error("GetConvertedUri in track: " . $url . " " . $e->getMessage(), array("app" => $this->appName));
+                        $this->logger->error("GetConvertedUri on save error: " . $e->getMessage(), array("app" => $this->appName));
                         return new JSONResponse(["message" => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
                     }
                 }
 
-                if (!empty($this->config->GetDocumentServerInternalUrl(true))) {
+                $documentServerUrl = $this->config->GetDocumentServerInternalUrl(true);
+                if (!empty($documentServerUrl)) {
                     $from = $this->config->GetDocumentServerUrl();
 
                     if (!preg_match("/^https?:\/\//i", $from)) {
@@ -369,11 +377,14 @@ class CallbackController extends Controller {
                         $from = $parsedUrl["scheme"] . "://" . $parsedUrl["host"] . (array_key_exists("port", $parsedUrl) ? (":" . $parsedUrl["port"]) : "") . "/";
                     }
 
-                    $this->logger->debug("Replace in track from " . $from . " to " . $this->config->GetDocumentServerInternalUrl(true), array("app" => $this->appName));
-                    $url = str_replace($from, $this->config->GetDocumentServerInternalUrl(true), $url);
+                    if ($from !== $documentServerUrl)
+                    {
+                        $this->logger->debug("Replace in track from " . $from . " to " . $documentServerUrl, array("app" => $this->appName));
+                        $url = str_replace($from, $documentServerUrl, $url);
+                    }
                 }
 
-                if (($newData = file_get_contents($url))) {
+                if (($newData = $documentService->Request($url))) {
 
                     $this->userSession->setUser($this->userManager->get($users[0]));
 
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 72f3862..54435dd 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -147,6 +147,7 @@ class EditorController extends Controller {
      * @NoAdminRequired
      */
     public function create($name, $dir) {
+        $this->logger->debug("Create: " . $name, array("app" => $this->appName));
 
         $userId = $this->userSession->getUser()->getUID();
         $userFolder = $this->root->getUserFolder($userId);
@@ -210,6 +211,8 @@ class EditorController extends Controller {
      * @NoAdminRequired
      */
     public function convert($fileId) {
+        $this->logger->debug("Convert: " . $fileId, array("app" => $this->appName));
+
         list ($file, $error) = $this->getFile($fileId);
 
         if (isset($error)) {
@@ -245,7 +248,7 @@ class EditorController extends Controller {
         $key = $this->getKey($file);
         $fileUrl = $this->getUrl($file);
         try {
-            $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key, FALSE, $newFileUri);
+            $newFileUri = $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key);
         } catch (\Exception $e) {
             $this->logger->error("GetConvertedUri: " . $fileId . " " . $e->getMessage(), array("app" => $this->appName));
             return ["error" => $e->getMessage()];
@@ -264,7 +267,7 @@ class EditorController extends Controller {
 
         $newFilePath = $newFolderPath . DIRECTORY_SEPARATOR . $newFileName;
 
-        if (($newData = file_get_contents($newFileUri)) === FALSE) {
+        if (($newData = $documentService->Request($newFileUri)) === FALSE) {
             $this->logger->error("Failed to download converted file: " . $newFileUri, array("app" => $this->appName));
             return ["error" => $this->trans->t("Failed to download converted file")];
         }
@@ -297,6 +300,8 @@ class EditorController extends Controller {
      * @NoCSRFRequired
      */
     public function index($fileId) {
+        $this->logger->debug("Open: " . $fileId, array("app" => $this->appName));
+
         $documentServerUrl = $this->config->GetDocumentServerUrl();
 
         if (empty($documentServerUrl)) {
@@ -335,6 +340,7 @@ class EditorController extends Controller {
      * @NoAdminRequired
      */
     public function config($fileId) {
+
         list ($file, $error) = $this->getFile($fileId);
 
         if (isset($error)) {
@@ -382,7 +388,7 @@ class EditorController extends Controller {
             "documentType" => $format["type"],
             "editorConfig" => [
                 "callbackUrl" => $callback,
-                "lang" => \OC::$server->getL10NFactory("")->get("")->getLanguageCode(),
+                "lang" => str_replace("_", "-", \OC::$server->getL10NFactory("")->get("")->getLanguageCode()),
                 "mode" => (empty($callback) ? "view" : "edit"),
                 "user" => [
                     "id" => $userId,
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 901f1bd..4320d4c 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -223,9 +223,14 @@ class SettingsController extends Controller {
      */
     private function checkDocServiceUrl() {
 
-        $documentService = new DocumentService($this->trans, $this->config);
-
         try {
+            if (substr($this->urlGenerator->getAbsoluteURL("/"), 0, strlen("https")) === "https"
+                && substr($this->config->GetDocumentServerUrl("/"), 0, strlen("https")) !== "https") {
+                throw new \Exception($this->trans->t("Mixed Active Content is not allowed. HTTPS address for Document Server is required."));
+            }
+
+            $documentService = new DocumentService($this->trans, $this->config);
+
             $commandResponse = $documentService->CommandRequest("version");
 
             $this->logger->debug("CommandRequest on check: " . json_encode($commandResponse), array("app" => $this->appName));
@@ -239,17 +244,14 @@ class SettingsController extends Controller {
                 throw new \Exception($this->trans->t("Not supported version"));
             }
 
+            $hashUrl = $this->crypt->GetHash(["action" => "empty"]);
+            $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.emptyfile", ["doc" => $hashUrl]);
             if (!empty($this->config->GetStorageUrl())) {
-                $key = "check_" . rand();
-
-                $hashUrl = $this->crypt->GetHash(["action" => "empty"]);
-                $fileUrl = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".callback.emptyfile", ["doc" => $hashUrl]);
                 $fileUrl = str_replace($this->urlGenerator->getAbsoluteURL("/"), $this->config->GetStorageUrl(), $fileUrl);
-
-                $newFileUri;
-                $documentService->GetConvertedUri($fileUrl, "docx", "docx", $key, FALSE, $newFileUri);
-                $this->logger->debug("GetConvertedUri on check: " . $fileUrl . " return " . $newFileUri, array("app" => $this->appName));
             }
+
+            $documentService->GetConvertedUri($fileUrl, "docx", "docx", "check_" . rand());
+
         } catch (\Exception $e) {
             $this->logger->error("CommandRequest on check error: " . $e->getMessage(), array("app" => $this->appName));
             return $e->getMessage();
diff --git a/css/editor.css b/css/editor.css
index 0056090..bf1d825 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -2,9 +2,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -12,16 +12,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 #app > iframe {
     vertical-align: top;
diff --git a/css/main.css b/css/main.css
index 7cdda33..d2c5773 100644
--- a/css/main.css
+++ b/css/main.css
@@ -2,9 +2,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -12,16 +12,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 .icon-onlyoffice-new-docx {
     background-image: url("../img/new-docx.svg");
diff --git a/css/settings.css b/css/settings.css
index 41461f7..047bd96 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -2,9 +2,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -12,16 +12,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 .section-onlyoffice h2 {
     display: inline;
diff --git a/js/editor.js b/js/editor.js
index 92907f7..45585f3 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -2,9 +2,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -12,16 +12,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 (function ($, OCA) {
 
diff --git a/js/main.js b/js/main.js
index 87853aa..376eec3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -2,9 +2,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -12,16 +12,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 (function (OCA) {
 
diff --git a/js/settings.js b/js/settings.js
index b068590..0db83d7 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -2,9 +2,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -12,16 +12,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 (function ($, OC) {
 
diff --git a/l10n/de.js b/l10n/de.js
index 2c1f2a0..360368c 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "Secret key (leave blank to disable)" : "Geheimer Schlüssel (freilassen, um zu deaktivieren)",
     "Open file in the same tab" : "Datei in der gleichen Registerkarte öffnen",
     "The default application for opening the format" : "Die Standardanwendung zum Öffnen des Formats",
-    "Save" : "Speichern"
+    "Save" : "Speichern",
+    "Mixed Active Content is not allowed. HTTPS address for Document Server is required." : "Mixed Active Content ist nicht möglich. HTTPS-Adresse für Document Server ist erforderlich."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index dcec6ac..2d7d9bd 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -41,6 +41,7 @@
     "Secret key (leave blank to disable)" : "Geheimer Schlüssel (freilassen, um zu deaktivieren)",
     "Open file in the same tab" : "Datei in der gleichen Registerkarte öffnen",
     "The default application for opening the format" : "Die Standardanwendung zum Öffnen des Formats",
-    "Save" : "Speichern"
+    "Save" : "Speichern",
+    "Mixed Active Content is not allowed. HTTPS address for Document Server is required." : "Mixed Active Content ist nicht möglich. HTTPS-Adresse für Document Server ist erforderlich."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index 35f8d6a..b630e42 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "Secret key (leave blank to disable)" : "Clave secreta (deje en blanco o desactive)",
     "Open file in the same tab" : "Abrir archivo en la misma pestaña",
     "The default application for opening the format" : "La aplicación predeterminada para abrir el formato",
-    "Save" : "Guardar"
+    "Save" : "Guardar",
+    "Mixed Active Content is not allowed. HTTPS address for Document Server is required." : "Contenido Mixto Activo no está permitido. Se requiere la dirección HTTPS para Servidor de Documentos."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 52591cb..972e145 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -41,6 +41,7 @@
     "Secret key (leave blank to disable)" : "Clave secreta (deje en blanco o desactive)",
     "Open file in the same tab" : "Abrir archivo en la misma pestaña",
     "The default application for opening the format" : "La aplicación predeterminada para abrir el formato",
-    "Save" : "Guardar"
+    "Save" : "Guardar",
+    "Mixed Active Content is not allowed. HTTPS address for Document Server is required." : "Contenido Mixto Activo no está permitido. Se requiere la dirección HTTPS para Servidor de Documentos."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/ru.js b/l10n/ru.js
index cdb7a38..f5105c2 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "Secret key (leave blank to disable)" : "Секретный ключ (оставьте пустым для отключения)",
     "Open file in the same tab" : "Открыть файл в той же вкладке",
     "The default application for opening the format" : "Приложение по умолчанию для открытия формата",
-    "Save" : "Сохранить"
+    "Save" : "Сохранить",
+    "Mixed Active Content is not allowed. HTTPS address for Document Server is required." : "Смешанное активное содержимое запрещено. Для Сервера документов необходимо использовать HTTPS-адрес."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/l10n/ru.json b/l10n/ru.json
index d3c27f6..395357f 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -41,6 +41,7 @@
     "Secret key (leave blank to disable)" : "Секретный ключ (оставьте пустым для отключения)",
     "Open file in the same tab" : "Открыть файл в той же вкладке",
     "The default application for opening the format" : "Приложение по умолчанию для открытия формата",
-    "Save" : "Сохранить"
+    "Save" : "Сохранить",
+    "Mixed Active Content is not allowed. HTTPS address for Document Server is required." : "Смешанное активное содержимое запрещено. Для Сервера документов необходимо использовать HTTPS-адрес."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/lib/adminsettings.php b/lib/adminsettings.php
index 143a9ea..61c824f 100644
--- a/lib/adminsettings.php
+++ b/lib/adminsettings.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 1a20a4d..081afc3 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -37,35 +37,6 @@ use OCP\ILogger;
 class AppConfig {
 
     /**
-     * Definition url on server
-     *
-     * @var string
-     */
-    private $predefDocumentServerUrl = "";
-
-    /**
-     * Definition url on server from ownCloud
-     *
-     * @var string
-     */
-    private $predefDocumentServerInternalUrl = "";
-
-    /**
-     * Definition url on server to ownCloud
-     *
-     * @var string
-     */
-    private $predefStorageUrl = "";
-
-    /**
-     * Definition url on server
-     *
-     * @var string
-     */
-    private $predefDocumentServerSecret = "";
-
-
-    /**
      * Application name
      *
      * @var string
@@ -136,6 +107,13 @@ class AppConfig {
     private $_sameTab = "sameTab";
 
     /**
+     * The config key for the verification
+     *
+     * @var string
+     */
+    private $_verification = "verify_peer_off";
+
+    /**
      * @param string $AppName - application name
      */
     public function __construct($AppName) {
@@ -172,10 +150,9 @@ class AppConfig {
      */
     public function GetDocumentServerUrl() {
         $url = $this->config->getAppValue($this->appName, $this->_documentserver, "");
-        if (empty($url)) {
-            $url = $this->predefDocumentServerUrl;
-        }
-        if (empty($url) && !empty($this->config->getSystemValue($this->appName))) {
+        if (empty($url)
+            && !empty($this->config->getSystemValue($this->appName))
+            && array_key_exists($this->_documentserver, $this->config->getSystemValue($this->appName))) {
             $url = $this->config->getSystemValue($this->appName)[$this->_documentserver];
         }
         if ($url !== "/") {
@@ -213,10 +190,9 @@ class AppConfig {
      */
     public function GetDocumentServerInternalUrl($origin) {
         $url = $this->config->getAppValue($this->appName, $this->_documentserverInternal, "");
-        if (empty($url)) {
-            $url = $this->predefDocumentServerInternalUrl;
-        }
-        if (empty($url) && !empty($this->config->getSystemValue($this->appName))) {
+        if (empty($url)
+            && !empty($this->config->getSystemValue($this->appName))
+            && array_key_exists($this->_documentserverInternal, $this->config->getSystemValue($this->appName))) {
             $url = $this->config->getSystemValue($this->appName)[$this->_documentserverInternal];
         }
         if (!$origin && empty($url)) {
@@ -251,10 +227,9 @@ class AppConfig {
      */
     public function GetStorageUrl() {
         $url = $this->config->getAppValue($this->appName, $this->_storageUrl, "");
-        if (empty($url)) {
-            $url = $this->predefStorageUrl;
-        }
-        if (empty($url) && !empty($this->config->getSystemValue($this->appName))) {
+        if (empty($url)
+            && !empty($this->config->getSystemValue($this->appName))
+            && array_key_exists($this->_storageUrl, $this->config->getSystemValue($this->appName))) {
             $url = $this->config->getSystemValue($this->appName)[$this->_storageUrl];
         }
         return $url;
@@ -282,10 +257,9 @@ class AppConfig {
      */
     public function GetDocumentServerSecret() {
         $secret = $this->config->getAppValue($this->appName, $this->_secret, "");
-        if (empty($secret)) {
-            $secret = $this->predefDocumentServerSecret;
-        }
-        if (empty($secret) && !empty($this->config->getSystemValue($this->appName))) {
+        if (empty($secret)
+            && !empty($this->config->getSystemValue($this->appName))
+            && array_key_exists($this->_secret, $this->config->getSystemValue($this->appName))) {
             $secret = $this->config->getSystemValue($this->appName)[$this->_secret];
         }
         return $secret;
@@ -357,6 +331,20 @@ class AppConfig {
         return $this->config->getAppValue($this->appName, $this->_sameTab, "false") === "true";
     }
 
+        /**
+         * Get the turn off verification setting
+         *
+         * @return boolean
+         */
+        public function TurnOffVerification() {
+            $turnOff = FALSE;
+            if (!empty($this->config->getSystemValue($this->appName))
+                && array_key_exists($this->_verification, $this->config->getSystemValue($this->appName))) {
+                $turnOff = $this->config->getSystemValue($this->appName)[$this->_verification];
+            }
+            return $turnOff === TRUE;
+        }
+
 
     /**
      * Additional data about formats
diff --git a/lib/crypt.php b/lib/crypt.php
index 1743dce..7b7d04e 100644
--- a/lib/crypt.php
+++ b/lib/crypt.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -77,14 +77,18 @@ class Crypt {
         }
         try {
             $payload = base64_decode($hash);
-            $payloadParts = explode("?", $payload);
+            $payloadParts = explode("?", $payload, 2);
 
-            $encode = base64_encode( hash( "sha256", ($payloadParts[1] . $this->skey), true ) );
+            if (count($payloadParts) === 2) {
+                $encode = base64_encode( hash( "sha256", ($payloadParts[1] . $this->skey), true ) );
 
-            if ($payloadParts[0] === $encode) {
-                $result = json_decode($payloadParts[1]);
+                if ($payloadParts[0] === $encode) {
+                    $result = json_decode($payloadParts[1]);
+                } else {
+                    $error = "hash not equal";
+                }
             } else {
-                $error = "hash not equal";
+                $error = "incorrect hash";
             }
         } catch (\Exception $e) {
             $error = $e->getMessage();
diff --git a/lib/documentservice.php b/lib/documentservice.php
index 3d26994..b88ec7d 100644
--- a/lib/documentservice.php
+++ b/lib/documentservice.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -77,37 +77,30 @@ class DocumentService {
     }
 
     /**
-     * The method is to convert the file to the required format and return the percentage of completion
+     * The method is to convert the file to the required format and return the result url
      *
      * @param string $document_uri - Uri for the document to convert
      * @param string $from_extension - Document extension
      * @param string $to_extension - Extension to which to convert
      * @param string $document_revision_id - Key for caching on service
-     * @param bool $is_async - Perform conversions asynchronously
-     * @param string $converted_document_uri - Uri to the converted document
      *
-     * @return int
+     * @return string
      */
-    function GetConvertedUri($document_uri, $from_extension, $to_extension, $document_revision_id, $is_async, &$converted_document_uri) {
-        $converted_document_uri = "";
-        $responceFromConvertService = $this->SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, $is_async);
+    function GetConvertedUri($document_uri, $from_extension, $to_extension, $document_revision_id) {
+        $responceFromConvertService = $this->SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, FALSE);
 
         $errorElement = $responceFromConvertService->Error;
         if ($errorElement->count() > 0) {
-            $this->ProcessConvServResponceError($errorElement."");
+            $this->ProcessConvServResponceError($errorElement . "");
         }
 
         $isEndConvert = $responceFromConvertService->EndConvert;
-        $percent = $responceFromConvertService->Percent . "";
 
         if ($isEndConvert !== NULL && strtolower($isEndConvert) === "true") {
-            $converted_document_uri = $responceFromConvertService->FileUrl;
-            $percent = 100;
-        } else if ($percent >= 100) {
-            $percent = 99;
+            return $responceFromConvertService->FileUrl;
         }
 
-        return $percent;
+        return "";
     }
 
     /**
@@ -176,15 +169,10 @@ class DocumentService {
             $opts["http"]["header"] = $opts["http"]["header"] . "Authorization: Bearer " . $token . "\r\n";
         }
 
-        if (substr($urlToConverter, 0, strlen("https")) === "https") {
-            $opts["ssl"] = array( "verify_peer"   => FALSE );
-        }
- 
-        $context  = stream_context_create($opts);
         $ServiceConverterMaxTry = 3;
         while ($countTry < $ServiceConverterMaxTry) {
             $countTry = $countTry + 1;
-            $response_xml_data = file_get_contents($urlToConverter, FALSE, $context);
+            $response_xml_data = $this->Request($urlToConverter, $opts);
             if ($response_xml_data !== false) { break; }
         }
 
@@ -296,13 +284,7 @@ class DocumentService {
             $opts["http"]["header"] = $opts["http"]["header"] . "Authorization: Bearer " . $token . "\r\n";
         }
 
-        if (substr($urlCommand, 0, strlen("https")) === "https") {
-            $opts["ssl"] = array( "verify_peer"   => FALSE );
-        }
-
-        $context  = stream_context_create($opts);
-
-        if (($response = file_get_contents($urlCommand, FALSE, $context)) === FALSE) {
+        if (($response = $this->Request($urlCommand, $opts)) === FALSE) {
             throw new \Exception ($this->trans->t("Bad Request or timeout error"));
         }
 
@@ -343,4 +325,29 @@ class DocumentService {
 
         throw new \Exception($errorMessage);
     }
+
+    /**
+     * Request to Document Server with turn off verification
+     *
+     * @param string $url - request address
+     * @param array $opts - stream context options
+     *
+     * @return string
+     */
+    public function Request($url, $opts = NULL) {
+        if (NULL === $opts) {
+            $opts = array();
+        }
+
+        if (substr($url, 0, strlen("https")) === "https" && $this->config->TurnOffVerification()) {
+            $opts["ssl"] = array(
+                "verify_peer" => FALSE,
+                "verify_peer_name" => FALSE
+            );
+        }
+
+        $context  = stream_context_create($opts);
+
+        return file_get_contents($url, FALSE, $context);
+    }
 }
diff --git a/settings.php b/settings.php
index e41fe6b..249cbca 100644
--- a/settings.php
+++ b/settings.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,16 +13,16 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
-*/
+ */
 
 namespace OCA\Onlyoffice;
 
diff --git a/templates/editor.php b/templates/editor.php
index f6d659d..40f1296 100644
--- a/templates/editor.php
+++ b/templates/editor.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */
@@ -33,7 +33,9 @@
     <div id="iframeEditor"></div>
 
     <?php if (!empty($_["documentServerUrl"])) {
-        print_unescaped("<script src=\"") .
+        print_unescaped("<script nonce=\"") .
+        p(base64_encode($_["requesttoken"])) .
+        print_unescaped("\" src=\"") .
         p($_["documentServerUrl"]) .
         print_unescaped("web-apps/apps/api/documents/api.js\" type=\"text/javascript\"></script>");
     } ?>
diff --git a/templates/settings.php b/templates/settings.php
index 842aa94..0273b98 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -3,9 +3,9 @@
  *
  * (c) Copyright Ascensio System Limited 2010-2017
  *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
  * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
  *
  * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
@@ -13,13 +13,13 @@
  *
  * You can contact Ascensio System SIA by email at sales@onlyoffice.com
  *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
  * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
  *
- * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
+ * in every copy of the program you distribute.
  * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
  *
  */