Merge pull request #831 from ONLYOFFICE/feature/nc-27

Release/8.0.0
ONLYOFFICE · Jun 14, 2023 · 0cbaa6e · 0cbaa6e
2 parents b7350cb + 55b817a
commit 0cbaa6e
Show file tree

Hide file tree

Showing 36 changed files with 23 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 8.0.0
+## Changed
+- compatible with Nextcloud 27
+
 ## 7.8.0
 ## Added
 - disable plugins setting

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud 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>apache</licence>
     <author mail="dev@onlyoffice.com" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>7.8.0</version>
+    <version>8.0.0</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <prevent_group_restriction/>
@@ -30,7 +30,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open_form.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="26"/>
+        <nextcloud min-version="27" max-version="27"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -48,8 +48,8 @@
         ["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" => "sharingapi#get_shares", "url" => "/api/v1/shares/{fileId}", "verb" => "GET"],
-        ["name" => "sharingapi#set_shares", "url" => "/api/v1/shares", "verb" => "PUT"]
+        ["name" => "editorApi#config", "url" => "/api/v1/config/{fileId}", "verb" => "GET"],
+        ["name" => "sharingApi#get_shares", "url" => "/api/v1/shares/{fileId}", "verb" => "GET"],
+        ["name" => "sharingApi#set_shares", "url" => "/api/v1/shares", "verb" => "PUT"]
     ]
 ];
