Add support for creating ODF files by default

Signed-off-by: Gary Kim <[email protected]>
ONLYOFFICE · Mar 28, 2020 · 2c0625a · 2c0625a
1 parent 49ab32e
commit 2c0625a
Show file tree

Hide file tree

Showing 60 changed files with 95 additions and 37 deletions.
diff --git a/assets/bg/new.odp b/assets/bg/new.odp
diff --git a/assets/bg/new.ods b/assets/bg/new.ods
diff --git a/assets/bg/new.odt b/assets/bg/new.odt
diff --git a/assets/cs/new.odp b/assets/cs/new.odp
diff --git a/assets/cs/new.ods b/assets/cs/new.ods
diff --git a/assets/cs/new.odt b/assets/cs/new.odt
diff --git a/assets/de/new.odp b/assets/de/new.odp
diff --git a/assets/de/new.ods b/assets/de/new.ods
diff --git a/assets/de/new.odt b/assets/de/new.odt
diff --git a/assets/de_DE/new.odp b/assets/de_DE/new.odp
diff --git a/assets/de_DE/new.ods b/assets/de_DE/new.ods
diff --git a/assets/de_DE/new.odt b/assets/de_DE/new.odt
diff --git a/assets/el/new.odp b/assets/el/new.odp
diff --git a/assets/el/new.ods b/assets/el/new.ods
diff --git a/assets/el/new.odt b/assets/el/new.odt
diff --git a/assets/en/new.odp b/assets/en/new.odp
diff --git a/assets/en/new.ods b/assets/en/new.ods
diff --git a/assets/en/new.odt b/assets/en/new.odt
diff --git a/assets/en_GB/new.odp b/assets/en_GB/new.odp
diff --git a/assets/en_GB/new.ods b/assets/en_GB/new.ods
diff --git a/assets/en_GB/new.odt b/assets/en_GB/new.odt
diff --git a/assets/es/new.odp b/assets/es/new.odp
diff --git a/assets/es/new.ods b/assets/es/new.ods
diff --git a/assets/es/new.odt b/assets/es/new.odt
diff --git a/assets/fr/new.odp b/assets/fr/new.odp
diff --git a/assets/fr/new.ods b/assets/fr/new.ods
diff --git a/assets/fr/new.odt b/assets/fr/new.odt
diff --git a/assets/it/new.odp b/assets/it/new.odp
diff --git a/assets/it/new.ods b/assets/it/new.ods
diff --git a/assets/it/new.odt b/assets/it/new.odt
diff --git a/assets/ko/new.odp b/assets/ko/new.odp
diff --git a/assets/ko/new.ods b/assets/ko/new.ods
diff --git a/assets/ko/new.odt b/assets/ko/new.odt
diff --git a/assets/nl/new.odp b/assets/nl/new.odp
diff --git a/assets/nl/new.ods b/assets/nl/new.ods
diff --git a/assets/nl/new.odt b/assets/nl/new.odt
diff --git a/assets/pl/new.odp b/assets/pl/new.odp
diff --git a/assets/pl/new.ods b/assets/pl/new.ods
diff --git a/assets/pl/new.odt b/assets/pl/new.odt
diff --git a/assets/pt_BR/new.odp b/assets/pt_BR/new.odp
diff --git a/assets/pt_BR/new.ods b/assets/pt_BR/new.ods
diff --git a/assets/pt_BR/new.odt b/assets/pt_BR/new.odt
diff --git a/assets/pt_PT/new.odp b/assets/pt_PT/new.odp
diff --git a/assets/pt_PT/new.ods b/assets/pt_PT/new.ods
diff --git a/assets/pt_PT/new.odt b/assets/pt_PT/new.odt
diff --git a/assets/ru/new.odp b/assets/ru/new.odp
diff --git a/assets/ru/new.ods b/assets/ru/new.ods
diff --git a/assets/ru/new.odt b/assets/ru/new.odt
diff --git a/assets/sv/new.odp b/assets/sv/new.odp
diff --git a/assets/sv/new.ods b/assets/sv/new.ods
diff --git a/assets/sv/new.odt b/assets/sv/new.odt
diff --git a/assets/zh_CN/new.odp b/assets/zh_CN/new.odp
diff --git a/assets/zh_CN/new.ods b/assets/zh_CN/new.ods
diff --git a/assets/zh_CN/new.odt b/assets/zh_CN/new.odt
diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
@@ -130,7 +130,8 @@ public function index() {
             "toolbarNoTabs" => $this->config->GetCustomizationToolbarNoTabs(),
             "successful" => $this->config->SettingsAreSuccessful(),
             "watermark" => $this->config->GetWatermarkSettings(),
-            "tagsEnabled" => App::isEnabled("systemtags")
+            "tagsEnabled" => App::isEnabled("systemtags"),
+            "odf" => $this->config->GetOdfDefault(),
         ];
         return new TemplateResponse($this->appName, "settings", $data, "blank");
     }
