Merge pull request #393 from ONLYOFFICE/develop

Release/7.6.7

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 7.6.7
+## Added
+- Dutch translation
+- Chinese (Traditional, Taiwan), Basque (Spain), Armenian and Malay (Malaysia) empty file templates
+
+## Changed
+- fix edit locked file
+- generate preview by default
+- fix collaboration of federated files
+- disable forcesave on encryption
+
 ## 7.5.4
 ## Changed
 - compatible with ownCloud 10.11

appinfo/database.xml

@@ -42,7 +42,7 @@
         <comments>last forcesave done</comments>
       </field>
       <index>
-        <name>file_id_index</name>
+        <name>onlyoffice_file_id_index</name>
         <unique>true</unique>
         <field>
           <name>file_id</name>
@@ -51,4 +51,45 @@
       </index>
     </declaration>
   </table>
+
+  <table>
+    <name>*dbprefix*onlyoffice_instance</name>
+    <declaration>
+      <field>
+        <name>id</name>
+        <type>integer</type>
+        <default>0</default>
+        <notnull>true</notnull>
+        <autoincrement>1</autoincrement>
+      </field>
+      <field>
+        <name>remote</name>
+        <type>text</type>
+        <notnull>true</notnull>
+        <length>128</length>
+        <comments>remote instance address</comments>
+      </field>
+      <field>
+        <name>expire</name>
+        <type>bigint</type>
+        <default>0</default>
+        <comments>time to live</comments>
+      </field>
+      <field>
+        <name>status</name>
+        <type>integer</type>
+        <default>0</default>
+        <notnull>true</notnull>
+        <comments>remote instance status</comments>
+      </field>
+      <index>
+        <name>onlyoffice_remote_index</name>
+        <unique>true</unique>
+        <field>
+          <name>remote</name>
+          <sorting>ascending</sorting>
+        </field>
+      </index>
+    </declaration>
+  </table>
 </database>

appinfo/info.xml

@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within ownCloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>apl2</licence>
     <author>Ascensio System SIA</author>
-    <version>7.5.4</version>
+    <version>7.6.7</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>

appinfo/routes.php

