Merge pull request #105 from ONLYOFFICE/develop

Release/2.4.0
ONLYOFFICE · Jul 3, 2019 · 55fc8ef · 55fc8ef
2 parents 9a81db9 + 19c9e46
commit 55fc8ef
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.4.0
+## Added
+- compatibility with encryption
+
 ## 2.3.0
 ## Added
 - editor customization

diff --git 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="[email protected]" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>

diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
@@ -388,10 +388,6 @@ public function track($doc, $users, $key, $status, $url, $token) {
                         $this->logger->debug("Track by anonymous " . $userId, array("app" => $this->appName));
                     }
 
-                    if ($this->config->checkEncryptionModule() === "master") {
-                        \OC_User::setIncognitoMode(true);
-                    }
-
                     \OC_Util::tearDownFS();
                     if (!empty($ownerId)) {
                         \OC_Util::setupFS($ownerId);
@@ -400,7 +396,7 @@ public function track($doc, $users, $key, $status, $url, $token) {
                     list ($file, $error) = !empty($ownerId) ? $this->getFile($ownerId, $fileId) : $this->getFileByToken($fileId, $token);
 
                     if (isset($error)) {
-                        $this->logger->error("track error" . $fileId ." " . $error,  array("app" => $this->appName));
+                        $this->logger->error("track error" . $fileId ." " . json_encode($error->getData()),  array("app" => $this->appName));
                         return $error;
                     }
 
@@ -453,7 +449,7 @@ public function track($doc, $users, $key, $status, $url, $token) {
                 break;
         }
 
-        $this->logger->debug("Track: " . $fileId . " status " . $status . " result " . $error, array("app" => $this->appName));
+        $this->logger->debug("Track: " . $fileId . " status " . $status . " result " . $result, array("app" => $this->appName));
 
         return new JSONResponse(["error" => $result], Http::STATUS_OK);
     }

diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
@@ -120,7 +120,6 @@ public function index() {
             "currentServer" => $this->urlGenerator->getAbsoluteURL("/"),
             "formats" => $this->config->FormatsSetting(),
             "sameTab" => $this->config->GetSameTab(),
-            "encryption" => ($this->config->checkEncryptionModule() === true),
             "limitGroups" => $this->config->GetLimitGroups(),
             "chat" => $this->config->GetCustomizationChat(),
             "compactHeader" => $this->config->GetCustomizationCompactHeader(),
@@ -159,10 +158,6 @@ public function SaveAddress($documentserver,
             $this->config->SetSettingsError($error);
         }
 
-        if ($this->config->checkEncryptionModule() === true) {
-            $this->logger->info("SaveSettings when encryption is enabled", array("app" => $this->appName));
-        }
-
         return [
             "documentserver" => $this->config->GetDocumentServerUrl(),
             "documentserverInternal" => $this->config->GetDocumentServerInternalUrl(true),

diff --git a/css/settings.css b/css/settings.css
@@ -30,9 +30,6 @@
     box-sizing: content-box;
     padding-top: 6px;
 }
-.onlyoffice-error {
-    color: red;
-}
 .onlyoffice-header {
     display: inline-block;
     margin-top: 16px;

diff --git a/js/desktop.js b/js/desktop.js
@@ -38,7 +38,7 @@
     $("html").addClass("AscDesktopEditor");
 
     var domain = new RegExp("^http(s)?:\/\/[^\/]+").exec(location)[0];
-    domain += + OC.getRootPath();
+    domain += OC.getRootPath();
 
     var data = {
         displayName: oc_current_user,

diff --git a/l10n/bg.js b/l10n/bg.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Bad Response. Errors: " : "Неправилен отговор. Грешки:",
     "Documentation" : "Документация",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "Адреса на ONLYOFFICE Document услугата определя адреса на сървъра с инсталирани услуги за документи. Моля, променете '<documentserver>' адреса на сървъра в долния ред.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "Активирано е криптиране, приложението не може да продължи работа. Ще може да продължите работа с приложението, ако използвате Основен ключ.",
     "Document Editing Service address" : "Адрес на услугата за редактиране на документи",
     "Advanced server settings" : "Допълнителни настройки на сървъра",
     "Document Editing Service address for internal requests from the server" : "Адрес на услугата за редактиране на документи за вътрешни заявки към сървъра",

diff --git a/l10n/bg.json b/l10n/bg.json
@@ -31,7 +31,6 @@
     "Bad Response. Errors: " : "Неправилен отговор. Грешки:",
     "Documentation" : "Документация",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "Адреса на ONLYOFFICE Document услугата определя адреса на сървъра с инсталирани услуги за документи. Моля, променете '<documentserver>' адреса на сървъра в долния ред.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "Активирано е криптиране, приложението не може да продължи работа. Ще може да продължите работа с приложението, ако използвате Основен ключ.",
     "Document Editing Service address" : "Адрес на услугата за редактиране на документи",
     "Advanced server settings" : "Допълнителни настройки на сървъра",
     "Document Editing Service address for internal requests from the server" : "Адрес на услугата за редактиране на документи за вътрешни заявки към сървъра",

diff --git a/l10n/de.js b/l10n/de.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Bad Response. Errors: " : "Bad Response. Fehler:",
     "Documentation" : "Dokumentation",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "ONLYOFFICE Document Servicestandort gibt die Adresse des Servers mit den installierten Dokumentdiensten an. Ändere bitte '<documenterver>' für die Serveradresse in der folgenden Zeile.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "App Verschlüsselung ist aktiviert. Die Anwendung kann nicht funktionieren. Du kannst mit der Anwendung weiterarbeiten, wenn Du den Hauptschlüssel aktivierst.",
     "Document Editing Service address" : "Serviceadresse der Dokumentbearbeitung",
     "Advanced server settings" : "Erweiterte Servereinstellungen",
     "Document Editing Service address for internal requests from the server" : "Serviceadresse der Dokumentbearbeitung für interne Anforderungen vom Server",
@@ -49,7 +48,7 @@ OC.L10N.register(
     "Server settings" : "Servereinstellungen",
     "Common settings" : "Allgemeine Einstellungen",
     "Editor customization settings" : "Editor-Einstellungen",
-    "The customization section allows to customize the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
+    "The customization section allows personalizing the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
     "Display Chat menu button" : "Chat-Taste anzeigen",
     "Display the header more compact" : "Kompakten Header anzeigen",
     "Display Feedback & Support menu button" : "Feedback-& Support-Taste anzeigen",

diff --git a/l10n/de.json b/l10n/de.json
@@ -31,7 +31,6 @@
     "Bad Response. Errors: " : "Bad Response. Fehler:",
     "Documentation" : "Dokumentation",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "ONLYOFFICE Document Servicestandort gibt die Adresse des Servers mit den installierten Dokumentdiensten an. Ändere bitte '<documenterver>' für die Serveradresse in der folgenden Zeile.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "App Verschlüsselung ist aktiviert. Die Anwendung kann nicht funktionieren. Du kannst mit der Anwendung weiterarbeiten, wenn Du den Hauptschlüssel aktivierst.",
     "Document Editing Service address" : "Serviceadresse der Dokumentbearbeitung",
     "Advanced server settings" : "Erweiterte Servereinstellungen",
     "Document Editing Service address for internal requests from the server" : "Serviceadresse der Dokumentbearbeitung für interne Anforderungen vom Server",
@@ -47,7 +46,7 @@
     "Server settings" : "Servereinstellungen",
     "Common settings" : "Allgemeine Einstellungen",
     "Editor customization settings" : "Editor-Einstellungen",
-    "The customization section allows to customize the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
+    "The customization section allows personalizing the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
     "Display Chat menu button" : "Chat-Taste anzeigen",
     "Display the header more compact" : "Kompakten Header anzeigen",
     "Display Feedback & Support menu button" : "Feedback-& Support-Taste anzeigen",

diff --git a/l10n/de_DE.js b/l10n/de_DE.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Bad Response. Errors: " : "Bad Response. Fehler:",
     "Documentation" : "Dokumentation",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "ONLYOFFICE Document Servicestandort gibt die Adresse des Servers mit den installierten Dokumentdiensten an. Bitte ändern Sie '<documenterver>' für die Serveradresse in der folgenden Zeile.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "App Verschlüsselung ist aktiviert. Die Anwendung kann nicht funktionieren. Sie können mit der Anwendung weiterarbeiten, wenn Sie den Hauptschlüssel aktivieren.",
     "Document Editing Service address" : "Serviceadresse der Dokumentbearbeitung",
     "Advanced server settings" : "Erweiterte Servereinstellungen",
     "Document Editing Service address for internal requests from the server" : "Serviceadresse der Dokumentbearbeitung für interne Anforderungen vom Server",
@@ -49,7 +48,7 @@ OC.L10N.register(
     "Server settings" : "Servereinstellungen",
     "Common settings" : "Allgemeine Einstellungen",
     "Editor customization settings" : "Editor-Einstellungen",
-    "The customization section allows to customize the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
+    "The customization section allows personalizing the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
     "Display Chat menu button" : "Chat-Taste anzeigen",
     "Display the header more compact" : "Kompakten Header anzeigen",
     "Display Feedback & Support menu button" : "Feedback-& Support-Taste anzeigen",

diff --git a/l10n/de_DE.json b/l10n/de_DE.json
@@ -31,7 +31,6 @@
     "Bad Response. Errors: " : "Bad Response. Fehler:",
     "Documentation" : "Dokumentation",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "ONLYOFFICE Document Servicestandort gibt die Adresse des Servers mit den installierten Dokumentdiensten an. Bitte ändern Sie '<documenterver>' für die Serveradresse in der folgenden Zeile.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "App Verschlüsselung ist aktiviert. Die Anwendung kann nicht funktionieren. Sie können mit der Anwendung weiterarbeiten, wenn Sie den Hauptschlüssel aktivieren.",
     "Document Editing Service address" : "Serviceadresse der Dokumentbearbeitung",
     "Advanced server settings" : "Erweiterte Servereinstellungen",
     "Document Editing Service address for internal requests from the server" : "Serviceadresse der Dokumentbearbeitung für interne Anforderungen vom Server",
@@ -47,7 +46,7 @@
     "Server settings" : "Servereinstellungen",
     "Common settings" : "Allgemeine Einstellungen",
     "Editor customization settings" : "Editor-Einstellungen",
-    "The customization section allows to customize the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
+    "The customization section allows personalizing the editor interface" : "Die Anpassungssektion ermöglicht die Anpassung der Editoroberfläche",
     "Display Chat menu button" : "Chat-Taste anzeigen",
     "Display the header more compact" : "Kompakten Header anzeigen",
     "Display Feedback & Support menu button" : "Feedback-& Support-Taste anzeigen",

diff --git a/l10n/es.js b/l10n/es.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Bad Response. Errors: " : "Respuesta Mala. Errores:",
     "Documentation" : "Documentación",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "Ubicación del Servidor de Documentos de ONLYOFFICE especifica la dirección del servidor con los servicios de documentos instalados. Por favor, cambie '<documentserver>' para la dirección de servidor en la línea inferior.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "Aplicación de encriptación está activada, esta aplicación no puede funcionar. Usted puede seguir trabajando con la aplicación si activa la clave maestra.",
     "Document Editing Service address" : "Dirección del Servicio de Edición de Documentos",
     "Advanced server settings" : "Ajustes de servidor avanzados",
     "Document Editing Service address for internal requests from the server" : "Dirección del Servicio de Edición de Documentos para solicitudes internas del servidor",
@@ -49,7 +48,7 @@ OC.L10N.register(
     "Server settings" : "Ajustes de servidor",
     "Common settings" : "Ajustes comunes",
     "Editor customization settings" : "Ajustes del editor",
-    "The customization section allows to customize the editor interface" : "La sección de personalización permite customizar la interfaz del editor",
+    "The customization section allows personalizing the editor interface" : "La sección de personalización permite customizar la interfaz del editor",
     "Display Chat menu button" : "Mostrar el botón de Chat",
     "Display the header more compact" : "Mostrar el encabezado más compacto",
     "Display Feedback & Support menu button" : "Mostrar el botón de Feedback y Soporte",

diff --git a/l10n/es.json b/l10n/es.json
@@ -31,7 +31,6 @@
     "Bad Response. Errors: " : "Respuesta Mala. Errores:",
     "Documentation" : "Documentación",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "Ubicación del Servidor de Documentos de ONLYOFFICE especifica la dirección del servidor con los servicios de documentos instalados. Por favor, cambie '<documentserver>' para la dirección de servidor en la línea inferior.",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "Aplicación de encriptación está activada, esta aplicación no puede funcionar. Usted puede seguir trabajando con la aplicación si activa la clave maestra.",
     "Document Editing Service address" : "Dirección del Servicio de Edición de Documentos",
     "Advanced server settings" : "Ajustes de servidor avanzados",
     "Document Editing Service address for internal requests from the server" : "Dirección del Servicio de Edición de Documentos para solicitudes internas del servidor",
@@ -47,7 +46,7 @@
     "Server settings" : "Ajustes de servidor",
     "Common settings" : "Ajustes comunes",
     "Editor customization settings" : "Ajustes del editor",
-    "The customization section allows to customize the editor interface" : "La sección de personalización permite customizar la interfaz del editor",
+    "The customization section allows personalizing the editor interface" : "La sección de personalización permite customizar la interfaz del editor",
     "Display Chat menu button" : "Mostrar el botón de Chat",
     "Display the header more compact" : "Mostrar el encabezado más compacto",
     "Display Feedback & Support menu button" : "Mostrar el botón de Feedback y Soporte",

diff --git a/l10n/fr.js b/l10n/fr.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Bad Response. Errors: " : "Mauvaise réponse. Erreurs:",
     "Documentation" : "Documentation",
     "ONLYOFFICE Document Service Location specifies the address of the server with the document services installed. Please change the '<documentserver>' for the server address in the below line." : "L'emplacement du service d'édition de document ONLYOFFICE désigne l'adresse du serveur sur lequel est installé le service de document. Veuillez modifier le '<documentserver>' avec l'adresse du serveur de service de document dans la ligne ci-dessous",
-    "Encryption App is enabled, the application cannot work. You can continue working with the application if you enable master key." : "L'application de chiffrement est activée, ONLYOFFICE ne peut pas fonctionner. Vous pouvez continuer à travailler avec ONLYOFFICE si vous activez la clé principale (master key)",
     "Document Editing Service address" : "Adresse du service d'édition de document",
     "Advanced server settings" : "Paramètres avancés du serveur",
     "Document Editing Service address for internal requests from the server" : "Adresse du service d'édition de document pour les demandes internes du serveur",
@@ -49,7 +48,7 @@ OC.L10N.register(
     "Server settings" : "Paramètres du serveur",
     "Common settings" : "Paramètres communs",
     "Editor customization settings" : "Paramètres de personnalisation de l'éditeur",
-    "The customization section allows to customize the editor interface" : "La section de personnalisation permet de personnaliser l'interface de l'éditeur",
+    "The customization section allows personalizing the editor interface" : "La section de personnalisation permet de personnaliser l'interface de l'éditeur",
     "Display Chat menu button" : "Afficher le bouton du menu du chat",
     "Display the header more compact" : "Afficher l'en-tête plus compact",
     "Display Feedback & Support menu button" : "Afficher le bouton du menu 'Feedback & Support'",