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

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

.eslintrc.json

@@ -0,0 +1,11 @@
+{
+    "extends": "@ownclouders",
+    "rules": {
+      "array-bracket-newline": ["error", "consistent"],
+      "multiline-ternary": ["error", "always-multiline"],
+      "no-var": "error",
+      "prefer-const": "error",
+      "object-shorthand": ["error", "always"],
+      "eqeqeq": ["error", "smart"]
+    }
+}

.github/workflows/artifact.yml

@@ -2,6 +2,8 @@ name: Artifact
 
 on:
   workflow_dispatch:
+  push:
+    branches: [master]
   pull_request:
     types: [opened, reopened]
     branches: [master]

.stylelintrc.json

@@ -0,0 +1,13 @@
+{
+    "extends": ["stylelint-config-standard", "stylelint-config-sass-guidelines"],
+    "rules": {
+      "scss/at-extend-no-missing-placeholder": null,
+      "max-nesting-depth": null,
+      "selector-class-pattern": null,
+      "selector-max-compound-selectors": null,
+      "selector-max-id": null,
+      "selector-no-qualifying-type": null,
+      "property-no-vendor-prefix": null,
+      "string-quotes": "double"
+    }
+  }

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 9.5.1
+## Added
+- default empty templates
+- support tiff format for inserting
+- Finnish, Hebrew, Norwegian, Slovenian empty file templates
+
+## Changed
+- demo server address changed
+- editing pdf by default
+
 ## 9.3.1
 ## Changed
 - creating and editing pdf form

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>9.3.1</version>
+    <version>9.5.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>

controller/callbackcontroller.php

@@ -363,7 +363,7 @@ public function emptyfile($doc) {
 			}
 		}
 
