Merge pull request 'Release/9.6.1' from develop into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-owncloud/pulls/22

Author: LinneyS

.github/workflows/artifact.yml

@@ -5,15 +5,14 @@ on:
   push:
     branches: [master]
   pull_request:
-    types: [opened, reopened]
     branches: [master]
 
 jobs:
   artifact:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get Info
         run: |
           echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
@@ -28,15 +27,20 @@ jobs:
           cd onlyoffice
           rm -rf ./.github/
           rm -rf ./.git/
+          rm ./.eslintrc.json
           rm ./.gitmodules
+          rm ./.stylelintrc.json
+          rm ./npm-shrinkwrap.json
+          rm ./package.json
+          rm ./ruleset.xml
           rm -rf ./assets/document-templates/.git
           rm -rf ./assets/document-formats/.git
           cd ./appinfo
           sed -i 's|<licence>apl2|<licence>agpl|' info.xml 
           cd $cwd
           tar -czvf onlyoffice.tar.gz onlyoffice
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: onlyoffice
           path: onlyoffice.tar.gz

.github/workflows/lint-eslint.yml

@@ -19,12 +19,12 @@ jobs:
         working-directory: ./js
     steps:
       - name: Install NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Code Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Dependencies
         run: npm ci

.github/workflows/lint-php.yml

@@ -19,7 +19,7 @@ jobs:
     name: php-lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2

.github/workflows/lint-phpcs.yml

@@ -16,7 +16,7 @@ jobs:
     name: php-cs
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:

3rd-Party.license