@@ -48,6 +48,7 @@
     "ocs" => [
         ["name" => "federation#key", "url" => "/api/v1/key", "verb" => "POST"],
         ["name" => "federation#keylock", "url" => "/api/v1/keylock", "verb" => "POST"],
+        ["name" => "federation#healthcheck", "url" => "/api/v1/healthcheck", "verb" => "GET"],
         ["name" => "editorapi#config", "url" => "/api/v1/config/{fileId}", "verb" => "GET"],
         ["name" => "editorapi#fillempty", "url" => "/api/v1/empty/{fileId}", "verb" => "GET"],
         ["name" => "settingsapi#get_doc_server_url", "url" => "/api/v1/settings/docserver", "verb" => "GET"],

controller/callbackcontroller.php

@@ -37,14 +37,13 @@
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
 
-use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
-
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\Crypt;
 use OCA\Onlyoffice\DocumentService;
 use OCA\Onlyoffice\FileVersions;
-use OCA\Onlyoffice\KeyManager;
 use OCA\Onlyoffice\VersionManager;
+use OCA\Onlyoffice\KeyManager;
+use OCA\Onlyoffice\RemoteInstance;
 use OCA\Onlyoffice\TemplateManager;
 
 /**
@@ -534,8 +533,8 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
 
                     $prevIsForcesave = KeyManager::wasForcesave($fileId);
 
-                    if ($file->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
-                        $isLock = KeyManager::lockFederatedKey($file, $isForcesave, null);
+                    if (RemoteInstance::isRemoteFile($file)) {
+                        $isLock = RemoteInstance::lockRemoteKey($file, $isForcesave, null);
                         if ($isForcesave && !$isLock) {
                             break;
                         }
@@ -548,9 +547,9 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
                         return $file->putContent($newData);
                     });
 
-                    if ($file->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
+                    if (RemoteInstance::isRemoteFile($file)) {
                         if ($isForcesave) {
-                            KeyManager::lockFederatedKey($file, false, $isForcesave);
+                            RemoteInstance::lockRemoteKey($file, false, $isForcesave);
                         }
                     } else {
                         KeyManager::lock($fileId, false);
@@ -573,6 +572,11 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
                         FileVersions::saveAuthor($file->getFileInfo(), $user);
                     }
 
+                    if ($this->config->checkEncryptionModule() === "master"
+                        && !$isForcesave) {
+                        KeyManager::delete($fileId);
+                    }
+
                     $result = 0;
                 } catch (\Exception $e) {
                     $this->logger->logException($e, ["message" => "Track: $fileId status $status error", "app" => $this->appName]);

controller/editorapicontroller.php

@@ -244,8 +244,10 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
 
         $user = $this->userSession->getUser();
         $userId = null;
+        $accountId = null;
         if (!empty($user)) {
             $userId = $user->getUID();
+            $accountId = $user->getAccountId();
         }
 
         list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId, $filePath, $template) : $this->fileUtility->getFileByToken($fileId, $shareToken);
@@ -360,9 +362,10 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
             $locks = $fileStorage->getLocks($file->getFileInfo()->getInternalPath(), false);
             if (count($locks) > 0) {
                 $activeLock = $locks[0];
-                $lockOwner = explode(' ', trim($activeLock->getOwner()))[0];
-                if ($userId !== $lockOwner) {
+
+                if ($accountId !== $activeLock->getOwnerAccountId()) {
                     $isPersistentLock = true;
+                    $lockOwner = $activeLock->getOwner();
                     $this->logger->debug("File $fileId is locked by $lockOwner", ["app" => $this->appName]);
                 }
             }

controller/federationcontroller.php

@@ -28,12 +28,11 @@
 
 use OC\OCS\Result;
 
-use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
-
 use OCA\Onlyoffice\AppConfig;
 use OCA\Onlyoffice\DocumentService;
 use OCA\Onlyoffice\FileUtility;
 use OCA\Onlyoffice\KeyManager;
+use OCA\Onlyoffice\RemoteInstance;
 
 /**
  * OCS handler
@@ -137,8 +136,8 @@ public function keylock($shareToken, $path, $lock, $fs) {
 
         $fileId = $file->getId();
 
-        if ($file->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
-            $isLock = KeyManager::lockFederatedKey($file, $lock, $fs);
+        if (RemoteInstance::isRemoteFile($file)) {
+            $isLock = RemoteInstance::lockRemoteKey($file, $lock, $fs);
             if (!$isLock) {
                 return new Result(["error" => "Failed request"]);
             }
@@ -152,4 +151,19 @@ public function keylock($shareToken, $path, $lock, $fs) {
         $this->logger->debug("Federated request lock for " . $fileId, ["app" => $this->appName]);
         return new Result();
     }
+
+    /**
+     * Health check instance
+     *
+     * @return Result
+     *
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     */
+    public function healthcheck() {
+        $this->logger->debug("Federated healthcheck", ["app" => $this->appName]);
+
+        return new Result(["alive" => true]);
+    }
 }

controller/settingscontroller.php

@@ -116,7 +116,7 @@ public function index() {
             "sameTab" => $this->config->GetSameTab(),
             "preview" => $this->config->GetPreview(),
             "versionHistory" => $this->config->GetVersionHistory(),
-            "encryption" => ($this->config->checkEncryptionModule() === true),
+            "encryption" => $this->config->checkEncryptionModule(),
             "limitGroups" => $this->config->GetLimitGroups(),
             "chat" => $this->config->GetCustomizationChat(),
             "compactHeader" => $this->config->GetCustomizationCompactHeader(),

css/settings.css

@@ -63,7 +63,10 @@
     -moz-column-width: 140px;
     -webkit-column-width: 140px;
 }
-#personal-show + label{
+#personal-show + label {
     margin-top: -25px;
     margin-left: 230px;
 }
+.onlyoffice-option-desc {
+    margin-left: 20px;
+}

l10n/de.js

@@ -111,6 +111,7 @@ OC.L10N.register(
     "Default editor theme": "Standardmäßiges Thema des Editors",
     "Light": "Hell",
     "Classic Light": "Klassisch Hell",
-    "Dark": "Dunkel"
+    "Dark": "Dunkel",
+    "This feature is unavailable due to encryption settings.": "Diese Funktion ist wegen der Verschlüsselungseinstellungen nicht verfügbar"
 },
 "nplurals=2; plural=(n != 1);");