diff --git a/lib/adminsection.php → lib/AdminSection.php b/lib/adminsection.php → lib/AdminSection.php
diff --git a/lib/adminsettings.php → lib/AdminSettings.php b/lib/adminsettings.php → lib/AdminSettings.php
diff --git a/lib/appconfig.php → lib/AppConfig.php b/lib/appconfig.php → lib/AppConfig.php
@@ -692,7 +692,9 @@ public function SetPreview($value) {
      * @return bool
      */
     public function GetAdvanced() {
-        return $this->config->getAppValue($this->appName, $this->_advanced, "false") === "true";
+        //todo: save not working in v27
+        return false;
+            //$this->config->getAppValue($this->appName, $this->_advanced, "false") === "true";
     }
 
     /**

diff --git a/appinfo/application.php → lib/AppInfo/Application.php b/appinfo/application.php → lib/AppInfo/Application.php
@@ -91,16 +91,16 @@ public function __construct(array $urlParams = []) {
 
     public function register(IRegistrationContext $context): void {
         if (!class_exists('\\Firebase\\JWT\\BeforeValidException')) {
-            require_once __DIR__ . "/../3rdparty/jwt/BeforeValidException.php";
+            require_once __DIR__ . "/../../3rdparty/jwt/BeforeValidException.php";
         }
         if (!class_exists('\\Firebase\\JWT\\ExpiredException')) {
-            require_once __DIR__ . "/../3rdparty/jwt/ExpiredException.php";
+            require_once __DIR__ . "/../../3rdparty/jwt/ExpiredException.php";
         }
         if (!class_exists('\\Firebase\\JWT\\SignatureInvalidException')) {
-            require_once __DIR__ . "/../3rdparty/jwt/SignatureInvalidException.php";
+            require_once __DIR__ . "/../../3rdparty/jwt/SignatureInvalidException.php";
         }
         if (!class_exists('\\Firebase\\JWT\\JWT')) {
-            require_once __DIR__ . "/../3rdparty/jwt/JWT.php";
+            require_once __DIR__ . "/../../3rdparty/jwt/JWT.php";
         }
 
         // Set the leeway for the JWT library in case the system clock is a second off

diff --git a/lib/command/documentserver.php → lib/Command/DocumentServer.php b/lib/command/documentserver.php → lib/Command/DocumentServer.php
diff --git a/controller/callbackcontroller.php → lib/Controller/CallbackController.php b/controller/callbackcontroller.php → lib/Controller/CallbackController.php
@@ -488,7 +488,7 @@ public function track($doc, $users, $key, $status, $url, $token, $history, $chan
         }
 
         // owner of file from the callback link
-        $ownerId = $hashData->ownerId;
+        $ownerId = $hashData->userId;
         $owner = $this->userManager->get($ownerId);
 
         if (!empty($owner)) {

diff --git a/controller/editorapicontroller.php → lib/Controller/EditorApiController.php b/controller/editorapicontroller.php → lib/Controller/EditorApiController.php
@@ -339,7 +339,9 @@ public function config($fileId, $filePath = null, $shareToken = null, $directTok
             $shareId = $fileStorage->getShareId();
 
             $extraPermissions = null;
-            if ($this->extraPermissions !== null) {
+            //todo: save not working in v27
+            if (false
+                && $this->extraPermissions !== null) {
                 $extraPermissions = $this->extraPermissions->getExtra($shareId);
             }
 

diff --git a/controller/editorcontroller.php → lib/Controller/EditorController.php b/controller/editorcontroller.php → lib/Controller/EditorController.php
diff --git a/controller/federationcontroller.php → lib/Controller/FederationController.php b/controller/federationcontroller.php → lib/Controller/FederationController.php
diff --git a/controller/settingscontroller.php → lib/Controller/SettingsController.php b/controller/settingscontroller.php → lib/Controller/SettingsController.php
diff --git a/controller/sharingapicontroller.php → lib/Controller/SharingApiController.php b/controller/sharingapicontroller.php → lib/Controller/SharingApiController.php
diff --git a/controller/templatecontroller.php → lib/Controller/TemplateController.php b/controller/templatecontroller.php → lib/Controller/TemplateController.php
diff --git a/lib/crypt.php → lib/Crypt.php b/lib/crypt.php → lib/Crypt.php
diff --git a/lib/directeditor.php → lib/DirectEditor.php b/lib/directeditor.php → lib/DirectEditor.php
diff --git a/lib/documentservice.php → lib/DocumentService.php b/lib/documentservice.php → lib/DocumentService.php
diff --git a/lib/extrapermissions.php → lib/ExtraPermissions.php b/lib/extrapermissions.php → lib/ExtraPermissions.php
diff --git a/lib/filecreator.php → lib/FileCreator.php b/lib/filecreator.php → lib/FileCreator.php
diff --git a/lib/fileutility.php → lib/FileUtility.php b/lib/fileutility.php → lib/FileUtility.php
diff --git a/lib/fileversions.php → lib/FileVersions.php b/lib/fileversions.php → lib/FileVersions.php
diff --git a/lib/hooks.php → lib/Hooks.php b/lib/hooks.php → lib/Hooks.php
diff --git a/lib/keymanager.php → lib/KeyManager.php b/lib/keymanager.php → lib/KeyManager.php
diff --git a/lib/listeners/directeditorlistener.php → lib/Listeners/DirectEditorListener.php b/lib/listeners/directeditorlistener.php → lib/Listeners/DirectEditorListener.php
diff --git a/lib/listeners/filesharinglistener.php → lib/Listeners/FileSharingListener.php b/lib/listeners/filesharinglistener.php → lib/Listeners/FileSharingListener.php
diff --git a/lib/listeners/fileslistener.php → lib/Listeners/FilesListener.php b/lib/listeners/fileslistener.php → lib/Listeners/FilesListener.php
diff --git a/lib/listeners/viewerlistener.php → lib/Listeners/ViewerListener.php b/lib/listeners/viewerlistener.php → lib/Listeners/ViewerListener.php
diff --git a/lib/listeners/widgetlistener.php → lib/Listeners/WidgetListener.php b/lib/listeners/widgetlistener.php → lib/Listeners/WidgetListener.php
diff --git a/lib/notifier.php → lib/Notifier.php b/lib/notifier.php → lib/Notifier.php
diff --git a/lib/preview.php → lib/Preview.php b/lib/preview.php → lib/Preview.php
diff --git a/lib/remoteinstance.php → lib/RemoteInstance.php b/lib/remoteinstance.php → lib/RemoteInstance.php
diff --git a/lib/settingsdata.php → lib/SettingsData.php b/lib/settingsdata.php → lib/SettingsData.php
diff --git a/lib/templatemanager.php → lib/TemplateManager.php b/lib/templatemanager.php → lib/TemplateManager.php
diff --git a/lib/templateprovider.php → lib/TemplateProvider.php b/lib/templateprovider.php → lib/TemplateProvider.php
diff --git a/templates/settings.php b/templates/settings.php
@@ -114,9 +114,11 @@
     </p>
 
     <p>
-        <input type="checkbox" class="checkbox" id="onlyofficeAdvanced"
+        <input type="checkbox" class="checkbox" id="onlyofficeAdvanced" disabled="disabled"
             <?php if ($_["advanced"]) { ?>checked="checked"<?php } ?> />
         <label for="onlyofficeAdvanced"><?php p($l->t("Provide advanced document permissions using ONLYOFFICE Docs")) ?></label>
+        </br>
+        <em><?php p($l->t("Not yet available in Nextcloud 27")) ?></em>
     </p>
 
     <p>