From 18a6409fdb6cfaa072d0540ef85651227a048bd2 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 31 Oct 2019 11:04:12 +0300
Subject: [PATCH 01/42] Use iframe for displaying the editor inline (#154)

---
 controller/editorcontroller.php |  6 +++++-
 css/editor.css                  |  5 +++++
 css/main.css                    | 10 ++++++++++
 js/main.js                      | 13 ++++++++++++-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 9a866bf1..42ef5235 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -510,7 +510,11 @@ public function index($fileId, $shareToken = NULL, $filePath = NULL) {
             "shareToken" => $shareToken
         ];
 
-        $response = new TemplateResponse($this->appName, "editor", $params);
+        if ($this->config->GetSameTab() && empty($shareToken)) {
+            $response = new TemplateResponse($this->appName, "editor", $params, "plain");
+        } else {
+            $response = new TemplateResponse($this->appName, "editor", $params);
+        }
 
         $csp = new ContentSecurityPolicy();
         $csp->allowInlineScript(true);
diff --git a/css/editor.css b/css/editor.css
index 7cfebd32..01dc090e 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -29,6 +29,11 @@
 #content.app-onlyoffice {
     min-height: calc(100% - 50px);
 }
+
+#body-public #content {
+    height: 100%;
+}
+
 #app > iframe {
     position: absolute;
     vertical-align: top;
diff --git a/css/main.css b/css/main.css
index 513c9a8d..68fab2a5 100644
--- a/css/main.css
+++ b/css/main.css
@@ -40,6 +40,16 @@
     background-image: url("../img/app-dark.svg");
 }
 
+#onlyofficeFrame {
+    background-color: #fff;
+    width: 100%;
+    height: calc(100vh - 50px);
+    display: block;
+    position: absolute;
+    top: 0;
+    z-index: 110;
+}
+
 .AscDesktopEditor #body-user #header {
     display: none;
 }
diff --git a/js/main.js b/js/main.js
index 5bd4d3e4..4d7ed95d 100644
--- a/js/main.js
+++ b/js/main.js
@@ -98,8 +98,19 @@
             winEditor.location.href = url;
         } else if (!OCA.Onlyoffice.setting.sameTab || OCA.Onlyoffice.Desktop) {
             winEditor = window.open(url, "_blank");
-        } else {
+        } else if ($("#isPublic").val()) {
             location.href = url;
+        } else {
+            var $iframe = $("<iframe id=\"onlyofficeFrame\" nonce=\"" + btoa(OC.requestToken) + "\" scrolling=\"no\" allowfullscreen src=\"" + url + "\" />");
+            $("#app-content").append($iframe);
+
+            //todo: restore on close
+            $("#app-navigation").addClass("hidden");
+            $("body").css("overscroll-behavior-y", "none")
+            $("body").css("overflow", "hidden");
+            $(".searchbox").hide();
+            $("#app-content #controls").addClass("hidden");
+            $("html, body").scrollTop(0);
         }
     };
 

From 1ce6f3c261af997f03b3f48d17a3cb3e8adc02fb Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 31 Oct 2019 12:48:31 +0300
Subject: [PATCH 02/42] requestClose

---
 controller/editorcontroller.php |  1 +
 css/main.css                    | 14 ++++++++++++++
 js/editor.js                    |  8 ++++++++
 js/main.js                      | 25 +++++++++++++++++++------
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 42ef5235..23a79193 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -684,6 +684,7 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $desktop =
             if (!$desktop) {
                 if ($this->config->GetSameTab()) {
                     $params["editorConfig"]["customization"]["goback"]["blank"] = false;
+                    $params["editorConfig"]["customization"]["goback"]["requestClose"] = true;
                 }
             }
         }
diff --git a/css/main.css b/css/main.css
index 68fab2a5..16e1a27c 100644
--- a/css/main.css
+++ b/css/main.css
@@ -40,6 +40,19 @@
     background-image: url("../img/app-dark.svg");
 }
 
+/* onlyoffice-inline */
+body.onlyoffice-inline {
+    overscroll-behavior-y: none;
+    overflow: hidden;
+}
+body.onlyoffice-inline #app-navigation,
+body.onlyoffice-inline .searchbox,
+body.onlyoffice-inline #app-content #controls {
+    display: none;
+}
+body.onlyoffice-inline #content #app-content {
+    margin-left: 0;
+}
 #onlyofficeFrame {
     background-color: #fff;
     width: 100%;
@@ -50,6 +63,7 @@
     z-index: 110;
 }
 
+/* AscDesktopEditor */
 .AscDesktopEditor #body-user #header {
     display: none;
 }
diff --git a/js/editor.js b/js/editor.js
index 64ffef32..28edfad7 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -110,10 +110,14 @@
                     };
 
                     if (OC.currentUser) {
+                        //todo: in frame use postMessage
                         config.events.onRequestSaveAs = OCA.Onlyoffice.onRequestSaveAs;
                         config.events.onRequestInsertImage = OCA.Onlyoffice.onRequestInsertImage;
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
                     }
+                    if (window.self !== window.parent) {
+                        config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
+                    }
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
@@ -213,6 +217,10 @@
         OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"), setRecipient, false, recipientMimes);
     };
 
+    OCA.Onlyoffice.onRequestClose = function() {
+        window.parent.postMessage("editorRequestClose");
+    };
+
     $(document).ready(OCA.Onlyoffice.InitEditor);
 
 })(jQuery, OCA);
diff --git a/js/main.js b/js/main.js
index 4d7ed95d..3bb3cfce 100644
--- a/js/main.js
+++ b/js/main.js
@@ -104,16 +104,18 @@
             var $iframe = $("<iframe id=\"onlyofficeFrame\" nonce=\"" + btoa(OC.requestToken) + "\" scrolling=\"no\" allowfullscreen src=\"" + url + "\" />");
             $("#app-content").append($iframe);
 
-            //todo: restore on close
-            $("#app-navigation").addClass("hidden");
-            $("body").css("overscroll-behavior-y", "none")
-            $("body").css("overflow", "hidden");
-            $(".searchbox").hide();
-            $("#app-content #controls").addClass("hidden");
+            $("body").addClass("onlyoffice-inline");
+
             $("html, body").scrollTop(0);
         }
     };
 
+    OCA.Onlyoffice.CloseEditor = function () {
+        $("body").removeClass("onlyoffice-inline");
+
+        $("#onlyofficeFrame").remove();
+    };
+
     OCA.Onlyoffice.FileClick = function (fileName, context) {
         var fileInfoModel = context.fileInfoModel || context.fileList.getModelForFile(fileName);
         OCA.Onlyoffice.OpenEditor(fileInfoModel.id, context.dir, fileName);
@@ -293,6 +295,17 @@
         }
     };
 
+    window.addEventListener("message", function(event) {
+        if ($("#onlyofficeFrame")[0].contentWindow !== event.source) {
+            return;
+        }
+        switch (event.data) {
+            case "editorRequestClose":
+                OCA.Onlyoffice.CloseEditor();
+                break;
+        }
+    }, false);
+
     $(document).ready(initPage)
 
 })(OCA);

From 68d21ef4247aca7cfda7c910a4491831844402aa Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 27 Nov 2019 11:49:02 +0300
Subject: [PATCH 03/42] change url for frame editor

---
 js/main.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/js/main.js b/js/main.js
index 3bb3cfce..144a8493 100644
--- a/js/main.js
+++ b/js/main.js
@@ -29,7 +29,8 @@
 (function (OCA) {
 
     OCA.Onlyoffice = _.extend({
-            AppName: "onlyoffice"
+            AppName: "onlyoffice",
+            folderUrl: null
         }, OCA.Onlyoffice);
 
     OCA.Onlyoffice.setting = {};
@@ -107,6 +108,9 @@
             $("body").addClass("onlyoffice-inline");
 
             $("html, body").scrollTop(0);
+
+            OCA.Onlyoffice.folderUrl = location.href;
+            window.history.pushState(null, null, url);
         }
     };
 
@@ -114,6 +118,12 @@
         $("body").removeClass("onlyoffice-inline");
 
         $("#onlyofficeFrame").remove();
+
+        var url = OCA.Onlyoffice.folderUrl;
+        if (!!url) {
+            window.history.pushState(null, null, url);
+            OCA.Onlyoffice.folderUrl = null;
+        }
     };
 
     OCA.Onlyoffice.FileClick = function (fileName, context) {

From 3378260b4b4ab44d7ecde27165143ef8fefd473d Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 15 Oct 2019 11:41:49 +0300
Subject: [PATCH 04/42] select document for comparing

---
 js/editor.js    | 28 ++++++++++++++++++++++++++++
 l10n/de.js      |  3 ++-
 l10n/de.json    |  3 ++-
 l10n/de_DE.js   |  3 ++-
 l10n/de_DE.json |  3 ++-
 l10n/es.js      |  3 ++-
 l10n/es.json    |  3 ++-
 l10n/fr.js      |  3 ++-
 l10n/fr.json    |  3 ++-
 l10n/pt_BR.js   |  3 ++-
 l10n/pt_BR.json |  3 ++-
 l10n/ru.js      |  3 ++-
 l10n/ru.json    |  3 ++-
 13 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index 64ffef32..67f0b43a 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -113,6 +113,7 @@
                         config.events.onRequestSaveAs = OCA.Onlyoffice.onRequestSaveAs;
                         config.events.onRequestInsertImage = OCA.Onlyoffice.onRequestInsertImage;
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
+                        config.events.onRequestCompareFile = OCA.Onlyoffice.onRequestCompareFile;
                     }
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
@@ -213,6 +214,33 @@
         OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"), setRecipient, false, recipientMimes);
     };
 
+    OCA.Onlyoffice.onRequestCompareFile = function() {
+
+        var setRevised = function(filePath) {
+            $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
+                {
+                    filePath: filePath
+                }),
+                function onSuccess(response) {
+                    if (response.error) {
+                        OC.Notification.show(response.error, {
+                            type: "error",
+                            timeout: 3
+                        });
+                        return;
+                    }
+
+                    OCA.Onlyoffice.docEditor.setRevisedFile(response);
+                });
+        };
+
+        var revisedMimes = [
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+        ];
+
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select file to compare"), setRevised, false, revisedMimes);
+    };
+
     $(document).ready(OCA.Onlyoffice.InitEditor);
 
 })(jQuery, OCA);
diff --git a/l10n/de.js b/l10n/de.js
index a2821ecd..10899c6d 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Show watermark for download hidden shares" : "Wasserzeichen auf ‘Download verbergen’ Freigaben anzeigen",
     "Show watermark for read only link shares" : "Wasserzeichen auf schreibgeschützten Link-Freigaben anzeigen",
     "Show watermark on link shares with specific system tags" : "Wasserzeichen auf Link-Freigaben mit bestimmten System-Tags anzeigen",
-    "Select tag" : "Wähle einen Tag"
+    "Select tag" : "Wähle einen Tag",
+    "Select file to compare" : "Datei zum Vergleich auswählen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de.json b/l10n/de.json
index 9f297568..df181253 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -75,6 +75,7 @@
     "Show watermark for download hidden shares" : "Wasserzeichen auf ‘Download verbergen’ Freigaben anzeigen",
     "Show watermark for read only link shares" : "Wasserzeichen auf schreibgeschützten Link-Freigaben anzeigen",
     "Show watermark on link shares with specific system tags" : "Wasserzeichen auf Link-Freigaben mit bestimmten System-Tags anzeigen",
-    "Select tag" : "Wähle einen Tag"
+    "Select tag" : "Wähle einen Tag",
+    "Select file to compare" : "Datei zum Vergleich auswählen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index fb5c34a6..96f994dc 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Show watermark for download hidden shares" : "Wasserzeichen auf ‘Download verbergen’ Freigaben anzeigen",
     "Show watermark for read only link shares" : "Wasserzeichen auf schreibgeschützten Link-Freigaben anzeigen",
     "Show watermark on link shares with specific system tags" : "Wasserzeichen auf Link-Freigaben mit bestimmten System-Tags anzeigen",
-    "Select tag" : "Wählen Sie ein Tag"
+    "Select tag" : "Wählen Sie ein Tag",
+    "Select file to compare" : "Datei zum Vergleich auswählen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 0df7f0ca..9b3d8910 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -75,6 +75,7 @@
     "Show watermark for download hidden shares" : "Wasserzeichen auf ‘Download verbergen’ Freigaben anzeigen",
     "Show watermark for read only link shares" : "Wasserzeichen auf schreibgeschützten Link-Freigaben anzeigen",
     "Show watermark on link shares with specific system tags" : "Wasserzeichen auf Link-Freigaben mit bestimmten System-Tags anzeigen",
-    "Select tag" : "Wählen Sie ein Tag"
+    "Select tag" : "Wählen Sie ein Tag",
+    "Select file to compare" : "Datei zum Vergleich auswählen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/es.js b/l10n/es.js
index 58258212..d1f7e374 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -60,6 +60,7 @@ OC.L10N.register(
     "Select recipients" : "Seleccionar destinatarios",
     "Secure view enables you to secure documents by embedding a watermark" : "La vista segura permite asegurar documentos mediante la inserción de una marca de agua en ellos",
     "Supported placeholders" : "Marcadores soportados",
-    "Select tag" : "Seleccionar etiqueta"
+    "Select tag" : "Seleccionar etiqueta",
+    "Select file to compare" : "Seleccione un archivo para comparar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/es.json b/l10n/es.json
index 311743bf..2c9598cd 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -58,6 +58,7 @@
     "Select recipients" : "Seleccionar destinatarios",
     "Secure view enables you to secure documents by embedding a watermark" : "La vista segura permite asegurar documentos mediante la inserción de una marca de agua en ellos",
     "Supported placeholders" : "Marcadores soportados",
-    "Select tag" : "Seleccionar etiqueta"
+    "Select tag" : "Seleccionar etiqueta",
+    "Select file to compare" : "Seleccione un archivo para comparar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/l10n/fr.js b/l10n/fr.js
index 8236b78e..0ecc924f 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -58,6 +58,7 @@ OC.L10N.register(
     "File saved" : "Le fichier a été enregistré",
     "Insert image" : "Insérer une image",
     "Select recipients" : "Sélectionner les destinataires",
-    "Select tag" : "Sélectionner une étiquette"
+    "Select tag" : "Sélectionner une étiquette",
+    "Select file to compare" : "Sélectionner fichier à comparer"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/fr.json b/l10n/fr.json
index 2e4ed18d..6c609af2 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -56,6 +56,7 @@
     "File saved" : "Le fichier a été enregistré",
     "Insert image" : "Insérer une image",
     "Select recipients" : "Sélectionner les destinataires",
-    "Select tag" : "Sélectionner une étiquette"
+    "Select tag" : "Sélectionner une étiquette",
+    "Select file to compare" : "Sélectionner fichier à comparer"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index a765e072..99aa6f8f 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -60,6 +60,7 @@ OC.L10N.register(
     "Select recipients" : "Selecione os destinatários",
     "Secure view enables you to secure documents by embedding a watermark" : "A visualização segura permite proteger documentos incorporando uma marca d'água",
     "Supported placeholders" : "Espaços reservados suportados",
-    "Select tag" : "Selecionar etiqueta"
+    "Select tag" : "Selecionar etiqueta",
+    "Select file to compare" : "Selecionar arquivo para comparar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 1ea90a4d..f0181e99 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -58,6 +58,7 @@
     "Select recipients" : "Selecione os destinatários",
     "Secure view enables you to secure documents by embedding a watermark" : "A visualização segura permite proteger documentos incorporando uma marca d'água",
     "Supported placeholders" : "Espaços reservados suportados",
-    "Select tag" : "Selecionar etiqueta"
+    "Select tag" : "Selecionar etiqueta",
+    "Select file to compare" : "Selecionar arquivo para comparar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
diff --git a/l10n/ru.js b/l10n/ru.js
index 68293b44..779b7b92 100644
--- a/l10n/ru.js
+++ b/l10n/ru.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Show watermark for download hidden shares" : "Отображать водяной знак при доступе без скачивания",
     "Show watermark for read only link shares" : "Отображать водяной знак при доступе только на чтение по ссылке",
     "Show watermark on link shares with specific system tags" : "Отображать водяной знак при доступе по ссылке с определенными системными метками",
-    "Select tag" : "Выберите метку"
+    "Select tag" : "Выберите метку",
+    "Select file to compare" : "Выбрать файл для сравнения"
 },
 "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 422cb052..7f393ce2 100644
--- a/l10n/ru.json
+++ b/l10n/ru.json
@@ -75,6 +75,7 @@
     "Show watermark for download hidden shares" : "Отображать водяной знак при доступе без скачивания",
     "Show watermark for read only link shares" : "Отображать водяной знак при доступе только на чтение по ссылке",
     "Show watermark on link shares with specific system tags" : "Отображать водяной знак при доступе по ссылке с определенными системными метками",
-    "Select tag" : "Выберите метку"
+    "Select tag" : "Выберите метку",
+    "Select file to compare" : "Выбрать файл для сравнения"
 },"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

From 0192f7bfb32af5d481e031b942b59fd714219432 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 27 Nov 2019 12:10:21 +0300
Subject: [PATCH 05/42] inframe param

---
 controller/editorcontroller.php | 17 +++++++++++------
 js/editor.js                    |  6 +++++-
 js/main.js                      |  2 +-
 templates/editor.php            |  6 +++++-
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 23a79193..a9363df2 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -474,15 +474,16 @@ public function url($filePath) {
      * Print editor section
      *
      * @param integer $fileId - file identifier
-     * @param string $shareToken - access token
      * @param string $filePath - file path
+     * @param string $shareToken - access token
+     * @param bool $inframe - open in frame
      *
      * @return TemplateResponse|RedirectResponse
      *
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function index($fileId, $shareToken = NULL, $filePath = NULL) {
+    public function index($fileId, $filePath = NULL, $shareToken = NULL, $inframe = false) {
         $this->logger->debug("Open: $fileId $filePath", array("app" => $this->appName));
 
         if (empty($shareToken) && !$this->userSession->isLoggedIn()) {
@@ -510,7 +511,8 @@ public function index($fileId, $shareToken = NULL, $filePath = NULL) {
             "shareToken" => $shareToken
         ];
 
-        if ($this->config->GetSameTab() && empty($shareToken)) {
+        if ($inframe === true) {
+            $params["inframe"] = true;
             $response = new TemplateResponse($this->appName, "editor", $params, "plain");
         } else {
             $response = new TemplateResponse($this->appName, "editor", $params);
@@ -543,7 +545,7 @@ public function index($fileId, $shareToken = NULL, $filePath = NULL) {
      * @PublicPage
      */
     public function PublicPage($fileId, $shareToken) {
-        return $this->index($fileId, $shareToken);
+        return $this->index($fileId, null, $shareToken);
     }
 
     /**
@@ -552,6 +554,7 @@ public function PublicPage($fileId, $shareToken) {
      * @param integer $fileId - file identifier
      * @param string $filePath - file path
      * @param string $shareToken - access token
+     * @param bool $inframe - open in frame
      * @param bool $desktop - desktop label
      *
      * @return array
@@ -559,7 +562,7 @@ public function PublicPage($fileId, $shareToken) {
      * @NoAdminRequired
      * @PublicPage
      */
-    public function config($fileId, $filePath = NULL, $shareToken = NULL, $desktop = false) {
+    public function config($fileId, $filePath = NULL, $shareToken = NULL, $inframe = false, $desktop = false) {
 
         if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
             return ["error" => $this->trans->t("Not permitted")];
@@ -684,7 +687,9 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $desktop =
             if (!$desktop) {
                 if ($this->config->GetSameTab()) {
                     $params["editorConfig"]["customization"]["goback"]["blank"] = false;
-                    $params["editorConfig"]["customization"]["goback"]["requestClose"] = true;
+                    if ($inframe === true) {
+                        $params["editorConfig"]["customization"]["goback"]["requestClose"] = true;
+                    }
                 }
             }
         }
diff --git a/js/editor.js b/js/editor.js
index 28edfad7..a4a533c1 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -42,6 +42,7 @@
         var fileId = $("#iframeEditor").data("id");
         var filePath = $("#iframeEditor").data("path");
         var shareToken = $("#iframeEditor").data("sharetoken");
+        var inframe = $("#iframeEditor").data("inframe");
         if (!fileId && !shareToken) {
             displayError(t(OCA.Onlyoffice.AppName, "FileId is empty"));
             return;
@@ -64,6 +65,9 @@
         if (shareToken) {
             params.push("shareToken=" + encodeURIComponent(shareToken));
         }
+        if (!!inframe) {
+            params.push("inframe=true");
+        }
         if (OCA.Onlyoffice.Desktop) {
             params.push("desktop=true");
         }
@@ -115,7 +119,7 @@
                         config.events.onRequestInsertImage = OCA.Onlyoffice.onRequestInsertImage;
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
                     }
-                    if (window.self !== window.parent) {
+                    if (!!inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
                     }
 
diff --git a/js/main.js b/js/main.js
index 144a8493..8e49ac7b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -102,7 +102,7 @@
         } else if ($("#isPublic").val()) {
             location.href = url;
         } else {
-            var $iframe = $("<iframe id=\"onlyofficeFrame\" nonce=\"" + btoa(OC.requestToken) + "\" scrolling=\"no\" allowfullscreen src=\"" + url + "\" />");
+            var $iframe = $("<iframe id=\"onlyofficeFrame\" nonce=\"" + btoa(OC.requestToken) + "\" scrolling=\"no\" allowfullscreen src=\"" + url + "&inframe=true\" />");
             $("#app-content").append($iframe);
 
             $("body").addClass("onlyoffice-inline");
diff --git a/templates/editor.php b/templates/editor.php
index ced8968b..ec96ccbf 100644
--- a/templates/editor.php
+++ b/templates/editor.php
@@ -34,7 +34,11 @@
 
 <div id="app">
 
-    <div id="iframeEditor" data-id="<?php p($_["fileId"]) ?>" data-path="<?php p($_["filePath"]) ?>" data-sharetoken="<?php p($_["shareToken"]) ?>"></div>
+    <div id="iframeEditor"
+        data-id="<?php p($_["fileId"]) ?>"
+        data-path="<?php p($_["filePath"]) ?>"
+        data-sharetoken="<?php p($_["shareToken"]) ?>"
+        data-inframe="<?php p($_["inframe"]) ?>"></div>
 
     <?php if (!empty($_["documentServerUrl"])) { ?>
         <script nonce="<?php p(base64_encode($_["requesttoken"])) ?>"

From beeff18dc3aa22b8d037c12dabd9a92146f8f527 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 27 Nov 2019 12:11:42 +0300
Subject: [PATCH 06/42] close sidebar on opening frame

---
 js/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/main.js b/js/main.js
index 8e49ac7b..0c25482e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -106,6 +106,7 @@
             $("#app-content").append($iframe);
 
             $("body").addClass("onlyoffice-inline");
+            OC.Apps.hideAppSidebar();
 
             $("html, body").scrollTop(0);
 

From 4d3c0224fa85d1507d9d1d2b16f7e1d71b038cdf Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 27 Nov 2019 12:25:47 +0300
Subject: [PATCH 07/42] split editor event and method

---
 js/editor.js | 130 +++++++++++++++++++++++++--------------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index a4a533c1..2102aa03 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -133,57 +133,40 @@
         });
     };
 
-    OCA.Onlyoffice.onRequestSaveAs = function(event) {
-        var title = event.data.title;
-        var url = event.data.url;
-
-        var saveAs = function(fileDir) {
-            var saveData = {
-                name: title,
-                dir: fileDir,
-                url: url
-            };
-
-            $.post(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/save"),
-                saveData,
-                function onSuccess(response) {
-                    if (response.error) {
-                        OC.Notification.show(response.error, {
-                            type: "error",
-                            timeout: 3
-                        });
-                        return;
-                    }
-
-                    OC.Notification.show(t(OCA.Onlyoffice.AppName, "File saved") + " (" + response.name + ")", {
-                        timeout: 3
-                    });
-                });
+    OCA.Onlyoffice.onRequestSaveAs = function (event) {
+        var saveData = {
+            name: event.data.title,
+            url: event.data.url
         };
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Save as"), saveAs, false, "httpd/unix-directory");
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Save as"),
+            function (fileDir) {
+                saveData.dir = fileDir;
+                OCA.Onlyoffice.editorSaveAs(saveData);
+            },
+            false,
+            "httpd/unix-directory");
     };
 
-    OCA.Onlyoffice.onRequestInsertImage = function() {
-
-        var insertImage = function(filePath) {
-            $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
-                {
-                    filePath: filePath
-                }),
-                function onSuccess(response) {
-                    if (response.error) {
-                        OC.Notification.show(response.error, {
-                            type: "error",
-                            timeout: 3
-                        });
-                        return;
-                    }
+    OCA.Onlyoffice.editorSaveAs = function (saveData) {
+        $.post(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/save"),
+            saveData,
+            function onSuccess(response) {
+                if (response.error) {
+                    OC.Notification.show(response.error, {
+                        type: "error",
+                        timeout: 3
+                    });
+                    return;
+                }
 
-                    OCA.Onlyoffice.docEditor.insertImage(response);
+                OC.Notification.show(t(OCA.Onlyoffice.AppName, "File saved") + " (" + response.name + ")", {
+                    timeout: 3
                 });
-        };
+            });
+    };
 
+    OCA.Onlyoffice.onRequestInsertImage = function () {
         var imageMimes = [
             "image/bmp", "image/x-bmp", "image/x-bitmap", "application/bmp",
             "image/gif",
@@ -191,37 +174,54 @@
             "image/png", "image/x-png", "application/png", "application/x-png"
         ];
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Insert image"), insertImage, false, imageMimes);
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Insert image"), OCA.Onlyoffice.editorInsertImage, false, imageMimes);
     };
 
-    OCA.Onlyoffice.onRequestMailMergeRecipients = function() {
-
-        var setRecipient = function(filePath) {
-            $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
-                {
-                    filePath: filePath
-                }),
-                function onSuccess(response) {
-                    if (response.error) {
-                        OC.Notification.show(response.error, {
-                            type: "error",
-                            timeout: 3
-                        });
-                        return;
-                    }
+    OCA.Onlyoffice.editorInsertImage = function (filePath) {
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
+            {
+                filePath: filePath
+            }),
+            function onSuccess(response) {
+                if (response.error) {
+                    OC.Notification.show(response.error, {
+                        type: "error",
+                        timeout: 3
+                    });
+                    return;
+                }
 
-                    OCA.Onlyoffice.docEditor.setMailMergeRecipients(response);
-                });
-        };
+                OCA.Onlyoffice.docEditor.insertImage(response);
+            });
+    };
 
+    OCA.Onlyoffice.onRequestMailMergeRecipients = function () {
         var recipientMimes = [
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         ];
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"), setRecipient, false, recipientMimes);
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"), OCA.Onlyoffice.editorSetRecipient, false, recipientMimes);
+    };
+
+    OCA.Onlyoffice.editorSetRecipient = function (filePath) {
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
+            {
+                filePath: filePath
+            }),
+            function onSuccess(response) {
+                if (response.error) {
+                    OC.Notification.show(response.error, {
+                        type: "error",
+                        timeout: 3
+                    });
+                    return;
+                }
+
+                OCA.Onlyoffice.docEditor.setMailMergeRecipients(response);
+            });
     };
 
-    OCA.Onlyoffice.onRequestClose = function() {
+    OCA.Onlyoffice.onRequestClose = function () {
         window.parent.postMessage("editorRequestClose");
     };
 

From ea95a6cc57ea40c56c5740bfb1cf09689f1a6342 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 27 Nov 2019 13:11:50 +0300
Subject: [PATCH 08/42] open filepicker on parent window

---
 js/editor.js | 55 +++++++++++++++++++++++++++++++++++++---------------
 js/main.js   | 38 ++++++++++++++++++++++++++++++++++--
 2 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index 2102aa03..49a75673 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -29,7 +29,8 @@
 (function ($, OCA) {
 
     OCA.Onlyoffice = _.extend({
-            AppName: "onlyoffice"
+            AppName: "onlyoffice",
+            inframe: false
         }, OCA.Onlyoffice);
 
     OCA.Onlyoffice.InitEditor = function () {
@@ -42,7 +43,7 @@
         var fileId = $("#iframeEditor").data("id");
         var filePath = $("#iframeEditor").data("path");
         var shareToken = $("#iframeEditor").data("sharetoken");
-        var inframe = $("#iframeEditor").data("inframe");
+        OCA.Onlyoffice.inframe = !!$("#iframeEditor").data("inframe");
         if (!fileId && !shareToken) {
             displayError(t(OCA.Onlyoffice.AppName, "FileId is empty"));
             return;
@@ -65,7 +66,7 @@
         if (shareToken) {
             params.push("shareToken=" + encodeURIComponent(shareToken));
         }
-        if (!!inframe) {
+        if (OCA.Onlyoffice.inframe) {
             params.push("inframe=true");
         }
         if (OCA.Onlyoffice.Desktop) {
@@ -113,13 +114,12 @@
                         "onDocumentStateChange": setPageTitle,
                     };
 
-                    if (OC.currentUser) {
-                        //todo: in frame use postMessage
+                    if (OCA.Onlyoffice.inframe || OC.currentUser) {
                         config.events.onRequestSaveAs = OCA.Onlyoffice.onRequestSaveAs;
                         config.events.onRequestInsertImage = OCA.Onlyoffice.onRequestInsertImage;
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
                     }
-                    if (!!inframe) {
+                    if (OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
                     }
 
@@ -139,13 +139,20 @@
             url: event.data.url
         };
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Save as"),
-            function (fileDir) {
-                saveData.dir = fileDir;
-                OCA.Onlyoffice.editorSaveAs(saveData);
-            },
-            false,
-            "httpd/unix-directory");
+        if (OCA.Onlyoffice.inframe) {
+            window.parent.postMessage({
+                method: "editorRequestSaveAs",
+                param: saveData
+            });
+        } else {
+            OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Save as"),
+                function (fileDir) {
+                    saveData.dir = fileDir;
+                    OCA.Onlyoffice.editorSaveAs(saveData);
+                },
+                false,
+                "httpd/unix-directory");
+        }
     };
 
     OCA.Onlyoffice.editorSaveAs = function (saveData) {
@@ -174,7 +181,14 @@
             "image/png", "image/x-png", "application/png", "application/x-png"
         ];
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Insert image"), OCA.Onlyoffice.editorInsertImage, false, imageMimes);
+        if (OCA.Onlyoffice.inframe) {
+            window.parent.postMessage({
+                method: "editorRequestInsertImage",
+                param: imageMimes
+            });
+        } else {
+            OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Insert image"), OCA.Onlyoffice.editorInsertImage, false, imageMimes);
+        }
     };
 
     OCA.Onlyoffice.editorInsertImage = function (filePath) {
@@ -200,7 +214,14 @@
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         ];
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"), OCA.Onlyoffice.editorSetRecipient, false, recipientMimes);
+        if (OCA.Onlyoffice.inframe) {
+            window.parent.postMessage({
+                method: "editorRequestMailMergeRecipients",
+                param: recipientMimes
+            });
+        } else {
+            OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"), OCA.Onlyoffice.editorSetRecipient, false, recipientMimes);
+        }
     };
 
     OCA.Onlyoffice.editorSetRecipient = function (filePath) {
@@ -222,7 +243,9 @@
     };
 
     OCA.Onlyoffice.onRequestClose = function () {
-        window.parent.postMessage("editorRequestClose");
+        window.parent.postMessage({
+            method: "editorRequestClose"
+        });
     };
 
     $(document).ready(OCA.Onlyoffice.InitEditor);
diff --git a/js/main.js b/js/main.js
index 0c25482e..d72f1806 100644
--- a/js/main.js
+++ b/js/main.js
@@ -183,6 +183,30 @@
         }
     };
 
+    OCA.Onlyoffice.onRequestSaveAs = function (saveData) {
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Save as"),
+            function (fileDir) {
+                saveData.dir = fileDir;
+                $("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.editorSaveAs(saveData);
+            },
+            false,
+            "httpd/unix-directory");
+    };
+
+    OCA.Onlyoffice.onRequestInsertImage = function (imageMimes) {
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Insert image"),
+            $("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.editorInsertImage,
+            false,
+            imageMimes);
+    };
+
+    OCA.Onlyoffice.onRequestMailMergeRecipients = function (recipientMimes) {
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select recipients"),
+            $("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.editorSetRecipient,
+            false,
+            recipientMimes);
+    };
+
     OCA.Onlyoffice.FileList = {
         attach: function (fileList) {
             if (fileList.id == "trashbin") {
@@ -307,13 +331,23 @@
     };
 
     window.addEventListener("message", function(event) {
-        if ($("#onlyofficeFrame")[0].contentWindow !== event.source) {
+        if ($("#onlyofficeFrame")[0].contentWindow !== event.source
+            || !event.data["method"]) {
             return;
         }
-        switch (event.data) {
+        switch (event.data.method) {
             case "editorRequestClose":
                 OCA.Onlyoffice.CloseEditor();
                 break;
+            case "editorRequestSaveAs":
+                OCA.Onlyoffice.onRequestSaveAs(event.data.param);
+                break;
+            case "editorRequestInsertImage":
+                OCA.Onlyoffice.onRequestInsertImage(event.data.param);
+                break;
+            case "editorRequestMailMergeRecipients":
+                OCA.Onlyoffice.onRequestMailMergeRecipients(event.data.param);
+                break;
         }
     }, false);
 

From c494973d3e1e2d6eafb6115a7095b1a8c78046c0 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 26 Nov 2019 16:57:55 +0300
Subject: [PATCH 09/42] onRequestSharingSettings

---
 js/editor.js |  7 +++++++
 js/main.js   | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/js/editor.js b/js/editor.js
index 49a75673..ba36ca17 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -121,6 +121,7 @@
                     }
                     if (OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
+                        config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings;
                     }
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
@@ -248,6 +249,12 @@
         });
     };
 
+    OCA.Onlyoffice.onRequestSharingSettings = function() {
+        window.parent.postMessage({
+            method: "editorRequestSharingSettings"
+        });
+    };
+
     $(document).ready(OCA.Onlyoffice.InitEditor);
 
 })(jQuery, OCA);
diff --git a/js/main.js b/js/main.js
index d72f1806..53f15ee3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -30,6 +30,7 @@
 
     OCA.Onlyoffice = _.extend({
             AppName: "onlyoffice",
+            context: null,
             folderUrl: null
         }, OCA.Onlyoffice);
 
@@ -72,6 +73,9 @@
                 fileList.add(response, { animate: true });
                 OCA.Onlyoffice.OpenEditor(response.id, dir, response.name, winEditor);
 
+                OCA.Onlyoffice.context = { fileList: fileList };
+                OCA.Onlyoffice.context.fileName = response.name;
+
                 OC.Notification.show(t(OCA.Onlyoffice.AppName, "File created"), {
                     timeout: 3
                 });
@@ -120,6 +124,8 @@
 
         $("#onlyofficeFrame").remove();
 
+        OCA.Onlyoffice.context = null;
+
         var url = OCA.Onlyoffice.folderUrl;
         if (!!url) {
             window.history.pushState(null, null, url);
@@ -127,9 +133,23 @@
         }
     };
 
+    OCA.Onlyoffice.OpenShareDialog = function () {
+        if (OCA.Onlyoffice.context) {
+            if (!$("#app-sidebar").is(":visible")) {
+                OCA.Onlyoffice.context.fileList.showDetailsView(OCA.Onlyoffice.context.fileName, "shareTabView");
+                OC.Apps.showAppSidebar();
+            } else {
+                OC.Apps.hideAppSidebar();
+            }
+        }
+    };
+
     OCA.Onlyoffice.FileClick = function (fileName, context) {
         var fileInfoModel = context.fileInfoModel || context.fileList.getModelForFile(fileName);
         OCA.Onlyoffice.OpenEditor(fileInfoModel.id, context.dir, fileName);
+
+        OCA.Onlyoffice.context = context;
+        OCA.Onlyoffice.context.fileName = fileName;
     };
 
     OCA.Onlyoffice.FileConvertClick = function (fileName, context) {
@@ -339,6 +359,9 @@
             case "editorRequestClose":
                 OCA.Onlyoffice.CloseEditor();
                 break;
+            case "editorRequestSharingSettings":
+                OCA.Onlyoffice.OpenShareDialog();
+                break;
             case "editorRequestSaveAs":
                 OCA.Onlyoffice.onRequestSaveAs(event.data.param);
                 break;

From 78fac31599d3f4f271f775615b19503dd30f7a0f Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 3 Dec 2019 15:18:35 +0300
Subject: [PATCH 10/42] direct editor

---
 appinfo/application.php |  22 +++-
 appinfo/info.xml        |   2 +-
 lib/directeditor.php    | 216 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 2 deletions(-)
 create mode 100644 lib/directeditor.php

diff --git a/appinfo/application.php b/appinfo/application.php
index 4aac65e5..55fd4a6e 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -30,6 +30,7 @@
 namespace OCA\Onlyoffice\AppInfo;
 
 use OCP\AppFramework\App;
+use OCP\DirectEditing\RegisterDirectEditorEvent;
 use OCP\Share\IManager;
 use OCP\Util;
 
@@ -38,6 +39,7 @@
 use OCA\Onlyoffice\Controller\EditorController;
 use OCA\Onlyoffice\Controller\SettingsController;
 use OCA\Onlyoffice\Crypt;
+use OCA\Onlyoffice\DirectEditor;
 
 class Application extends App {
 
@@ -111,6 +113,24 @@ function() {
             return $c->query("ServerContainer")->getURLGenerator();
         });
 
+        $container->registerService("DirectEditor", function($c) {
+            return new DirectEditor(
+                $c->query("AppName"),
+                $c->query("L10N"),
+                $c->query("Logger"),
+                $this->appConfig
+            );
+        });
+
+
+        $eventDispatcher->addListener(RegisterDirectEditorEvent::class,
+            function (RegisterDirectEditorEvent $event) use ($container) {
+                if (!empty($this->appConfig->GetDocumentServerUrl()) && $this->appConfig->SettingsAreSuccessful()) {
+                    $editor = $container->query("DirectEditor");
+                    $event->register($editor);
+                }
+            });
+
 
         // Controllers
         $container->registerService("SettingsController", function($c) {
@@ -157,4 +177,4 @@ function() {
             );
         });
     }
-}
\ No newline at end of file
+}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index fe0cd90e..9f29a304 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -29,7 +29,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/new.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <dependencies>
-        <nextcloud min-version="15" max-version="17"/>
+        <nextcloud min-version="15" max-version="18"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>
diff --git a/lib/directeditor.php b/lib/directeditor.php
new file mode 100644
index 00000000..25ce62ca
--- /dev/null
+++ b/lib/directeditor.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2019
+ *
+ * This program is a free software product.
+ * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License
+ * (AGPL) version 3 as published by the Free Software Foundation.
+ * In accordance with Section 7(a) of the GNU AGPL 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 FITNESS FOR A PARTICULAR PURPOSE.
+ * For details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions of the Program
+ * must display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product logo when distributing the program.
+ * Pursuant to Section 7(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as well as technical
+ * writing content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International.
+ * See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+namespace OCA\Onlyoffice;
+
+use OCP\AppFramework\Http\NotFoundResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\DirectEditing\IEditor;
+use OCP\DirectEditing\IToken;
+use OCP\IL10N;
+use OCP\ILogger;
+
+use OCA\Onlyoffice\AppConfig;
+
+/**
+ * Direct Editor
+ *
+ * @package OCA\Onlyoffice
+ */
+class DirectEditor implements IEditor {
+
+    /**
+     * Application name
+     *
+     * @var string
+     */
+    private $appName;
+
+    /**
+     * l10n service
+     *
+     * @var IL10N
+     */
+    private $trans;
+
+    /**
+     * Logger
+     *
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * Application configuration
+     *
+     * @var OCA\Onlyoffice\AppConfig
+     */
+    private $config;
+
+    /**
+     * @param string $AppName - application name
+     * @param IL10N $trans - l10n service
+     * @param ILogger $logger - logger
+     * @param OCA\Onlyoffice\AppConfig $config - application configuration
+     */
+    public function __construct($AppName,
+                                IL10N $trans,
+                                ILogger $logger,
+                                AppConfig $config) {
+        $this->appName = $AppName;
+        $this->trans = $trans;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * Return a unique identifier for the editor
+     *
+     * @return string
+     */
+    public function getId(): string {
+        return $this->appName;
+    }
+
+    /**
+     * Return a readable name for the editor
+     *
+     * @return string
+     */
+    public function getName(): string {
+        return $this->appName;
+    }
+
+    /**
+     * A list of mimetypes that should open the editor by default
+     *
+     * @return array
+     */
+    public function getMimetypes(): array {
+        $mimes = array();
+        $formats = $this->config->FormatsSetting();
+        foreach ($formats as $format => $setting) {
+            if (array_key_exists("def", $setting) && $setting["def"]) {
+                array_push($mimes, $setting["mime"]);
+            }
+        }
+
+        return $mimes;
+    }
+
+    /**
+     * A list of mimetypes that can be opened in the editor optionally
+     *
+     * @return array
+     */
+    public function getMimetypesOptional(): array {
+        $mimes = array();
+        $formats = $this->config->FormatsSetting();
+        foreach ($formats as $format => $setting) {
+            if (!array_key_exists("def", $setting) || !$setting["def"]) {
+                array_push($mimes, $setting["mime"]);
+            }
+        }
+
+        return $mimes;
+    }
+
+    /**
+     * Return a list of file creation options to be presented to the user
+     *
+     * @return array of ACreateFromTemplate|ACreateEmpty
+     */
+    public function getCreators(): array {
+        return [];
+    }
+
+    /**
+     * Return if the view is able to securely view a file without downloading it to the browser
+     *
+     * @return bool
+     */
+    public function isSecure(): bool {
+        return true;
+    }
+
+    /**
+     * Return a template response for displaying the editor
+     *
+     * open can only be called once when the client requests the editor with a one-time-use token
+     * For handling editing and later requests, editors need to impelement their own token handling
+     * and take care of invalidation
+     *
+     * @param IToken $token
+     * @return Response
+     */
+    public function open(IToken $token): Response {
+        try {
+            $token->useTokenScope();
+            $fileId = $token->getFile()->getId();
+            $this->logger->debug("DirectEditor open: $fileId", array("app" => $this->appName));
+
+            $documentServerUrl = $this->config->GetDocumentServerUrl();
+
+            if (empty($documentServerUrl)) {
+                $this->logger->error("documentServerUrl is empty", array("app" => $this->appName));
+                return $this->renderError($this->trans->t("ONLYOFFICE app is not configured. Please contact admin"));
+            }
+
+            $params = [
+                "documentServerUrl" => $documentServerUrl,
+                "fileId" => $fileId
+            ];
+
+            return new TemplateResponse($this->appName, "editor", $params);
+        } catch (\Exception $e) {
+            $this->logger->error("DirectEditor open: " . $e->getMessage(), array("app" => $this->appName));
+            return $this->renderError($e->getMessage());
+        }
+    }
+
+    /**
+     * Print error page
+     *
+     * @param string $error - error message
+     * @param string $hint - error hint
+     *
+     * @return TemplateResponse
+     */
+    private function renderError($error, $hint = "") {
+        return new TemplateResponse("", "error", array(
+                "errors" => array(
+                    array(
+                        "error" => $error,
+                        "hint" => $hint
+                    )
+                )
+        ), "error");
+    }
+}

From a9d5d3dba1837ecc7501f331704b5fdeaef69d52 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 3 Dec 2019 16:21:54 +0300
Subject: [PATCH 11/42] csp

---
 appinfo/application.php |  1 +
 lib/directeditor.php    | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/appinfo/application.php b/appinfo/application.php
index 55fd4a6e..8c40dde0 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -116,6 +116,7 @@ function() {
         $container->registerService("DirectEditor", function($c) {
             return new DirectEditor(
                 $c->query("AppName"),
+                $c->query("URLGenerator"),
                 $c->query("L10N"),
                 $c->query("Logger"),
                 $this->appConfig
diff --git a/lib/directeditor.php b/lib/directeditor.php
index 25ce62ca..a97cd37b 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -29,6 +29,7 @@
 
 namespace OCA\Onlyoffice;
 
+use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -36,6 +37,7 @@
 use OCP\DirectEditing\IToken;
 use OCP\IL10N;
 use OCP\ILogger;
+use OCP\IURLGenerator;
 
 use OCA\Onlyoffice\AppConfig;
 
@@ -53,6 +55,13 @@ class DirectEditor implements IEditor {
      */
     private $appName;
 
+    /**
+     * Url generator service
+     *
+     * @var IURLGenerator
+     */
+    private $urlGenerator;
+
     /**
      * l10n service
      *
@@ -76,15 +85,18 @@ class DirectEditor implements IEditor {
 
     /**
      * @param string $AppName - application name
+     * @param IURLGenerator $urlGenerator - url generator service
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
      * @param OCA\Onlyoffice\AppConfig $config - application configuration
      */
     public function __construct($AppName,
+                                IURLGenerator $urlGenerator,
                                 IL10N $trans,
                                 ILogger $logger,
                                 AppConfig $config) {
         $this->appName = $AppName;
+        $this->urlGenerator = $urlGenerator;
         $this->trans = $trans;
         $this->logger = $logger;
         $this->config = $config;
@@ -188,7 +200,20 @@ public function open(IToken $token): Response {
                 "fileId" => $fileId
             ];
 
-            return new TemplateResponse($this->appName, "editor", $params);
+            $response = new TemplateResponse($this->appName, "editor", $params);
+
+            $csp = new ContentSecurityPolicy();
+            $csp->allowInlineScript(true);
+
+            if (preg_match("/^https?:\/\//i", $documentServerUrl)) {
+                $csp->addAllowedScriptDomain($documentServerUrl);
+                $csp->addAllowedFrameDomain($documentServerUrl);
+            } else {
+                $csp->addAllowedFrameDomain($this->urlGenerator->getAbsoluteURL("/"));
+            }
+            $response->setContentSecurityPolicy($csp);
+
+            return $response;
         } catch (\Exception $e) {
             $this->logger->error("DirectEditor open: " . $e->getMessage(), array("app" => $this->appName));
             return $this->renderError($e->getMessage());

From 762c96df4e902b496371b852cdae554b0ab317e6 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 3 Dec 2019 17:10:42 +0300
Subject: [PATCH 12/42] directToken

---
 appinfo/application.php             | 10 ++++--
 controller/callbackcontroller.php   |  4 +--
 controller/editorcontroller.php     | 54 ++++++++++++++++++++++-------
 controller/federationcontroller.php |  2 +-
 js/editor.js                        |  8 +++--
 lib/directeditor.php                | 18 ++++++++--
 templates/editor.php                |  6 +++-
 7 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/appinfo/application.php b/appinfo/application.php
index 8c40dde0..fccb5c45 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -105,6 +105,10 @@ function() {
             return $c->query("ServerContainer")->getUserSession();
         });
 
+        $container->registerService("UserManager", function($c) {
+            return $c->query("ServerContainer")->getUserManager();
+        });
+
         $container->registerService("Logger", function($c) {
             return $c->query("ServerContainer")->getLogger();
         });
@@ -119,7 +123,8 @@ function() {
                 $c->query("URLGenerator"),
                 $c->query("L10N"),
                 $c->query("Logger"),
-                $this->appConfig
+                $this->appConfig,
+                $this->crypt
             );
         });
 
@@ -152,6 +157,7 @@ function (RegisterDirectEditorEvent $event) use ($container) {
                 $c->query("Request"),
                 $c->query("RootStorage"),
                 $c->query("UserSession"),
+                $c->query("UserManager"),
                 $c->query("URLGenerator"),
                 $c->query("L10N"),
                 $c->query("Logger"),
@@ -169,7 +175,7 @@ function (RegisterDirectEditorEvent $event) use ($container) {
                 $c->query("Request"),
                 $c->query("RootStorage"),
                 $c->query("UserSession"),
-                $c->query("ServerContainer")->getUserManager(),
+                $c->query("UserManager"),
                 $c->query("L10N"),
                 $c->query("Logger"),
                 $this->appConfig,
diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
index 2245086a..393aacb2 100644
--- a/controller/callbackcontroller.php
+++ b/controller/callbackcontroller.php
@@ -132,7 +132,7 @@ class CallbackController extends Controller {
      * @param string $AppName - application name
      * @param IRequest $request - request object
      * @param IRootFolder $root - root folder
-     * @param IUserSession $userSession - user session
+     * @param IUserSession $userSession - current user session
      * @param IUserManager $userManager - user manager
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
@@ -611,4 +611,4 @@ private function retryOperation(callable $operation) {
             usleep(500000);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 1207c239..cffdfd60 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -45,6 +45,7 @@
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IURLGenerator;
+use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
@@ -70,6 +71,13 @@ class EditorController extends Controller {
      */
     private $userSession;
 
+    /**
+     * User manager
+     *
+     * @var IUserManager
+     */
+    private $userManager;
+
     /**
      * Root folder
      *
@@ -129,6 +137,7 @@ class EditorController extends Controller {
      * @param IRequest $request - request object
      * @param IRootFolder $root - root folder
      * @param IUserSession $userSession - current user session
+     * @param IUserManager $userManager - user manager
      * @param IURLGenerator $urlGenerator - url generator service
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
@@ -141,6 +150,7 @@ public function __construct($AppName,
                                     IRequest $request,
                                     IRootFolder $root,
                                     IUserSession $userSession,
+                                    IUserManager $userManager,
                                     IURLGenerator $urlGenerator,
                                     IL10N $trans,
                                     ILogger $logger,
@@ -152,6 +162,7 @@ public function __construct($AppName,
         parent::__construct($AppName, $request);
 
         $this->userSession = $userSession;
+        $this->userManager = $userManager;
         $this->root = $root;
         $this->urlGenerator = $urlGenerator;
         $this->trans = $trans;
@@ -543,6 +554,7 @@ public function PublicPage($fileId, $shareToken) {
      * @param integer $fileId - file identifier
      * @param string $filePath - file path
      * @param string $shareToken - access token
+     * @param string $directToken - direct token
      * @param bool $desktop - desktop label
      *
      * @return array
@@ -550,16 +562,32 @@ public function PublicPage($fileId, $shareToken) {
      * @NoAdminRequired
      * @PublicPage
      */
-    public function config($fileId, $filePath = NULL, $shareToken = NULL, $desktop = false) {
+    public function config($fileId, $filePath = NULL, $shareToken = NULL, $directToken = null, $desktop = false) {
 
         if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
-            return ["error" => $this->trans->t("Not permitted")];
-        }
+            if (empty($directToken)) {
+                return ["error" => $this->trans->t("Not permitted")];
+            } else {
+                list ($directData, $error) = $this->crypt->ReadHash($directToken);
+                if ($directData === NULL) {
+                    $this->logger->error("Config for directEditor with empty or not correct hash: $error", array("app" => $this->appName));
+                    return ["error" => $this->trans->t("Not permitted")];
+                }
+                if ($directData->action !== "direct") {
+                    $this->logger->error("Config for directEditor with other data", array("app" => $this->appName));
+                    return ["error" => $this->trans->t("Invalid request")];
+                }
 
-        $user = $this->userSession->getUser();
-        $userId = NULL;
-        if (!empty($user)) {
-            $userId = $user->getUID();
+                $fileId = $directData->fileId;
+                $userId = $directData->userId;
+                $user = $this->userManager->get($userId); 
+            }
+        } else {
+            $user = $this->userSession->getUser();
+            $userId = NULL;
+            if (!empty($user)) {
+                $userId = $user->getUID();
+            }
         }
 
         list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId, $filePath) : $this->fileUtility->getFileByToken($fileId, $shareToken);
@@ -965,10 +993,12 @@ private function getWatermarkText($isPublic, $userId, $file, $canEdit, $canDownl
      */
     private function renderError($error, $hint = "") {
         return new TemplateResponse("", "error", array(
-                "errors" => array(array(
-                "error" => $error,
-                "hint" => $hint
-            ))
+                "errors" => array(
+                    array(
+                        "error" => $error,
+                        "hint" => $hint
+                    )
+                )
         ), "error");
     }
-}
\ No newline at end of file
+}
diff --git a/controller/federationcontroller.php b/controller/federationcontroller.php
index 1be87c75..a3117cb9 100644
--- a/controller/federationcontroller.php
+++ b/controller/federationcontroller.php
@@ -123,4 +123,4 @@ public function key($shareToken, $path) {
 
         return new DataResponse(["key" => $key]);
     }
-}
\ No newline at end of file
+}
diff --git a/js/editor.js b/js/editor.js
index 64ffef32..ea9b6f77 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -40,9 +40,9 @@
         };
 
         var fileId = $("#iframeEditor").data("id");
-        var filePath = $("#iframeEditor").data("path");
         var shareToken = $("#iframeEditor").data("sharetoken");
-        if (!fileId && !shareToken) {
+        var directToken = $("#iframeEditor").data("directtoken");
+        if (!fileId && !shareToken && !directToken) {
             displayError(t(OCA.Onlyoffice.AppName, "FileId is empty"));
             return;
         }
@@ -58,12 +58,16 @@
             });
 
         var params = [];
+        var filePath = $("#iframeEditor").data("path");
         if (filePath) {
             params.push("filePath=" + encodeURIComponent(filePath));
         }
         if (shareToken) {
             params.push("shareToken=" + encodeURIComponent(shareToken));
         }
+        if (directToken) {
+            params.push("directToken=" + encodeURIComponent(directToken));
+        }
         if (OCA.Onlyoffice.Desktop) {
             params.push("desktop=true");
         }
diff --git a/lib/directeditor.php b/lib/directeditor.php
index a97cd37b..b350a0bd 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -40,6 +40,7 @@
 use OCP\IURLGenerator;
 
 use OCA\Onlyoffice\AppConfig;
+use OCA\Onlyoffice\Crypt;
 
 /**
  * Direct Editor
@@ -83,23 +84,33 @@ class DirectEditor implements IEditor {
      */
     private $config;
 
+    /**
+     * Hash generator
+     *
+     * @var OCA\Onlyoffice\Crypt
+     */
+    private $crypt;
+
     /**
      * @param string $AppName - application name
      * @param IURLGenerator $urlGenerator - url generator service
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
      * @param OCA\Onlyoffice\AppConfig $config - application configuration
+     * @param OCA\Onlyoffice\Crypt $crypt - hash generator
      */
     public function __construct($AppName,
                                 IURLGenerator $urlGenerator,
                                 IL10N $trans,
                                 ILogger $logger,
-                                AppConfig $config) {
+                                AppConfig $config,
+                                Crypt $crypt) {
         $this->appName = $AppName;
         $this->urlGenerator = $urlGenerator;
         $this->trans = $trans;
         $this->logger = $logger;
         $this->config = $config;
+        $this->crypt = $crypt;
     }
 
     /**
@@ -186,6 +197,7 @@ public function open(IToken $token): Response {
         try {
             $token->useTokenScope();
             $fileId = $token->getFile()->getId();
+            $userId = $token->getUser();
             $this->logger->debug("DirectEditor open: $fileId", array("app" => $this->appName));
 
             $documentServerUrl = $this->config->GetDocumentServerUrl();
@@ -195,9 +207,11 @@ public function open(IToken $token): Response {
                 return $this->renderError($this->trans->t("ONLYOFFICE app is not configured. Please contact admin"));
             }
 
+            $directToken = $this->crypt->GetHash(["userId" => $userId, "fileId" => $fileId, "action" => "direct"]);
+
             $params = [
                 "documentServerUrl" => $documentServerUrl,
-                "fileId" => $fileId
+                "directToken" => $directToken
             ];
 
             $response = new TemplateResponse($this->appName, "editor", $params);
diff --git a/templates/editor.php b/templates/editor.php
index ced8968b..bdb03a48 100644
--- a/templates/editor.php
+++ b/templates/editor.php
@@ -34,7 +34,11 @@
 
 <div id="app">
 
-    <div id="iframeEditor" data-id="<?php p($_["fileId"]) ?>" data-path="<?php p($_["filePath"]) ?>" data-sharetoken="<?php p($_["shareToken"]) ?>"></div>
+    <div id="iframeEditor"
+        data-id="<?php p($_["fileId"]) ?>"
+        data-path="<?php p($_["filePath"]) ?>"
+        data-sharetoken="<?php p($_["shareToken"]) ?>"
+        data-directtoken="<?php p($_["directToken"]) ?>"></div>
 
     <?php if (!empty($_["documentServerUrl"])) { ?>
         <script nonce="<?php p(base64_encode($_["requesttoken"])) ?>"

From 6315347bff641f7b17d1bdaeffebe742a6991e77 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 3 Dec 2019 17:41:55 +0300
Subject: [PATCH 13/42] expiration directToken

---
 lib/directeditor.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/directeditor.php b/lib/directeditor.php
index b350a0bd..b9bcd7eb 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -207,7 +207,13 @@ public function open(IToken $token): Response {
                 return $this->renderError($this->trans->t("ONLYOFFICE app is not configured. Please contact admin"));
             }
 
-            $directToken = $this->crypt->GetHash(["userId" => $userId, "fileId" => $fileId, "action" => "direct"]);
+            $directToken = $this->crypt->GetHash([
+                "userId" => $userId,
+                "fileId" => $fileId,
+                "action" => "direct",
+                "iat" => time(),
+                "exp" => time() + 30
+            ]);
 
             $params = [
                 "documentServerUrl" => $documentServerUrl,

From dd420866cf93e0a4c63eb17861afdefeec22a71f Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 4 Dec 2019 09:32:51 +0300
Subject: [PATCH 14/42] take filePath in directEditor

---
 lib/directeditor.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/directeditor.php b/lib/directeditor.php
index b9bcd7eb..5d839d03 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -196,8 +196,8 @@ public function isSecure(): bool {
     public function open(IToken $token): Response {
         try {
             $token->useTokenScope();
-            $fileId = $token->getFile()->getId();
-            $userId = $token->getUser();
+            $file = $token->getFile();
+            $fileId = $file->getId();
             $this->logger->debug("DirectEditor open: $fileId", array("app" => $this->appName));
 
             $documentServerUrl = $this->config->GetDocumentServerUrl();
@@ -207,6 +207,7 @@ public function open(IToken $token): Response {
                 return $this->renderError($this->trans->t("ONLYOFFICE app is not configured. Please contact admin"));
             }
 
+            $userId = $token->getUser();
             $directToken = $this->crypt->GetHash([
                 "userId" => $userId,
                 "fileId" => $fileId,
@@ -215,8 +216,11 @@ public function open(IToken $token): Response {
                 "exp" => time() + 30
             ]);
 
+            $filePath = $file->getPath();
+            $filePath = preg_replace("/^" . $userId . "/", "", $filePath);
             $params = [
                 "documentServerUrl" => $documentServerUrl,
+                "filePath" => $filePath,
                 "directToken" => $directToken
             ];
 

From 1d832a661bb9098b2d0ad1199a0be8f85d8ff695 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 4 Dec 2019 10:08:18 +0300
Subject: [PATCH 15/42] support for older versions nc

---
 appinfo/application.php | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/appinfo/application.php b/appinfo/application.php
index fccb5c45..8b178c6d 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -117,26 +117,27 @@ function() {
             return $c->query("ServerContainer")->getURLGenerator();
         });
 
-        $container->registerService("DirectEditor", function($c) {
-            return new DirectEditor(
-                $c->query("AppName"),
-                $c->query("URLGenerator"),
-                $c->query("L10N"),
-                $c->query("Logger"),
-                $this->appConfig,
-                $this->crypt
-            );
-        });
-
-
-        $eventDispatcher->addListener(RegisterDirectEditorEvent::class,
-            function (RegisterDirectEditorEvent $event) use ($container) {
-                if (!empty($this->appConfig->GetDocumentServerUrl()) && $this->appConfig->SettingsAreSuccessful()) {
-                    $editor = $container->query("DirectEditor");
-                    $event->register($editor);
-                }
+        if (class_exists("OCP\DirectEditing\RegisterDirectEditorEvent")) {
+            $container->registerService("DirectEditor", function($c) {
+                return new DirectEditor(
+                    $c->query("AppName"),
+                    $c->query("URLGenerator"),
+                    $c->query("L10N"),
+                    $c->query("Logger"),
+                    $this->appConfig,
+                    $this->crypt
+                );
             });
 
+            $eventDispatcher->addListener(RegisterDirectEditorEvent::class,
+                function (RegisterDirectEditorEvent $event) use ($container) {
+                    if (!empty($this->appConfig->GetDocumentServerUrl()) && $this->appConfig->SettingsAreSuccessful()) {
+                        $editor = $container->query("DirectEditor");
+                        $event->register($editor);
+                    }
+                });
+        }
+
 
         // Controllers
         $container->registerService("SettingsController", function($c) {

From cf51e32bf5affe87ec65658dcd951d08a44c39ce Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 4 Dec 2019 14:26:44 +0300
Subject: [PATCH 16/42] change direct editor mimes

---
 lib/directeditor.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/directeditor.php b/lib/directeditor.php
index 5d839d03..30a663e1 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -140,7 +140,8 @@ public function getMimetypes(): array {
         $mimes = array();
         $formats = $this->config->FormatsSetting();
         foreach ($formats as $format => $setting) {
-            if (array_key_exists("def", $setting) && $setting["def"]) {
+            if (array_key_exists("edit", $setting) && $setting["edit"]
+                && array_key_exists("def", $setting) && $setting["def"]) {
                 array_push($mimes, $setting["mime"]);
             }
         }
@@ -157,7 +158,8 @@ public function getMimetypesOptional(): array {
         $mimes = array();
         $formats = $this->config->FormatsSetting();
         foreach ($formats as $format => $setting) {
-            if (!array_key_exists("def", $setting) || !$setting["def"]) {
+            if (array_key_exists("edit", $setting) && $setting["edit"]
+                && (!array_key_exists("def", $setting) || !$setting["def"])) {
                 array_push($mimes, $setting["mime"]);
             }
         }

From 16922cad402c270f42357e574e04d32378f4e67c Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 09:03:39 +0300
Subject: [PATCH 17/42] full page on direct editor

---
 css/editor.css       | 4 ++++
 js/editor.js         | 1 +
 lib/directeditor.php | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/css/editor.css b/css/editor.css
index 7cfebd32..22b54cab 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -29,6 +29,10 @@
 #content.app-onlyoffice {
     min-height: calc(100% - 50px);
 }
+#body-public #content {
+    height: 100%;
+}
+
 #app > iframe {
     position: absolute;
     vertical-align: top;
diff --git a/js/editor.js b/js/editor.js
index ea9b6f77..7fd534dd 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -66,6 +66,7 @@
             params.push("shareToken=" + encodeURIComponent(shareToken));
         }
         if (directToken) {
+            $("html").addClass("onlyoffice-full-page");
             params.push("directToken=" + encodeURIComponent(directToken));
         }
         if (OCA.Onlyoffice.Desktop) {
diff --git a/lib/directeditor.php b/lib/directeditor.php
index 30a663e1..85fec2fb 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -226,7 +226,7 @@ public function open(IToken $token): Response {
                 "directToken" => $directToken
             ];
 
-            $response = new TemplateResponse($this->appName, "editor", $params);
+            $response = new TemplateResponse($this->appName, "editor", $params, "base");
 
             $csp = new ContentSecurityPolicy();
             $csp->allowInlineScript(true);

From 6392d28aa7027e950f7c793cfa4c3d8f54f8a61f Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 14:03:56 +0300
Subject: [PATCH 18/42] php warning

---
 controller/editorcontroller.php | 3 ++-
 lib/directeditor.php            | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index cffdfd60..f7ed07e8 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -513,7 +513,8 @@ public function index($fileId, $shareToken = NULL, $filePath = NULL) {
             "documentServerUrl" => $documentServerUrl,
             "fileId" => $fileId,
             "filePath" => $filePath,
-            "shareToken" => $shareToken
+            "shareToken" => $shareToken,
+            "directToken" => null
         ];
 
         $response = new TemplateResponse($this->appName, "editor", $params);
diff --git a/lib/directeditor.php b/lib/directeditor.php
index 85fec2fb..da1e1c6d 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -222,7 +222,9 @@ public function open(IToken $token): Response {
             $filePath = preg_replace("/^" . $userId . "/", "", $filePath);
             $params = [
                 "documentServerUrl" => $documentServerUrl,
+                "fileId" => null,
                 "filePath" => $filePath,
+                "shareToken" => null,
                 "directToken" => $directToken
             ];
 

From 4c94a90a5974401a9db212b704042d79ff22ecc5 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 28 Nov 2019 18:23:23 +0300
Subject: [PATCH 19/42] sharing only if app is enabled

---
 controller/editorcontroller.php | 4 ++++
 js/editor.js                    | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index a9363df2..0f5f42be 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -694,6 +694,10 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $inframe =
             }
         }
 
+        if ($inframe === true) {
+            $params["_files_sharing"] = \OC::$server->getAppManager()->isInstalled("files_sharing");
+        }
+
         $params = $this->setCustomization($params);
 
         $params = $this->setWatermark($params, !empty($shareToken), $userId, $file);
diff --git a/js/editor.js b/js/editor.js
index ba36ca17..7ff363e1 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -121,7 +121,9 @@
                     }
                     if (OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
-                        config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings;
+                        if (config._files_sharing) {
+                            config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings;
+                        }
                     }
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);

From 280193be1845e48662fb44b1e8577a251b297ccf Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 27 Nov 2019 17:34:25 +0300
Subject: [PATCH 20/42] compare in frame

---
 js/editor.js | 46 ++++++++++++++++++++++++++--------------------
 js/main.js   | 10 ++++++++++
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index f24ea3f5..3f1d2727 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -259,30 +259,36 @@
     };
 
     OCA.Onlyoffice.onRequestCompareFile = function() {
-
-        var setRevised = function(filePath) {
-            $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
-                {
-                    filePath: filePath
-                }),
-                function onSuccess(response) {
-                    if (response.error) {
-                        OC.Notification.show(response.error, {
-                            type: "error",
-                            timeout: 3
-                        });
-                        return;
-                    }
-
-                    OCA.Onlyoffice.docEditor.setRevisedFile(response);
-                });
-        };
-
         var revisedMimes = [
             "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
         ];
 
-        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select file to compare"), setRevised, false, revisedMimes);
+        if (OCA.Onlyoffice.inframe) {
+            window.parent.postMessage({
+                method: "editorRequestCompareFile",
+                param: revisedMimes
+            });
+        } else {
+            OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select file to compare"), OCA.Onlyoffice.editorSetRevised, false, revisedMimes);
+        }
+    };
+
+    OCA.Onlyoffice.editorSetRevised = function(filePath) {
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/url?filePath={filePath}",
+            {
+                filePath: filePath
+            }),
+            function onSuccess(response) {
+                if (response.error) {
+                    OC.Notification.show(response.error, {
+                        type: "error",
+                        timeout: 3
+                    });
+                    return;
+                }
+
+                OCA.Onlyoffice.docEditor.setRevisedFile(response);
+            });
     };
 
     $(document).ready(OCA.Onlyoffice.InitEditor);
diff --git a/js/main.js b/js/main.js
index 53f15ee3..f237d249 100644
--- a/js/main.js
+++ b/js/main.js
@@ -227,6 +227,13 @@
             recipientMimes);
     };
 
+    OCA.Onlyoffice.onRequestCompareFile = function (revisedMimes) {
+        OC.dialogs.filepicker(t(OCA.Onlyoffice.AppName, "Select file to compare"),
+            $("#onlyofficeFrame")[0].contentWindow.OCA.Onlyoffice.editorSetRevised,
+            false,
+            revisedMimes);
+    };
+
     OCA.Onlyoffice.FileList = {
         attach: function (fileList) {
             if (fileList.id == "trashbin") {
@@ -371,6 +378,9 @@
             case "editorRequestMailMergeRecipients":
                 OCA.Onlyoffice.onRequestMailMergeRecipients(event.data.param);
                 break;
+            case "editorRequestCompareFile":
+                OCA.Onlyoffice.onRequestCompareFile(event.data.param);
+                break;
         }
     }, false);
 

From 0c08959c9433af2fca148e0dfeab72d0a7e8c478 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 12:25:19 +0300
Subject: [PATCH 21/42] file creator

---
 lib/directeditor.php |   8 ++-
 lib/filecreator.php  | 124 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 lib/filecreator.php

diff --git a/lib/directeditor.php b/lib/directeditor.php
index da1e1c6d..3a1f0c76 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -41,6 +41,7 @@
 
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\Crypt;
+use OCA\Onlyoffice\FileCreator;
 
 /**
  * Direct Editor
@@ -173,7 +174,9 @@ public function getMimetypesOptional(): array {
      * @return array of ACreateFromTemplate|ACreateEmpty
      */
     public function getCreators(): array {
-        return [];
+        return [
+            new FileCreator($this->appName, $this->trans, $this->logger)
+        ];
     }
 
     /**
@@ -192,7 +195,8 @@ public function isSecure(): bool {
      * For handling editing and later requests, editors need to impelement their own token handling
      * and take care of invalidation
      *
-     * @param IToken $token
+     * @param IToken $token - one time token
+     *
      * @return Response
      */
     public function open(IToken $token): Response {
diff --git a/lib/filecreator.php b/lib/filecreator.php
new file mode 100644
index 00000000..25921ff4
--- /dev/null
+++ b/lib/filecreator.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2019
+ *
+ * This program is a free software product.
+ * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License
+ * (AGPL) version 3 as published by the Free Software Foundation.
+ * In accordance with Section 7(a) of the GNU AGPL 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 FITNESS FOR A PARTICULAR PURPOSE.
+ * For details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions of the Program
+ * must display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product logo when distributing the program.
+ * Pursuant to Section 7(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as well as technical
+ * writing content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International.
+ * See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+namespace OCA\Onlyoffice;
+
+use OCP\DirectEditing\ACreateEmpty;
+use OCP\Files\File;
+use OCP\IL10N;
+use OCP\ILogger;
+
+/**
+ * File creator
+ *
+ * @package OCA\Onlyoffice
+ */
+class FileCreator extends ACreateEmpty {
+
+    /**
+     * Application name
+     *
+     * @var string
+     */
+    private $appName;
+
+    /**
+     * l10n service
+     *
+     * @var IL10N
+     */
+    private $trans;
+
+    /**
+     * Logger
+     *
+     * @var ILogger
+     */
+    private $logger;
+
+    /**
+     * @param string $AppName - application name
+     * @param IL10N $trans - l10n service
+     * @param ILogger $logger - logger
+     */
+    public function __construct($AppName,
+                                IL10N $trans,
+                                ILogger $logger) {
+        $this->appName = $AppName;
+        $this->trans = $trans;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Unique id for the creator to filter templates
+     *
+     * @return string
+     */
+    public function getId(): string {
+        return $this->appName;
+    }
+
+    /**
+     * Descriptive name for the create action
+     *
+     * @return string
+     */
+    public function getName(): string {
+        return $this->trans->t("Document");
+    }
+
+    /**
+     * Default file extension for the new file
+     *
+     * @return string
+     */
+    public function getExtension(): string {
+        return "docx";
+    }
+
+    /**
+     * Mimetype of the resulting created file
+     *
+     * @return array
+     */
+    public function getMimetype(): string {
+        return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+    }
+
+    /**
+     * Add content when creating empty files
+     *
+     * @param File $file - empty file
+     * @param string $creatorId - creator id
+     * @param string $templateId - teamplate id
+     */
+    public function create(File $file, string $creatorId = null, string $templateId = null): void {
+        $this->logger->debug("FileCreator: " . $file->getId() . "$creatorId $templateId", array("app" => $this->appName));
+    }
+}

From 370110ae1c70274f31b7133c9ab820180843f7eb Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 13:38:56 +0300
Subject: [PATCH 22/42] move getTemplate method

---
 controller/editorcontroller.php | 25 ++---------------
 lib/filecreator.php             | 50 ++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index f7ed07e8..bd81656a 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -57,6 +57,7 @@
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\Crypt;
 use OCA\Onlyoffice\DocumentService;
+use OCA\Onlyoffice\FileCreator;
 use OCA\Onlyoffice\FileUtility;
 
 /**
@@ -224,17 +225,7 @@ public function create($name, $dir, $shareToken = NULL) {
             return ["error" => $this->trans->t("You don't have enough permission to create")];
         }
 
-        $ext = strtolower("." . pathinfo($name, PATHINFO_EXTENSION));
-
-        $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode();
-
-        $templatePath = $this->getTemplatePath($lang, $ext);
-        if (!file_exists($templatePath)) {
-            $lang = "en";
-            $templatePath = $this->getTemplatePath($lang, $ext);
-        }
-
-        $template = file_get_contents($templatePath);
+        $template = FileCreator::GetTemplate($name);
         if (!$template) {
             $this->logger->error("Template for file creation not found: $templatePath", array("app" => $this->appName));
             return ["error" => $this->trans->t("Template not found")];
@@ -257,18 +248,6 @@ public function create($name, $dir, $shareToken = NULL) {
         return $result;
     }
 
-    /**
-     * Get template path
-     *
-     * @param string $lang - language
-     * @param string $ext - file extension
-     *
-     * @return string
-     */
-    private function getTemplatePath($lang, $ext) {
-        return dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . $lang . DIRECTORY_SEPARATOR . "new" . $ext;
-    }
-
     /**
      * Conversion file to Office Open XML format
      *
diff --git a/lib/filecreator.php b/lib/filecreator.php
index 25921ff4..95f0f114 100644
--- a/lib/filecreator.php
+++ b/lib/filecreator.php
@@ -119,6 +119,54 @@ public function getMimetype(): string {
      * @param string $templateId - teamplate id
      */
     public function create(File $file, string $creatorId = null, string $templateId = null): void {
-        $this->logger->debug("FileCreator: " . $file->getId() . "$creatorId $templateId", array("app" => $this->appName));
+        $this->logger->debug("FileCreator: " . $file->getId() . " " . $file->getName() . " $creatorId $templateId", array("app" => $this->appName));
+
+        $fileName = $file->getName();
+        $template = self::GetTemplate($fileName);
+
+        if (!$template) {
+            $this->logger->error("FileCreator: Template for file creation not found: $templatePath", array("app" => $this->appName));
+            return;
+        }
+
+        try {
+            $file->putContent($template);
+        } catch (NotPermittedException $e) {
+            $this->logger->error("FileCreator: Can't create file: $name", array("app" => $this->appName));
+        }
+    }
+
+    /**
+     * Get template
+     *
+     * @param string $name - file name
+     *
+     * @return string
+     */
+    public static function GetTemplate(string $name) {
+        $ext = strtolower("." . pathinfo($name, PATHINFO_EXTENSION));
+
+        $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode();
+
+        $templatePath = self::getTemplatePath($lang, $ext);
+        if (!file_exists($templatePath)) {
+            $lang = "en";
+            $templatePath = self::getTemplatePath($lang, $ext);
+        }
+
+        $template = file_get_contents($templatePath);
+        return $template;
+    }
+
+    /**
+     * Get template path
+     *
+     * @param string $lang - language
+     * @param string $ext - file extension
+     *
+     * @return string
+     */
+    private static function GetTemplatePath(string $lang, string $ext) {
+        return dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . $lang . DIRECTORY_SEPARATOR . "new" . $ext;
     }
 }

From 3a6ffbcd04e6b8f960f959b082ec342bfb04bf8b Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 14:54:40 +0300
Subject: [PATCH 23/42] creation different formats

---
 lib/directeditor.php |  4 +++-
 lib/filecreator.php  | 28 +++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/lib/directeditor.php b/lib/directeditor.php
index 3a1f0c76..342909e4 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -175,7 +175,9 @@ public function getMimetypesOptional(): array {
      */
     public function getCreators(): array {
         return [
-            new FileCreator($this->appName, $this->trans, $this->logger)
+            new FileCreator($this->appName, $this->trans, $this->logger, "docx"),
+            new FileCreator($this->appName, $this->trans, $this->logger, "xlsx"),
+            new FileCreator($this->appName, $this->trans, $this->logger, "pptx")
         ];
     }
 
diff --git a/lib/filecreator.php b/lib/filecreator.php
index 95f0f114..788b1725 100644
--- a/lib/filecreator.php
+++ b/lib/filecreator.php
@@ -62,17 +62,27 @@ class FileCreator extends ACreateEmpty {
      */
     private $logger;
 
+    /**
+     * Format for creation
+     *
+     * @var string
+     */
+    private $format;
+
     /**
      * @param string $AppName - application name
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
+     * @param string $format - format for creation 
      */
     public function __construct($AppName,
                                 IL10N $trans,
-                                ILogger $logger) {
+                                ILogger $logger,
+                                $format) {
         $this->appName = $AppName;
         $this->trans = $trans;
         $this->logger = $logger;
+        $this->format = $format;
     }
 
     /**
@@ -81,7 +91,7 @@ public function __construct($AppName,
      * @return string
      */
     public function getId(): string {
-        return $this->appName;
+        return $this->appName . "_" . $this->format;
     }
 
     /**
@@ -90,6 +100,12 @@ public function getId(): string {
      * @return string
      */
     public function getName(): string {
+        switch ($this->format) {
+            case "xlsx":
+                return $this->trans->t("Spreadsheet");
+            case "pptx":
+                return $this->trans->t("Presentation");
+        }
         return $this->trans->t("Document");
     }
 
@@ -99,7 +115,7 @@ public function getName(): string {
      * @return string
      */
     public function getExtension(): string {
-        return "docx";
+        return $this->format;
     }
 
     /**
@@ -108,6 +124,12 @@ public function getExtension(): string {
      * @return array
      */
     public function getMimetype(): string {
+        switch ($this->format) {
+            case "xlsx":
+                return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+            case "pptx":
+                return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
+        }
         return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
     }
 

From 142754122e33c0f30ee557baf833cada76bb34a1 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 15:01:33 +0300
Subject: [PATCH 24/42] change directEditor name

---
 lib/directeditor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/directeditor.php b/lib/directeditor.php
index 342909e4..7d73ff76 100644
--- a/lib/directeditor.php
+++ b/lib/directeditor.php
@@ -129,7 +129,7 @@ public function getId(): string {
      * @return string
      */
     public function getName(): string {
-        return $this->appName;
+        return "ONLYOFFICE";
     }
 
     /**

From 649e98c98d3e8278a339103c052214667705d151 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 25 Dec 2019 11:07:58 +0300
Subject: [PATCH 25/42] customization.zoom (Fixed #131)

---
 controller/editorcontroller.php | 5 +++++
 lib/appconfig.php               | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 1207c239..2edb80d2 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -837,6 +837,11 @@ private function setCustomization($params) {
             $params["editorConfig"]["customization"]["logo"] = $logo;
         }
 
+        $zoom = $this->config->GetSystemValue($this->config->_customization_zoom);
+        if (isset($zoom)) {
+            $params["editorConfig"]["customization"]["zoom"] = $zoom;
+        }
+
         return $params;
     }
 
diff --git a/lib/appconfig.php b/lib/appconfig.php
index b90f8441..2375d927 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -238,6 +238,13 @@ class AppConfig {
      */
     public $_customization_logo = "customization_logo";
 
+    /**
+     * The config key for the zoom
+     *
+     * @var string
+     */
+    public $_customization_zoom = "customization_zoom";
+
     /**
      * @param string $AppName - application name
      */

From 47da3303a4b942f999aef0758a4f9fde7b20aa4c Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Wed, 25 Dec 2019 11:11:31 +0300
Subject: [PATCH 26/42] customization.autosave

---
 controller/editorcontroller.php | 5 +++++
 lib/appconfig.php               | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 2edb80d2..5297ee71 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -842,6 +842,11 @@ private function setCustomization($params) {
             $params["editorConfig"]["customization"]["zoom"] = $zoom;
         }
 
+        $autosave = $this->config->GetSystemValue($this->config->_customization_autosave);
+        if (isset($autosave)) {
+            $params["editorConfig"]["customization"]["zoom"] = $autosave;
+        }
+
         return $params;
     }
 
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 2375d927..2560b6f6 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -245,6 +245,13 @@ class AppConfig {
      */
     public $_customization_zoom = "customization_zoom";
 
+    /**
+     * The config key for the autosave
+     *
+     * @var string
+     */
+    public $_customization_autosave = "customization_autosave";
+
     /**
      * @param string $AppName - application name
      */

From 0f88383737942e910d4da488f90db9f6d03cf2ea Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 6 Dec 2019 16:59:23 +0300
Subject: [PATCH 27/42] format

---
 controller/callbackcontroller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
index 2245086a..a8cb17e9 100644
--- a/controller/callbackcontroller.php
+++ b/controller/callbackcontroller.php
@@ -140,7 +140,7 @@ class CallbackController extends Controller {
      * @param OCA\Onlyoffice\Crypt $crypt - hash generator
      * @param IManager $shareManager - Share manager
      */
-    public function __construct($AppName, 
+    public function __construct($AppName,
                                     IRequest $request,
                                     IRootFolder $root,
                                     IUserSession $userSession,
@@ -415,7 +415,7 @@ public function track($doc, $users, $key, $status, $url, $token) {
                     list ($file, $error) = empty($shareToken) ? $this->getFile($userId, $fileId, $filePath) : $this->getFileByToken($fileId, $shareToken);
 
                     if (isset($error)) {
-                        $this->logger->error("track error $fileId" . " " . json_encode($error->getData()),  array("app" => $this->appName));
+                        $this->logger->error("track error $fileId " . json_encode($error->getData()),  array("app" => $this->appName));
                         return $error;
                     }
 

From 30a5d2442474153709ee7cbaee3d25dc66eb133d Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 16:50:24 +0300
Subject: [PATCH 28/42] directeditor loaded

---
 js/directeditor.js   | 73 ++++++++++++++++++++++++++++++++++++++++++++
 js/editor.js         |  4 +++
 templates/editor.php |  3 ++
 3 files changed, 80 insertions(+)
 create mode 100644 js/directeditor.js

diff --git a/js/directeditor.js b/js/directeditor.js
new file mode 100644
index 00000000..b3d3baab
--- /dev/null
+++ b/js/directeditor.js
@@ -0,0 +1,73 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2019
+ *
+ * This program is a free software product.
+ * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License
+ * (AGPL) version 3 as published by the Free Software Foundation.
+ * In accordance with Section 7(a) of the GNU AGPL 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 FITNESS FOR A PARTICULAR PURPOSE.
+ * For details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions of the Program
+ * must display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product logo when distributing the program.
+ * Pursuant to Section 7(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as well as technical
+ * writing content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International.
+ * See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+(function (OCA) {
+
+    OCA.Onlyoffice = _.extend({}, OCA.Onlyoffice);
+
+    var callMobileMessage = function (messageName, attributes) {
+        var message = messageName
+        if (typeof attributes !== "undefined") {
+            message = {
+                MessageName: messageName,
+                Values: attributes,
+            };
+        }
+        var attributesString = null
+        try {
+            attributesString = JSON.stringify(attributes);
+        } catch (e) {
+            attributesString = null;
+        }
+
+        // Forward to mobile handler
+        if (window.DirectEditingMobileInterface && typeof window.DirectEditingMobileInterface[messageName] === "function") {
+            if (attributesString === null || typeof attributesString === "undefined") {
+                window.DirectEditingMobileInterface[messageName]();
+            } else {
+                window.DirectEditingMobileInterface[messageName](attributesString);
+            }
+        }
+
+        // iOS webkit fallback
+        if (window.webkit
+            && window.webkit.messageHandlers
+            && window.webkit.messageHandlers.DirectEditingMobileInterface) {
+            window.webkit.messageHandlers.DirectEditingMobileInterface.postMessage(message);
+        }
+
+        window.postMessage(message);
+    }
+
+    OCA.Onlyoffice.directEditor = {
+        loaded: function() {
+            callMobileMessage("loaded");
+        }
+    };
+
+})(OCA);
diff --git a/js/editor.js b/js/editor.js
index 7fd534dd..e82d2921 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -120,6 +120,10 @@
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
                     }
 
+                    if (OCA.Onlyoffice.directEditor) {
+                        config.events.onAppReady = OCA.Onlyoffice.directEditor.loaded;
+                    }
+
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
                     if (config.type === "mobile" && $("#app > iframe").css("position") === "fixed") {
diff --git a/templates/editor.php b/templates/editor.php
index bdb03a48..7bd38851 100644
--- a/templates/editor.php
+++ b/templates/editor.php
@@ -30,6 +30,9 @@
     style("onlyoffice", "editor");
     script("onlyoffice", "desktop");
     script("onlyoffice", "editor");
+    if (!empty($_["directToken"])) {
+        script("onlyoffice", "directeditor");
+    }
 ?>
 
 <div id="app">

From ef98daaf26f88887c120828192f6312a59c42ccf Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 5 Dec 2019 17:00:22 +0300
Subject: [PATCH 29/42] hide goback in directEditor

---
 controller/editorcontroller.php | 4 +++-
 js/editor.js                    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index bd81656a..c10b930c 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -670,7 +670,9 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $directTok
             }
         }
 
-        if ($folderLink !== NULL) {
+        if ($folderLink !== NULL
+            && empty($directToken) //todo: fix in ds 5.5
+            ) {
             $params["editorConfig"]["customization"]["goback"] = [
                 "url"  => $folderLink
             ];
diff --git a/js/editor.js b/js/editor.js
index e82d2921..82ef7e0f 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -126,7 +126,8 @@
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
-                    if (config.type === "mobile" && $("#app > iframe").css("position") === "fixed") {
+                    if (!OCA.Onlyoffice.directEditor
+                        && config.type === "mobile" && $("#app > iframe").css("position") === "fixed") {
                         $("#app > iframe").css("height", "calc(100% - 50px)");
                     }
                 }

From c10802db04738275b4785696c5af3d0a0d89beef Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 10 Jan 2020 17:32:03 +0300
Subject: [PATCH 30/42] hide goback for old editor

---
 controller/editorcontroller.php | 10 +++++-----
 js/editor.js                    | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 0f5f42be..f85eedde 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -554,7 +554,7 @@ public function PublicPage($fileId, $shareToken) {
      * @param integer $fileId - file identifier
      * @param string $filePath - file path
      * @param string $shareToken - access token
-     * @param bool $inframe - open in frame
+     * @param integer $inframe - open in frame. 0 - no, 1 - yes, 2 - without goback for old editor (5.4)
      * @param bool $desktop - desktop label
      *
      * @return array
@@ -562,7 +562,7 @@ public function PublicPage($fileId, $shareToken) {
      * @NoAdminRequired
      * @PublicPage
      */
-    public function config($fileId, $filePath = NULL, $shareToken = NULL, $inframe = false, $desktop = false) {
+    public function config($fileId, $filePath = NULL, $shareToken = NULL, $inframe = 0, $desktop = false) {
 
         if (empty($shareToken) && !$this->config->isUserAllowedToUse()) {
             return ["error" => $this->trans->t("Not permitted")];
@@ -679,7 +679,7 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $inframe =
             }
         }
 
-        if ($folderLink !== NULL) {
+        if ($folderLink !== NULL && $inframe !== 2) {
             $params["editorConfig"]["customization"]["goback"] = [
                 "url"  => $folderLink
             ];
@@ -687,14 +687,14 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $inframe =
             if (!$desktop) {
                 if ($this->config->GetSameTab()) {
                     $params["editorConfig"]["customization"]["goback"]["blank"] = false;
-                    if ($inframe === true) {
+                    if ($inframe === 1) {
                         $params["editorConfig"]["customization"]["goback"]["requestClose"] = true;
                     }
                 }
             }
         }
 
-        if ($inframe === true) {
+        if ($inframe === 1) {
             $params["_files_sharing"] = \OC::$server->getAppManager()->isInstalled("files_sharing");
         }
 
diff --git a/js/editor.js b/js/editor.js
index 7ff363e1..880a03a4 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -66,9 +66,17 @@
         if (shareToken) {
             params.push("shareToken=" + encodeURIComponent(shareToken));
         }
+
         if (OCA.Onlyoffice.inframe) {
-            params.push("inframe=true");
+            var dsVersion = DocsAPI.DocEditor.version();
+            var versionArray = dsVersion.split(".");
+            if (versionArray[0] < 5 || versionArray[1] < 5) {
+                params.push("inframe=2");
+            } else {
+                params.push("inframe=1");
+            }
         }
+
         if (OCA.Onlyoffice.Desktop) {
             params.push("desktop=true");
         }
@@ -119,6 +127,7 @@
                         config.events.onRequestInsertImage = OCA.Onlyoffice.onRequestInsertImage;
                         config.events.onRequestMailMergeRecipients = OCA.Onlyoffice.onRequestMailMergeRecipients;
                     }
+
                     if (OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
                         if (config._files_sharing) {

From f6687418b7668da4215171fa2f42ae7abd6ccea7 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Fri, 10 Jan 2020 16:42:04 +0300
Subject: [PATCH 31/42] nc 18

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 78987c64..e7f8aca0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -29,7 +29,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/new.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <dependencies>
-        <nextcloud min-version="15" max-version="17"/>
+        <nextcloud min-version="15" max-version="18"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>

From 5b14b9ead5301d3f402c74fc3c329382fdec4f7f Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Mon, 13 Jan 2020 12:05:01 +0300
Subject: [PATCH 32/42] 2019-12 end of life nc15

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index e7f8aca0..507e76c1 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -29,7 +29,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/new.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <dependencies>
-        <nextcloud min-version="15" max-version="18"/>
+        <nextcloud min-version="16" max-version="18"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>

From b82d99a91aab788960a92742bf52910049cfce3d Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 14 Jan 2020 12:32:32 +0300
Subject: [PATCH 33/42] fix php warning

---
 controller/editorcontroller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 469e228b..0214a1a9 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -503,7 +503,8 @@ public function index($fileId, $filePath = NULL, $shareToken = NULL, $inframe =
             "documentServerUrl" => $documentServerUrl,
             "fileId" => $fileId,
             "filePath" => $filePath,
-            "shareToken" => $shareToken
+            "shareToken" => $shareToken,
+            "inframe" => false
         ];
 
         if ($inframe === true) {

From ca839cf9af222461db1fb724b46a2f056ee8ef66 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 14 Jan 2020 12:13:26 +0300
Subject: [PATCH 34/42] sidebar and closing inline editor for DS < 5.5 (#204)

---
 css/main.css | 10 ++++++++++
 js/main.js   | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/css/main.css b/css/main.css
index 16e1a27c..2dbc794d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -63,6 +63,16 @@ body.onlyoffice-inline #content #app-content {
     z-index: 110;
 }
 
+#onlyofficeHeader {
+    display: flex;
+}
+
+#onlyofficeHeader .icon {
+    display: block;
+    min-width: 50px;
+    height: 50px;
+}
+
 /* AscDesktopEditor */
 .AscDesktopEditor #body-user #header {
     display: none;
diff --git a/js/main.js b/js/main.js
index f237d249..bdf284a8 100644
--- a/js/main.js
+++ b/js/main.js
@@ -115,6 +115,23 @@
             $("html, body").scrollTop(0);
 
             OCA.Onlyoffice.folderUrl = location.href;
+
+            var wrapper = $("<div id='onlyofficeHeader' />")
+
+            var btnClose = $("<a class='icon icon-close-white'></a>");
+            btnClose.on("click", function() {
+                OCA.Onlyoffice.CloseEditor();
+            });
+            wrapper.prepend(btnClose);
+
+            var btnShare = $("<a class='icon icon-shared icon-white'></a>");
+            btnShare.on("click", function () {
+                OCA.Onlyoffice.OpenShareDialog();
+            })
+            wrapper.prepend(btnShare);
+
+            wrapper.prependTo(".header-right");
+
             window.history.pushState(null, null, url);
         }
     };
@@ -123,6 +140,7 @@
         $("body").removeClass("onlyoffice-inline");
 
         $("#onlyofficeFrame").remove();
+        $("#onlyofficeHeader").remove();
 
         OCA.Onlyoffice.context = null;
 

From 67a7b4b0c0cc8bbe5948c118084ed0b3acabf609 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 14 Jan 2020 12:21:06 +0300
Subject: [PATCH 35/42] header button only for ds < 5.5

---
 js/editor.js |  3 +++
 js/main.js   | 34 +++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index f7ad9b94..c1bd0e16 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -71,6 +71,9 @@
             var dsVersion = DocsAPI.DocEditor.version();
             var versionArray = dsVersion.split(".");
             if (versionArray[0] < 5 || versionArray[1] < 5) {
+                window.parent.postMessage({
+                    method: "editorShowHeaderButton"
+                });
                 params.push("inframe=2");
             } else {
                 params.push("inframe=1");
diff --git a/js/main.js b/js/main.js
index bdf284a8..56dc4c43 100644
--- a/js/main.js
+++ b/js/main.js
@@ -115,25 +115,26 @@
             $("html, body").scrollTop(0);
 
             OCA.Onlyoffice.folderUrl = location.href;
+            window.history.pushState(null, null, url);
+        }
+    };
 
-            var wrapper = $("<div id='onlyofficeHeader' />")
-
-            var btnClose = $("<a class='icon icon-close-white'></a>");
-            btnClose.on("click", function() {
-                OCA.Onlyoffice.CloseEditor();
-            });
-            wrapper.prepend(btnClose);
+    OCA.Onlyoffice.ShowHeaderButton = function () {
+        var wrapper = $("<div id='onlyofficeHeader' />")
 
-            var btnShare = $("<a class='icon icon-shared icon-white'></a>");
-            btnShare.on("click", function () {
-                OCA.Onlyoffice.OpenShareDialog();
-            })
-            wrapper.prepend(btnShare);
+        var btnClose = $("<a class='icon icon-close-white'></a>");
+        btnClose.on("click", function() {
+            OCA.Onlyoffice.CloseEditor();
+        });
+        wrapper.prepend(btnClose);
 
-            wrapper.prependTo(".header-right");
+        var btnShare = $("<a class='icon icon-shared icon-white'></a>");
+        btnShare.on("click", function () {
+            OCA.Onlyoffice.OpenShareDialog();
+        })
+        wrapper.prepend(btnShare);
 
-            window.history.pushState(null, null, url);
-        }
+        wrapper.prependTo(".header-right");
     };
 
     OCA.Onlyoffice.CloseEditor = function () {
@@ -399,6 +400,9 @@
             case "editorRequestCompareFile":
                 OCA.Onlyoffice.onRequestCompareFile(event.data.param);
                 break;
+            case "editorShowHeaderButton":
+                OCA.Onlyoffice.ShowHeaderButton();
+                break;
         }
     }, false);
 

From 1ed0923bd422e2881f9b62eccfbb5ada6d496cf2 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Mon, 13 Jan 2020 12:45:13 +0300
Subject: [PATCH 36/42] closing direct editor

---
 controller/editorcontroller.php |  7 ++-----
 js/directeditor.js              |  3 +++
 js/editor.js                    | 28 ++++++++++++++++------------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index bfd63ee7..e588f151 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -677,10 +677,7 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $directTok
             }
         }
 
-        if ($folderLink !== NULL
-            && $inframe !== 2
-            && empty($directToken) //todo: fix in ds 5.5
-            ) {
+        if ($folderLink !== NULL && $inframe !== 2) {
             $params["editorConfig"]["customization"]["goback"] = [
                 "url"  => $folderLink
             ];
@@ -688,7 +685,7 @@ public function config($fileId, $filePath = NULL, $shareToken = NULL, $directTok
             if (!$desktop) {
                 if ($this->config->GetSameTab()) {
                     $params["editorConfig"]["customization"]["goback"]["blank"] = false;
-                    if ($inframe === 1) {
+                    if ($inframe === 1 || !empty($directToken)) {
                         $params["editorConfig"]["customization"]["goback"]["requestClose"] = true;
                     }
                 }
diff --git a/js/directeditor.js b/js/directeditor.js
index b3d3baab..e29dabd9 100644
--- a/js/directeditor.js
+++ b/js/directeditor.js
@@ -65,6 +65,9 @@
     }
 
     OCA.Onlyoffice.directEditor = {
+        close: function() {
+            callMobileMessage("close");
+        },
         loaded: function() {
             callMobileMessage("loaded");
         }
diff --git a/js/editor.js b/js/editor.js
index 4b54ccb6..2c0c4c4c 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -72,14 +72,12 @@
             params.push("directToken=" + encodeURIComponent(directToken));
         }
 
-        if (OCA.Onlyoffice.inframe) {
-            var dsVersion = DocsAPI.DocEditor.version();
-            var versionArray = dsVersion.split(".");
-            if (versionArray[0] < 5 || versionArray[1] < 5) {
-                params.push("inframe=2");
-            } else {
-                params.push("inframe=1");
-            }
+        var dsVersion = DocsAPI.DocEditor.version();
+        var versionArray = dsVersion.split(".");
+        if (versionArray[0] < 5 || versionArray[1] < 5) {
+            params.push("inframe=2");
+        } else if (OCA.Onlyoffice.inframe) {
+            params.push("inframe=1");
         }
 
         if (OCA.Onlyoffice.Desktop) {
@@ -138,11 +136,12 @@
                         config.events.onAppReady = OCA.Onlyoffice.directEditor.loaded;
                     }
 
-                    if (OCA.Onlyoffice.inframe) {
+                    if (OCA.Onlyoffice.directEditor || OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
-                        if (config._files_sharing) {
-                            config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings;
-                        }
+                    }
+
+                    if (OCA.Onlyoffice.inframe && config._files_sharing) {
+                        config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings;
                     }
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
@@ -266,6 +265,11 @@
     };
 
     OCA.Onlyoffice.onRequestClose = function () {
+        if (OCA.Onlyoffice.directEditor) {
+            OCA.Onlyoffice.directEditor.close();
+            return;
+        }
+
         window.parent.postMessage({
             method: "editorRequestClose"
         });

From 70fb1d85ccd95a03e96bbd1d2beef15de8cf52ba Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 14 Jan 2020 12:50:48 +0300
Subject: [PATCH 37/42] brand loader

---
 js/editor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index 2c0c4c4c..acbb0961 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -132,10 +132,6 @@
                         config.events.onRequestCompareFile = OCA.Onlyoffice.onRequestCompareFile;
                     }
 
-                    if (OCA.Onlyoffice.directEditor) {
-                        config.events.onAppReady = OCA.Onlyoffice.directEditor.loaded;
-                    }
-
                     if (OCA.Onlyoffice.directEditor || OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
                     }
@@ -146,6 +142,10 @@
 
                     OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor("iframeEditor", config);
 
+                    if (OCA.Onlyoffice.directEditor) {
+                        OCA.Onlyoffice.directEditor.loaded();
+                    }
+
                     if (!OCA.Onlyoffice.directEditor
                         && config.type === "mobile" && $("#app > iframe").css("position") === "fixed") {
                         $("#app > iframe").css("height", "calc(100% - 50px)");

From 9eb424b80c3b4ec0de3f2b65e248db61dc01fd18 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 14 Jan 2020 16:39:00 +0300
Subject: [PATCH 38/42] inline editor in public folder

---
 controller/editorcontroller.php | 5 +++--
 js/main.js                      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 0214a1a9..f89cb1d3 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -533,6 +533,7 @@ public function index($fileId, $filePath = NULL, $shareToken = NULL, $inframe =
      *
      * @param integer $fileId - file identifier
      * @param string $shareToken - access token
+     * @param bool $inframe - open in frame
      *
      * @return TemplateResponse
      *
@@ -540,8 +541,8 @@ public function index($fileId, $filePath = NULL, $shareToken = NULL, $inframe =
      * @NoCSRFRequired
      * @PublicPage
      */
-    public function PublicPage($fileId, $shareToken) {
-        return $this->index($fileId, null, $shareToken);
+    public function PublicPage($fileId, $shareToken, $inframe = false) {
+        return $this->index($fileId, null, $shareToken, $inframe);
     }
 
     /**
diff --git a/js/main.js b/js/main.js
index 56dc4c43..f5a36a38 100644
--- a/js/main.js
+++ b/js/main.js
@@ -103,7 +103,7 @@
             winEditor.location.href = url;
         } else if (!OCA.Onlyoffice.setting.sameTab || OCA.Onlyoffice.Desktop) {
             winEditor = window.open(url, "_blank");
-        } else if ($("#isPublic").val()) {
+        } else if ($("#isPublic").val() === "1" && !$("#filestable").length) {
             location.href = url;
         } else {
             var $iframe = $("<iframe id=\"onlyofficeFrame\" nonce=\"" + btoa(OC.requestToken) + "\" scrolling=\"no\" allowfullscreen src=\"" + url + "&inframe=true\" />");

From 602546081fef6baaf6e352f4ba01fc85df372124 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Tue, 14 Jan 2020 16:43:38 +0300
Subject: [PATCH 39/42] disable sharing in public folder

---
 js/editor.js |  2 +-
 js/main.js   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/editor.js b/js/editor.js
index c1bd0e16..b73cd173 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -134,7 +134,7 @@
 
                     if (OCA.Onlyoffice.inframe) {
                         config.events.onRequestClose = OCA.Onlyoffice.onRequestClose;
-                        if (config._files_sharing) {
+                        if (config._files_sharing && !shareToken) {
                             config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings;
                         }
                     }
diff --git a/js/main.js b/js/main.js
index f5a36a38..44a2745b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -128,11 +128,13 @@
         });
         wrapper.prepend(btnClose);
 
-        var btnShare = $("<a class='icon icon-shared icon-white'></a>");
-        btnShare.on("click", function () {
-            OCA.Onlyoffice.OpenShareDialog();
-        })
-        wrapper.prepend(btnShare);
+        if (!$("#isPublic").val()) {
+            var btnShare = $("<a class='icon icon-shared icon-white'></a>");
+            btnShare.on("click", function () {
+                OCA.Onlyoffice.OpenShareDialog();
+            })
+            wrapper.prepend(btnShare);
+        }
 
         wrapper.prependTo(".header-right");
     };

From 9afe41f8bf1ef8bc60645beed5b4423f4be7ac25 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 16 Jan 2020 10:58:34 +0300
Subject: [PATCH 40/42] header button for public folder without downloading

---
 js/main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/main.js b/js/main.js
index 44a2745b..5b388f5e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -136,6 +136,9 @@
             wrapper.prepend(btnShare);
         }
 
+        if (!$("#header .header-right").length) {
+            $("#header").append("<div class='header-right'></div>");
+        }
         wrapper.prependTo(".header-right");
     };
 

From a1278fb47aea37fc1b58fa14e3b283fa763c3e6d Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 16 Jan 2020 12:42:22 +0300
Subject: [PATCH 41/42] fix autosave param

---
 controller/editorcontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
index 8d59883b..112e947d 100644
--- a/controller/editorcontroller.php
+++ b/controller/editorcontroller.php
@@ -868,7 +868,7 @@ private function setCustomization($params) {
 
         $autosave = $this->config->GetSystemValue($this->config->_customization_autosave);
         if (isset($autosave)) {
-            $params["editorConfig"]["customization"]["zoom"] = $autosave;
+            $params["editorConfig"]["customization"]["autosave"] = $autosave;
         }
 
         return $params;

From 3f3a533563f70a8f89cc04e7c7a6f8acc9a4d50f Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 16 Jan 2020 12:46:44 +0300
Subject: [PATCH 42/42] 4.1.0

---
 CHANGELOG.md     | 11 +++++++++++
 appinfo/info.xml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26bc87b5..108c3556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## 4.1.0
+## Added
+- inline editor if using the same tab, opening the sidebar, sharing from the editor
+- creating, editing and co-authoring files in Nextcloud Android mobile application
+- setting zoom and autosave
+- selection of a file for comparison (DocumentServer 5.5 required)
+
+## Changed
+- compatible with Nextcloud 18
+- Nextcloud v15 is no longer supported
+
 ## 4.0.0
 ## Added
 - Polish translation
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 507e76c1..3644de29 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector enables you to edit Office documents within ONLYOFFICE from the familiar web interface. 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 your file storage.</description>
     <licence>agpl</licence>
     <author mail="dev@onlyoffice.com" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>