@@ -1,4 +1,4 @@
-ownCloud ONLYOFFICE integration app uses code from the following 3rd party projects:
+ONLYOFFICE app for ownCloud uses code from the following 3rd party projects:
 
 JWT           - JSON Web Token implementation (https://github.com/firebase/php-jwt/blob/master/LICENSE)
 License:        BSD

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 9.6.1
+## Added
+- setting for setup unknown author display name
+- setting for sending notifications by email
+- opening docm, xlsm, pptm files
+- support IMPORTRANGE
+
+## Changed
+- URL for requests to Conversion API
+- reading JSON instead of XML from Conversion API
+
 ## 9.5.1
 ## Added
 - default empty templates

README.md

@@ -1,4 +1,4 @@
-# ![onlyoffice icon](screenshots/icon.png) ownCloud ONLYOFFICE integration app
+# ![onlyoffice icon](screenshots/icon.png) ONLYOFFICE app for ownCloud
 
 This app allows users to edit office documents from [ownCloud](https://owncloud.com) using ONLYOFFICE Docs packaged as Document Server - [Community or Enterprise Edition](#onlyoffice-docs-editions).
 
@@ -7,14 +7,16 @@ This app allows users to edit office documents from [ownCloud](https://owncloud.
 The app allows to:
 
 * Create and edit text documents, spreadsheets, and presentations.
+* Create and edit PDF forms.
+* Edit PDF files.
 * Share files with different permission types - viewing/editing, commenting, reviewing, filling forms. It's also possible to restrict downloading (in all editors) and modifying filters (in spreadshhets). Sharing via public link is also available. 
 * Co-edit documents in real-time: use two co-editing modes (Fast and Strict), Track Changes, comments, and built-in chat. Co-editing is also available several federated ownCloud instances connected to one Document Server.
 * Work with documents, spreadsheets, and presentations within ownCloud Web. 
 
 Supported formats:
 
-* For editing: DOCM, DOCX, DOCXF, DOTM, DOTX, EPUB, FB2, HTML, ODT, OTT, RTF, TXT, CSV, ODS, OTS, XLSM, XLSX, XLTM, XLTX, ODP, OTP, POTM, POTX, PPSM, PPSX, PPTM, PPTX.
-* For viewing only: DJVU, DOC, DOT, FODT, HTM, MHT, MHTML, OFORM, PDF, STW, SXW, WPS, WPT, XML, XPS, ET, ETT, FODS, SXC, XLS, XLSB, XLT, DPS, DPT, FODP, POT, PPS, PPT, SXI.
+* For editing: DOCM, DOCX, DOTM, DOTX, PDF, EPUB, FB2, HTML, ODT, OTT, RTF, TXT, CSV, ODS, OTS, XLSM, XLSX, XLTM, XLTX, ODP, OTP, POTM, POTX, PPSM, PPSX, PPTM, PPTX.
+* For viewing only: DJVU, DOC, DOT, FODT, HTM, MHT, MHTML, STW, SXW, WPS, WPT, XML, XPS, ET, ETT, FODS, SXC, XLS, XLSB, XLT, DPS, DPT, FODP, POT, PPS, PPT, SXI.
 
 ODT, ODS, and ODP is also available for instant conversion. After you enable the corresponding option in the admin settings, ODF-formatted documents are immediately converted in the editor and opened after you click on it.
 
@@ -36,9 +38,9 @@ To use ONLYOFFICE behind a proxy, please refer to [this article](https://helpcen
 
 You can also use our **[Docker installation](https://github.com/ONLYOFFICE/docker-onlyoffice-owncloud)** to install pre-configured Document Server (free version) and ownCloud with a couple of commands.
 
-## Installing ownCloud ONLYOFFICE integration app
+## Installing ONLYOFFICE app for ownCloud
 
-The ownCloud administrator can install the integration app from the in-built application market.
+The ownCloud administrator can install the app from the in-built application market.
 For that click the upper-left hamburger menu and select **Market**. After that find **ONLYOFFICE** in the list of available applications and install it.
 
 If the server with the ownCloud installed does not have an Internet access, or if you need it for some other reason, the administrator can install the application manually: 
@@ -49,7 +51,7 @@ If the server with the ownCloud installed does not have an Internet access, or i
     cd apps/
     ```
 
-2. Get the ownCloud ONLYOFFICE integration app.
+2. Get the ONLYOFFICE app for ownCloud.
 There are several ways to do that:
 
     a. Download the latest signed version from the official store for [ownCloud](https://marketplace.owncloud.com/apps/onlyoffice).
@@ -73,7 +75,7 @@ There are several ways to do that:
 
 4. In ownCloud open the `~/settings/admin?sectionid=apps&category=disabled` page with _Not enabled_ apps by administrator and click _Enable_ for the **ONLYOFFICE** application.
 
-## Configuring ownCloud ONLYOFFICE integration app
+## Configuring ONLYOFFICE app for ownCloud
 
 In ownCloud open the `~/settings/admin?sectionid=additional#onlyoffice` page with administrative settings for **ONLYOFFICE** section.
 Enter the following address to connect ONLYOFFICE Document Server:
@@ -129,7 +131,7 @@ Depending on your webserver configuration you can drop the `index.php` segment f
 
 ## How it works
 
-The ONLYOFFICE integration follows the API documented [here](https://api.onlyoffice.com/editors/basic):
+The ONLYOFFICE app follows the API documented [here](https://api.onlyoffice.com/editors/basic):
 
 * When creating a new file, the user navigates to a document folder within ownCloud and clicks the **Document**, **Spreadsheet** or **Presentation** item in the _new_ (+) menu.
 
@@ -194,7 +196,7 @@ The instruction on enabling _master key_ based encryption is available in the of
     
     To solve this, we added an asynchronous background task which runs on the server to check availability of the editors. It allows testing the connection between your **ownCloud instance** and **ONLYOFFICE Document Server**, namely availability of server addresses and the validity of the JWT secret are being checked.
  
-    If any issue is detected, the ONLYOFFICE integration connector (consequently, the ability to create and open files) will be disabled. As an ownCloud admin, you will get the corresponding notification. 
+    If any issue is detected, the ONLYOFFICE app (consequently, the ability to create and open files) will be disabled. As an ownCloud admin, you will get the corresponding notification. 
 
     This option allows you to avoid issues when the server settings become incorrect and require changes.
 

appinfo/app.php

@@ -2,7 +2,7 @@
 /**
  * @author Ascensio System SIA <integration@onlyoffice.com>
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

appinfo/application.php

@@ -2,7 +2,7 @@
 /**
  * @author Ascensio System SIA <integration@onlyoffice.com>
  *
- * (c) Copyright Ascensio System SIA 2024
+ * (c) Copyright Ascensio System SIA 2025
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,6 +119,9 @@ function () {
 		$detector->registerType("ott", "application/vnd.oasis.opendocument.text-template");
 		$detector->registerType("ots", "application/vnd.oasis.opendocument.spreadsheet-template");
 		$detector->registerType("otp", "application/vnd.oasis.opendocument.presentation-template");
+		$detector->registerType("docm", "application/vnd.ms-word.document.macroenabled.12");
+		$detector->registerType("xlsm", "application/vnd.ms-excel.sheet.macroenabled.12");
+		$detector->registerType("pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12");
 
 		$previewManager = $container->query(IPreview::class);
 		if ($this->appConfig->getPreview()) {
@@ -228,7 +231,8 @@ function ($c) {
 					$this->crypt,
 					$c->query("IManager"),
 					$c->query("Session"),
-					$c->query("ServerContainer")->getGroupManager()
+					$c->query("ServerContainer")->getGroupManager(),
+					$c->query("Mailer")
 				);
 			}
 		);

appinfo/info.xml

@@ -6,15 +6,15 @@
     <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>9.5.1</version>
+    <version>9.6.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>
     </types>
     <documentation>
-        <admin>https://api.onlyoffice.com/editors/owncloud</admin>
+        <admin>https://helpcenter.onlyoffice.com/integration/owncloud.aspx</admin>
+        <user>https://helpcenter.onlyoffice.com/integration/owncloud.aspx</user>
         <developer>https://github.com/ONLYOFFICE/onlyoffice-owncloud</developer>
-        <user>https://api.onlyoffice.com/editors/owncloud</user>
     </documentation>
     <category>tools</category>
     <website>https://www.onlyoffice.com</website>