-		$templatePath = TemplateManager::getEmptyTemplatePath("en", ".docx");
+		$templatePath = TemplateManager::getEmptyTemplatePath("default", ".docx");
 
 		$template = file_get_contents($templatePath);
 		if (!$template) {

controller/editorapicontroller.php

@@ -234,15 +234,14 @@ public function fillempty($fileId) {
 	 * @param bool $desktop - desktop label
 	 * @param bool $template - file is template
 	 * @param string $anchor - anchor link
-	 * @param bool $forceEdit - open editing
 	 *
 	 * @return JSONResponse
 	 *
 	 * @NoAdminRequired
 	 * @PublicPage
 	 * @CORS
 	 */
-	public function config($fileId, $filePath = null, $shareToken = null, $version = 0, $inframe = false, $desktop = false, $template = false, $anchor = null, $forceEdit = false) {
+	public function config($fileId, $filePath = null, $shareToken = null, $version = 0, $inframe = false, $desktop = false, $template = false, $anchor = null) {
 		$user = $this->userSession->getUser();
 		$userId = null;
 		$accountId = null;
@@ -381,7 +380,7 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
 					&& $file->isUpdateable()
 					&& !$isPersistentLock
 					&& (empty($shareToken) || ($share->getPermissions() & Constants::PERMISSION_UPDATE) === Constants::PERMISSION_UPDATE);
-		$params["document"]["permissions"]["edit"] = $editable && ($forceEdit || !$canFillForms);
+		$params["document"]["permissions"]["edit"] = $editable;
 		if (($editable || $restrictedEditing) && ($canEdit || $canFillForms)) {
 			$ownerId = null;
 			$owner = $file->getOwner();

controller/editorcontroller.php

@@ -1278,7 +1278,6 @@ public function download($fileId, $toExtension = null, $template = false) {
 	 * @param string $shareToken - access token
 	 * @param integer $version - file version
 	 * @param bool $inframe - open in frame
-	 * @param bool $forceEdit - open editing
 	 * @param bool $template - file is template
 	 * @param string $anchor - anchor for file content
 	 *
@@ -1287,7 +1286,7 @@ public function download($fileId, $toExtension = null, $template = false) {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function index($fileId, $filePath = null, $shareToken = null, $version = 0, $inframe = false, $forceEdit = false, $template = false, $anchor = null) {
+	public function index($fileId, $filePath = null, $shareToken = null, $version = 0, $inframe = false, $template = false, $anchor = null) {
 		$this->logger->debug("Open: $fileId ($version) $filePath", ["app" => $this->appName]);
 
 		if (empty($shareToken) && !$this->userSession->isLoggedIn()) {
@@ -1327,8 +1326,7 @@ public function index($fileId, $filePath = null, $shareToken = null, $version =
 			"version" => $version,
 			"template" => $template,
 			"inframe" => false,
-			"anchor" => $anchor,
-			"forceEdit" => $forceEdit
+			"anchor" => $anchor
 		];
 
 		if ($inframe === true) {
@@ -1359,16 +1357,15 @@ public function index($fileId, $filePath = null, $shareToken = null, $version =
 	 * @param string $shareToken - access token
 	 * @param integer $version - file version
 	 * @param bool $inframe - open in frame
-	 * @param bool $forceEdit - open editing
 	 *
 	 * @return TemplateResponse
 	 *
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 * @PublicPage
 	 */
-	public function publicPage($fileId, $shareToken, $version = 0, $inframe = false, $forceEdit = false) {
-		return $this->index($fileId, null, $shareToken, $version, $inframe, $forceEdit);
+	public function publicPage($fileId, $shareToken, $version = 0, $inframe = false) {
+		return $this->index($fileId, null, $shareToken, $version, $inframe);
 	}
 
 	/**

css/editor.css

@@ -17,19 +17,22 @@
  */
 
 #app > iframe {
-    position: absolute;
-    vertical-align: top;
+  position: absolute;
+  vertical-align: top;
 }
+
 #body-public #content {
-    height: 100%;
+  height: 100%;
 }
+
 #content-wrapper #content {
-    height: calc(100dvh - 45px);
+  height: calc(100dvh - 45px);
 }
 
 .AscDesktopEditor #header {
-    display: none;
+  display: none;
 }
+
 .AscDesktopEditor #content-wrapper {
-    padding-top: 0;
+  padding-top: 0;
 }

css/main.css

@@ -17,77 +17,91 @@
  */
 
 .icon-onlyoffice-new-docx {
-    background-image: url("../img/new-docx.svg");
+  background-image: url("../img/new-docx.svg");
 }
+
 .icon-onlyoffice-new-xlsx {
-    background-image: url("../img/new-xlsx.svg");
+  background-image: url("../img/new-xlsx.svg");
 }
+
 .icon-onlyoffice-new-pptx {
-    background-image: url("../img/new-pptx.svg");
+  background-image: url("../img/new-pptx.svg");
 }
+
 .icon-onlyoffice-new-pdf {
-    background-image: url("../img/new-pdf.svg");
+  background-image: url("../img/new-pdf.svg");
 }
+
 .icon-onlyoffice-open,
 .icon-onlyoffice-convert,
 .icon-onlyoffice-download,
 .icon-onlyoffice-create {
-    background-image: url("../img/app-dark.svg");
+  background-image: url("../img/app-dark.svg");
+}
+
+.AscDesktopEditor #content-wrapper {
+  padding-top: 0;
+}
+
+.AscDesktopEditor #controls,
+.AscDesktopEditor #app-sidebar {
+  top: 0;
 }
 
 /* onlyoffice-inline */
 body.onlyoffice-inline #content-wrapper {
-    overscroll-behavior-y: none;
-    overflow: hidden;
+  overflow: hidden;
+  overscroll-behavior-y: none;
 }
+
 body.onlyoffice-inline #app-navigation,
 body.onlyoffice-inline .searchbox,
 body.onlyoffice-inline #app-content #controls {
-    display: none;
+  display: none;
 }
+
 body.onlyoffice-inline #app-navigation-toggle {
-    display: none !important;
+  display: none !important;
 }
+
 body.onlyoffice-inline #content #app-content {
-    margin-left: 0;
-    overflow: hidden;
+  margin-left: 0;
+  overflow: hidden;
 }
-#onlyofficeFrame {
-    background-color: #fff;
-    width: 100%;
-    height: calc(100vh - 45px);
-    display: block;
-    position: absolute;
-    top: 0;
-    z-index: 110;
+
+#onlyoffice-frame {
+  background-color: #fff;
+  display: block;
+  height: calc(100vh - 45px);
+  position: absolute;
+  top: 0;
+  width: 100%;
+  z-index: 110;
 }
 
 .onlyoffice-public-open {
-    display: inline-block;
-    margin-top: 10px;
+  display: inline-block;
+  margin-top: 10px;
 }
 
 /* AscDesktopEditor */
 .AscDesktopEditor #header {
-    display: none;
-}
-.AscDesktopEditor #content-wrapper {
-    padding-top: 0;
-}
-.AscDesktopEditor #controls,
-.AscDesktopEditor #app-sidebar {
-    top: 0;
+  display: none;
 }
+
 .AscDesktopEditor #body-user table.multiselect thead {
-    top: 44px;
+  top: 44px;
 }
+
 .AscDesktopEditor #body-user #gallery-button {
-    display: none;
+  display: none;
 }
+
 .onlyoffice-download-container {
-    display: flex;
+  display: flex;
 }
+
 .onlyoffice-download-container p {
-    margin-right: 10px;
-    padding-top: 10px;
+  margin-right: 10px;
+  padding-top: 10px;
 }