@@ -192,6 +193,7 @@ public function SaveAddress($documentserver,
      * @param bool $feedback - display feedback
      * @param bool $help - display help
      * @param bool $toolbarNoTabs - display toolbar tab
+     * @param bool $odf - create ODF files by default
      *
      * @return array
      */
@@ -203,7 +205,8 @@ public function SaveCommon($defFormats,
                                     $compactHeader,
                                     $feedback,
                                     $help,
-                                    $toolbarNoTabs
+                                    $toolbarNoTabs,
+                                    $odf
                                     ) {
 
         $this->config->SetDefaultFormats($defFormats);
@@ -215,6 +218,7 @@ public function SaveCommon($defFormats,
         $this->config->SetCustomizationFeedback($feedback);
         $this->config->SetCustomizationHelp($help);
         $this->config->SetCustomizationToolbarNoTabs($toolbarNoTabs);
+        $this->config->SetOdfDefault($odf);
 
         return [
             ];
@@ -253,7 +257,8 @@ public function SaveWatermark($settings) {
     public function GetSettings() {
         $result = [
             "formats" => $this->config->FormatsSetting(),
-            "sameTab" => $this->config->GetSameTab()
+            "sameTab" => $this->config->GetSameTab(),
+            "odf" => $this->config->GetOdfDefault(),
         ];
         return $result;
     }

diff --git a/js/main.js b/js/main.js
@@ -309,39 +309,43 @@
                 return;
             }
 
-            menu.addMenuEntry({
-                id: "onlyofficeDocx",
-                displayName: t(OCA.Onlyoffice.AppName, "Document"),
-                templateName: t(OCA.Onlyoffice.AppName, "Document"),
-                iconClass: "icon-onlyoffice-new-docx",
-                fileType: "docx",
-                actionHandler: function (name) {
-                    OCA.Onlyoffice.CreateFile(name + ".docx", fileList);
-                }
-            });
+            var register = function() {
+                const odf = OCA.Onlyoffice.setting.odf;
+                menu.addMenuEntry({
+                    id: "onlyofficeDocx",
+                    displayName: t(OCA.Onlyoffice.AppName, "Document"),
+                    templateName: t(OCA.Onlyoffice.AppName, "Document"),
+                    iconClass: "icon-onlyoffice-new-docx",
+                    fileType: "docx",
+                    actionHandler: function (name) {
+                        OCA.Onlyoffice.CreateFile(name + (odf ? ".odt" : ".docx"), fileList);
+                    }
+                });
 
-            menu.addMenuEntry({
-                id: "onlyofficeXlsx",
-                displayName: t(OCA.Onlyoffice.AppName, "Spreadsheet"),
-                templateName: t(OCA.Onlyoffice.AppName, "Spreadsheet"),
-                iconClass: "icon-onlyoffice-new-xlsx",
-                fileType: "xlsx",
-                actionHandler: function (name) {
-                    OCA.Onlyoffice.CreateFile(name + ".xlsx", fileList);
-                }
-            });
+                menu.addMenuEntry({
+                    id: "onlyofficeXlsx",
+                    displayName: t(OCA.Onlyoffice.AppName, "Spreadsheet"),
+                    templateName: t(OCA.Onlyoffice.AppName, "Spreadsheet"),
+                    iconClass: "icon-onlyoffice-new-xlsx",
+                    fileType: "xlsx",
+                    actionHandler: function (name) {
+                        OCA.Onlyoffice.CreateFile(name + (odf ? ".ods" : ".xlsx"), fileList);
+                    }
+                });
 
-            menu.addMenuEntry({
-                id: "onlyofficePpts",
-                displayName: t(OCA.Onlyoffice.AppName, "Presentation"),
-                templateName: t(OCA.Onlyoffice.AppName, "Presentation"),
-                iconClass: "icon-onlyoffice-new-pptx",
-                fileType: "pptx",
-                actionHandler: function (name) {
-                    OCA.Onlyoffice.CreateFile(name + ".pptx", fileList);
-                }
-            });
-        }
+                menu.addMenuEntry({
+                    id: "onlyofficePpts",
+                    displayName: t(OCA.Onlyoffice.AppName, "Presentation"),
+                    templateName: t(OCA.Onlyoffice.AppName, "Presentation"),
+                    iconClass: "icon-onlyoffice-new-pptx",
+                    fileType: "pptx",
+                    actionHandler: function (name) {
+                        OCA.Onlyoffice.CreateFile(name + (odf ? ".odp" : ".pptx"), fileList);
+                    }
+                });
+            };
+            OCA.Onlyoffice.GetSettings(register);
+        },
     };
 
     var getFileExtension = function (fileName) {

diff --git a/js/settings.js b/js/settings.js
@@ -208,6 +208,7 @@
             var feedback = $("#onlyofficeFeedback").is(":checked");
             var help = $("#onlyofficeHelp").is(":checked");
             var toolbarNoTabs = !$("#onlyofficeToolbarNoTabs").is(":checked");
+            var odf = $("#defaultOdf").is(":checked");
 
             $.ajax({
                 method: "PUT",
@@ -221,7 +222,8 @@
                     compactHeader: compactHeader,
                     feedback: feedback,
                     help: help,
-                    toolbarNoTabs: toolbarNoTabs
+                    toolbarNoTabs: toolbarNoTabs,
+                    odf: odf,
                 },
                 success: function onSuccess(response) {
                     $(".section-onlyoffice").removeClass("icon-loading");

diff --git a/lib/appconfig.php b/lib/appconfig.php
@@ -31,9 +31,11 @@
 
 use \DateInterval;
 use \DateTime;
+use \Exception;
 
 use OCP\IConfig;
 use OCP\ILogger;
+use OCP\IUser;
 
 /**
  * Application configutarion
@@ -154,6 +156,13 @@ class AppConfig {
      */
     private $_customizationToolbarNoTabs = "customizationToolbarNoTabs";
 
+    /**
+     * The config key for ODF being set as default
+     *
+     * @var string
+     */
+    private $_odfDefault = "odf";
+
     /**
      * The config key for the setting limit groups
      *
@@ -490,6 +499,29 @@ public function GetStorageUrl() {
         return $url;
     }
 
+    /**
+     * Set whether default file type is set to ODF
+     *
+     * @param bool $default
+     */
+    public function SetOdfDefault($default = false) {
+        $this->config->setAppValue($this->appName, $this->_odfDefault, $default);
+    }
+
+    /**
+     * Get whether default file type is set to ODF
+     *
+     * @return bool
+     */
+    public function GetOdfDefault() {
+        $odfDefault = $this->GetSystemValue($this->_odfDefault);
+
+        if (empty($odfDefault)) {
+            $odfDefault = $this->config->getAppValue($this->appName, $this->_odfDefault, false);
+        }
+        return $odfDefault;
+    }
+
     /**
      * Save the document service secret key to the application configuration
      *

diff --git a/lib/filecreator.php b/lib/filecreator.php
@@ -75,7 +75,7 @@ class FileCreator extends ACreateEmpty {
      * @param string $AppName - application name
      * @param IL10N $trans - l10n service
      * @param ILogger $logger - logger
-     * @param string $format - format for creation 
+     * @param string $format - format for creation
      */
     public function __construct($AppName,
                                 IL10N $trans,
@@ -104,8 +104,10 @@ public function getId(): string {
     public function getName(): string {
         switch ($this->format) {
             case "xlsx":
+            case "ods":
                 return $this->trans->t("Spreadsheet");
             case "pptx":
+            case "odp":
                 return $this->trans->t("Presentation");
         }
         return $this->trans->t("Document");
@@ -131,6 +133,12 @@ public function getMimetype(): string {
                 return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
             case "pptx":
                 return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
+            case "odt":
+                return "application/vnd.oasis.opendocument.text";
+            case "ods":
+                return "application/vnd.oasis.opendocument.spreadsheet";
+            case "odp":
+                return "application/vnd.oasis.opendocument.presentation";
         }
         return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
     }

diff --git a/templates/settings.php b/templates/settings.php
@@ -114,6 +114,13 @@
         <label for="onlyofficeSameTab"><?php p($l->t("Open file in the same tab")) ?></label>
     </p>
 
+    <p>
+        <input type="checkbox" class="checkbox"
+               id="defaultOdf"
+               <?php if ($_["odf"]) { ?>checked="checked"<?php } ?> />
+        <label for="defaultOdf"><?php p($l->t("Create ODF format files by default")) ?></label>
+    </p>
+
     <p class="onlyoffice-header"><?php p($l->t("The default application for opening the format")) ?></p>
     <div class="onlyoffice-exts">
         <?php foreach ($_["formats"] as $format => $setting) { ?>
@@ -271,4 +278,4 @@
     <br />
     <p><button id="onlyofficeWatermarkSave" class="button"><?php p($l->t("Save")) ?></button></p>
 
-</div>
+</div>