Merge pull request #211 from ONLYOFFICE/develop

Release/4.1.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 4.1.1
+## Changed
+- compatible with Nextcloud 16-17
+
 ## 4.1.0
 ## Added
 - inline editor if using the same tab, opening the sidebar, sharing from the editor

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>4.1.0</version>
+    <version>4.1.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>

controller/editorcontroller.php

@@ -59,6 +59,7 @@
 use OCA\Onlyoffice\DocumentService;
 use OCA\Onlyoffice\FileCreator;
 use OCA\Onlyoffice\FileUtility;
+use OCA\Onlyoffice\TemplateManager;
 
 /**
  * Controller with the main functions
@@ -225,7 +226,7 @@ public function create($name, $dir, $shareToken = NULL) {
             return ["error" => $this->trans->t("You don't have enough permission to create")];
         }
 
-        $template = FileCreator::GetTemplate($name);
+        $template = TemplateManager::GetTemplate($name);
         if (!$template) {
             $this->logger->error("Template for file creation not found: $templatePath", array("app" => $this->appName));
             return ["error" => $this->trans->t("Template not found")];

lib/filecreator.php

@@ -34,6 +34,8 @@
 use OCP\IL10N;
 use OCP\ILogger;
 
+use OCA\Onlyoffice\TemplateManager;
+
 /**
  * File creator
  *
@@ -144,7 +146,7 @@ public function create(File $file, string $creatorId = null, string $templateId
         $this->logger->debug("FileCreator: " . $file->getId() . " " . $file->getName() . " $creatorId $templateId", array("app" => $this->appName));
 
         $fileName = $file->getName();
-        $template = self::GetTemplate($fileName);
+        $template = TemplateManager::GetTemplate($fileName);
 
         if (!$template) {
             $this->logger->error("FileCreator: Template for file creation not found: $templatePath", array("app" => $this->appName));
@@ -157,38 +159,4 @@ public function create(File $file, string $creatorId = null, string $templateId
             $this->logger->error("FileCreator: Can't create file: $name", array("app" => $this->appName));
         }
     }
-
-    /**
-     * Get template
-     *
-     * @param string $name - file name
-     *
-     * @return string
-     */
-    public static function GetTemplate(string $name) {
-        $ext = strtolower("." . pathinfo($name, PATHINFO_EXTENSION));
-
-        $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode();
-
-        $templatePath = self::getTemplatePath($lang, $ext);
-        if (!file_exists($templatePath)) {
-            $lang = "en";
-            $templatePath = self::getTemplatePath($lang, $ext);
-        }
-
-        $template = file_get_contents($templatePath);
-        return $template;
-    }
-
-    /**
-     * Get template path
-     *
-     * @param string $lang - language
-     * @param string $ext - file extension
-     *
-     * @return string
-     */
-    private static function GetTemplatePath(string $lang, string $ext) {
-        return dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . $lang . DIRECTORY_SEPARATOR . "new" . $ext;
-    }
 }

lib/templatemanager.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2019
+ *
+ * This program is a free software product.
+ * You can redistribute it and/or modify it under the terms of the GNU Affero General Public License
+ * (AGPL) version 3 as published by the Free Software Foundation.
+ * In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * For details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions of the Program
+ * must display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product logo when distributing the program.
+ * Pursuant to Section 7(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as well as technical
+ * writing content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International.
+ * See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+namespace OCA\Onlyoffice;
+
+
+/**
+ * Template manager
+ *
+ * @package OCA\Onlyoffice
+ */
+class TemplateManager {
+
+    /**
+     * Get template
+     *
+     * @param string $name - file name
+     *
+     * @return string
+     */
+    public static function GetTemplate(string $name) {
+        $ext = strtolower("." . pathinfo($name, PATHINFO_EXTENSION));
+
+        $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode();
+
+        $templatePath = self::getTemplatePath($lang, $ext);
+        if (!file_exists($templatePath)) {
+            $lang = "en";
+            $templatePath = self::getTemplatePath($lang, $ext);
+        }
+
+        $template = file_get_contents($templatePath);
+        return $template;
+    }
+
+    /**
+     * Get template path
+     *
+     * @param string $lang - language
+     * @param string $ext - file extension
+     *
+     * @return string
+     */
+    private static function GetTemplatePath(string $lang, string $ext) {
+        return dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . $lang . DIRECTORY_SEPARATOR . "new" . $ext;
+    }
+}