l10n/de.json

@@ -109,6 +109,7 @@
     "Default editor theme": "Standardmäßiges Thema des Editors",
     "Light": "Hell",
     "Classic Light": "Klassisch Hell",
-    "Dark": "Dunkel"
+    "Dark": "Dunkel",
+    "This feature is unavailable due to encryption settings.": "Diese Funktion ist wegen der Verschlüsselungseinstellungen nicht verfügbar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/de_DE.js

@@ -111,6 +111,7 @@ OC.L10N.register(
     "Default editor theme": "Standardmäßiges Thema des Editors",
     "Light": "Hell",
     "Classic Light": "Klassisch Hell",
-    "Dark": "Dunkel"
+    "Dark": "Dunkel",
+    "This feature is unavailable due to encryption settings.": "Diese Funktion ist wegen der Verschlüsselungseinstellungen nicht verfügbar"
 },
 "nplurals=2; plural=(n != 1);");

l10n/de_DE.json

@@ -109,6 +109,7 @@
     "Default editor theme": "Standardmäßiges Thema des Editors",
     "Light": "Hell",
     "Classic Light": "Klassisch Hell",
-    "Dark": "Dunkel"
+    "Dark": "Dunkel",
+    "This feature is unavailable due to encryption settings.": "Diese Funktion ist wegen der Verschlüsselungseinstellungen nicht verfügbar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/es.js

@@ -111,6 +111,7 @@ OC.L10N.register(
     "Default editor theme": "Tema del editor predeterminado",
     "Light": "Claro",
     "Classic Light": "Clásico claro",
-    "Dark": "Oscuro"
+    "Dark": "Oscuro",
+    "This feature is unavailable due to encryption settings.": "Esta característica no está disponible debido a la configuración de cifrado."
 },
 "nplurals=2; plural=(n != 1);");

l10n/es.json

@@ -109,6 +109,7 @@
     "Default editor theme": "Tema del editor predeterminado",
     "Light": "Claro",
     "Classic Light": "Clásico claro",
-    "Dark": "Oscuro"
+    "Dark": "Oscuro",
+    "This feature is unavailable due to encryption settings.": "Esta característica no está disponible debido a la configuración de cifrado."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/fr.js

@@ -111,6 +111,7 @@ OC.L10N.register(
     "Default editor theme": "Thème d'éditeur par défaut",
     "Light": "Clair",
     "Classic Light": "Classique clair",
-    "Dark": "Sombre"
+    "Dark": "Sombre",
+    "This feature is unavailable due to encryption settings.": "Cette fonctionnalité n'est pas disponible en raison des paramètres de chiffrement."
 },
 "nplurals=2; plural=(n > 1);");

l10n/fr.json

@@ -109,6 +109,7 @@
     "Default editor theme": "Thème d'éditeur par défaut",
     "Light": "Clair",
     "Classic Light": "Classique clair",
-    "Dark": "Sombre"
+    "Dark": "Sombre",
+    "This feature is unavailable due to encryption settings.": "Cette fonctionnalité n'est pas disponible en raison des paramètres de chiffrement."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }

l10n/it.js

@@ -111,6 +111,7 @@ OC.L10N.register(
     "Default editor theme": "Tema dell'editor predefinito",
     "Light": "Chiaro",
     "Classic Light": "Classico chiaro",
-    "Dark": "Scuro"
+    "Dark": "Scuro",
+    "This feature is unavailable due to encryption settings.": "Questa funzionalità non è disponibile a causa delle impostazioni di crittografia."
 },
 "nplurals=2; plural=(n != 1);");

l10n/it.json

@@ -109,6 +109,7 @@
     "Default editor theme": "Tema dell'editor predefinito",
     "Light": "Chiaro",
     "Classic Light": "Classico chiaro",
-    "Dark": "Scuro"
+    "Dark": "Scuro",
+    "This feature is unavailable due to encryption settings.": "Questa funzionalità non è disponibile a causa delle impostazioni di crittografia."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }