Merge pull request #285 from ONLYOFFICE/develop

Release/3.0.1
ONLYOFFICE · Sep 11, 2019 · bcd4d31 · bcd4d31
2 parents 5a55a72 + d5e902d
commit bcd4d31
Show file tree

Hide file tree

Showing 81 changed files with 651 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## 3.0.1
+## Added
+- "save as" to the folder
+- inserting images from the folder
+- Mail Merge
+- connection to the demo server
+
+## Changed
+- updated files for compatibility with MS Office v2016
+
 ## 2.3.1
 ## Added
 - editor customization

diff --git a/appinfo/app.php b/appinfo/app.php
@@ -13,7 +13,7 @@
  * 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 17-2 Elijas street, Riga, Latvia, EU, LV-1021.
+ * 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.

diff --git a/appinfo/application.php b/appinfo/application.php
@@ -13,7 +13,7 @@
  * 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 17-2 Elijas street, Riga, Latvia, EU, LV-1021.
+ * 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.

diff --git a/appinfo/info.xml b/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>Ascensio System SIA</author>
-    <version>2.3.1</version>
+    <version>3.0.1</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <filesystem/>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -13,7 +13,7 @@
  * 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 17-2 Elijas street, Riga, Latvia, EU, LV-1021.
+ * 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.
@@ -37,6 +37,8 @@
        ["name" => "editor#config", "url" => "/ajax/config/{fileId}", "verb" => "GET"],
        ["name" => "editor#create", "url" => "/ajax/new", "verb" => "POST"],
        ["name" => "editor#convert", "url" => "/ajax/convert", "verb" => "POST"],
+       ["name" => "editor#save", "url" => "/ajax/save", "verb" => "POST"],
+       ["name" => "editor#url", "url" => "/ajax/url", "verb" => "GET"],
        ["name" => "settings#save_address", "url" => "/ajax/settings/address", "verb" => "PUT"],
        ["name" => "settings#save_common", "url" => "/ajax/settings/common", "verb" => "PUT"],
        ["name" => "settings#get_settings", "url" => "/ajax/settings", "verb" => "GET"],

diff --git a/assets/bg_BG/new.docx b/assets/bg_BG/new.docx
diff --git a/assets/bg_BG/new.pptx b/assets/bg_BG/new.pptx
diff --git a/assets/bg_BG/new.xlsx b/assets/bg_BG/new.xlsx
diff --git a/assets/cs/new.docx b/assets/cs/new.docx
diff --git a/assets/cs/new.pptx b/assets/cs/new.pptx
diff --git a/assets/de/new.docx b/assets/de/new.docx
diff --git a/assets/de/new.pptx b/assets/de/new.pptx
diff --git a/assets/de_DE/new.docx b/assets/de_DE/new.docx
diff --git a/assets/de_DE/new.pptx b/assets/de_DE/new.pptx
diff --git a/assets/el/new.docx b/assets/el/new.docx
diff --git a/assets/el/new.pptx b/assets/el/new.pptx
diff --git a/assets/en/new.docx b/assets/en/new.docx
diff --git a/assets/en/new.pptx b/assets/en/new.pptx
diff --git a/assets/en/new.xlsx b/assets/en/new.xlsx
diff --git a/assets/es/new.docx b/assets/es/new.docx
diff --git a/assets/es/new.pptx b/assets/es/new.pptx
diff --git a/assets/fr/new.docx b/assets/fr/new.docx
diff --git a/assets/fr/new.pptx b/assets/fr/new.pptx
diff --git a/assets/it/new.docx b/assets/it/new.docx
diff --git a/assets/it/new.pptx b/assets/it/new.pptx
diff --git a/assets/ko/new.docx b/assets/ko/new.docx
diff --git a/assets/ko/new.pptx b/assets/ko/new.pptx
diff --git a/assets/nl/new.docx b/assets/nl/new.docx
diff --git a/assets/nl/new.pptx b/assets/nl/new.pptx
diff --git a/assets/nl/new.xlsx b/assets/nl/new.xlsx
diff --git a/assets/pl/new.docx b/assets/pl/new.docx
diff --git a/assets/pl/new.pptx b/assets/pl/new.pptx
diff --git a/assets/pt_BR/new.docx b/assets/pt_BR/new.docx
diff --git a/assets/pt_BR/new.pptx b/assets/pt_BR/new.pptx
diff --git a/assets/pt_PT/new.docx b/assets/pt_PT/new.docx
diff --git a/assets/pt_PT/new.pptx b/assets/pt_PT/new.pptx
diff --git a/assets/ru/new.docx b/assets/ru/new.docx
diff --git a/assets/ru/new.pptx b/assets/ru/new.pptx
diff --git a/assets/sv/new.docx b/assets/sv/new.docx
diff --git a/assets/sv/new.pptx b/assets/sv/new.pptx
diff --git a/assets/sv/new.xlsx b/assets/sv/new.xlsx
diff --git a/assets/zh_CN/new.docx b/assets/zh_CN/new.docx
diff --git a/assets/zh_CN/new.pptx b/assets/zh_CN/new.pptx
diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php
@@ -13,7 +13,7 @@
  * 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 17-2 Elijas street, Riga, Latvia, EU, LV-1021.
+ * 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.
@@ -346,7 +346,6 @@ public function track($doc, $users, $key, $status, $url, $token) {
 
                 try {
                     $decodedHeader = \Firebase\JWT\JWT::decode($header, $this->config->GetDocumentServerSecret(), array("HS256"));
-                    $this->logger->debug("Track HEADER : " . json_encode($decodedHeader), array("app" => $this->appName));
 
                     $payload = $decodedHeader->payload;
                 } catch (\UnexpectedValueException $e) {
@@ -400,25 +399,11 @@ public function track($doc, $users, $key, $status, $url, $token) {
                     list ($file, $error) = !empty($ownerId) ? $this->getFile($ownerId, $fileId) : $this->getFileByToken($fileId, $token);
 
                     if (isset($error)) {
-                        $this->logger->error("track error" . $fileId ." " . $error,  array("app" => $this->appName));
+                        $this->logger->error("track error" . $fileId ." " . json_encode($error->getData()),  array("app" => $this->appName));
                         return $error;
                     }
 
-                    $documentServerUrl = $this->config->GetDocumentServerInternalUrl(true);
-                    if (!empty($documentServerUrl)) {
-                        $from = $this->config->GetDocumentServerUrl();
-
-                        if (!preg_match("/^https?:\/\//i", $from)) {
-                            $parsedUrl = parse_url($url);
-                            $from = $parsedUrl["scheme"] . "://" . $parsedUrl["host"] . (array_key_exists("port", $parsedUrl) ? (":" . $parsedUrl["port"]) : "") . $from;
-                        }
-
-                        if ($from !== $documentServerUrl)
-                        {
-                            $this->logger->debug("Replace in track from " . $from . " to " . $documentServerUrl, array("app" => $this->appName));
-                            $url = str_replace($from, $documentServerUrl, $url);
-                        }
-                    }
+                    $url = $this->config->ReplaceDocumentServerUrlToInternal($url);
 
                     $fileName = $file->getName();
                     $curExt = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
@@ -453,7 +438,7 @@ public function track($doc, $users, $key, $status, $url, $token) {
                 break;
         }
 
-        $this->logger->debug("Track: " . $fileId . " status " . $status . " result " . $error, array("app" => $this->appName));
+        $this->logger->debug("Track: " . $fileId . " status " . $status . " result " . $result, array("app" => $this->appName));
 
         return new JSONResponse(["error" => $result], Http::STATUS_OK);
     }

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
@@ -13,7 +13,7 @@
  * 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 17-2 Elijas street, Riga, Latvia, EU, LV-1021.
+ * 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.
@@ -221,7 +221,7 @@ public function create($name, $dir, $token = NULL) {
 
         $ext = strtolower("." . pathinfo($name, PATHINFO_EXTENSION));
 
-        $lang = \OC::$server->getL10NFactory("")->get("")->getLanguageCode();
+        $lang = $this->trans->getLanguageCode();
 
         $templatePath = $this->getTemplatePath($lang, $ext);
         if (!file_exists($templatePath)) {
@@ -365,6 +365,114 @@ public function convert($fileId, $token = NULL) {
         return $result;
     }
 
+    /**
+     * Save file to folder
+     *
+     * @param string $name - file name
+     * @param string $dir - folder path
+     * @param string $url - file url
+     *
+     * @return array
+     *
+     * @NoAdminRequired
+     * @PublicPage
+     */
+    public function save($name, $dir, $url) {
+        $this->logger->debug("Save: " . $name, array("app" => $this->appName));
+
+        if (!$this->config->isUserAllowedToUse()) {
+            return ["error" => $this->trans->t("Not permitted")];
+        }
+
+        $userId = $this->userSession->getUser()->getUID();
+        $userFolder = $this->root->getUserFolder($userId);
+
+        $folder = $userFolder->get($dir);
+
+        if ($folder === NULL) {
+            $this->logger->error("Folder for saving file was not found: " . $dir, array("app" => $this->appName));
+            return ["error" => $this->trans->t("The required folder was not found")];
+        }
+        if (!$folder->isCreatable()) {
+            $this->logger->error("Folder for saving file without permission: " . $dir, array("app" => $this->appName));
+            return ["error" => $this->trans->t("You don't have enough permission to create")];
+        }
+
+        $url = $this->config->ReplaceDocumentServerUrlToInternal($url);
+
+        try {
+            $documentService = new DocumentService($this->trans, $this->config);
+            $newData = $documentService->Request($url);
+        } catch (\Exception $e) {
+            $this->logger->error("Failed to download file for saving: " . $url . " " . $e->getMessage(), array("app" => $this->appName));
+            return ["error" => $this->trans->t("Download failed")];
+        }
+
+        $name = $folder->getNonExistingName($name);
+
+        try {
+            $file = $folder->newFile($name);
+
+            $file->putContent($newData);
+        } catch (NotPermittedException $e) {
+            $this->logger->error("Can't save file: " . $name, array("app" => $this->appName));
+            return ["error" => $this->trans->t("Can't create file")];
+        }
+
+        $fileInfo = $file->getFileInfo();
+
+        $result = Helper::formatFileInfo($fileInfo);
+        return $result;
+    }
+
+    /**
+     * Get presigned url to file
+     *
+     * @param string $filePath - file path
+     *
+     * @return array
+     *
+     * @NoAdminRequired
+     */
+    public function url($filePath) {
+        $this->logger->debug("Save: " . $name, array("app" => $this->appName));
+
+        if (!$this->config->isUserAllowedToUse()) {
+            return ["error" => $this->trans->t("Not permitted")];
+        }
+
+        $userId = $this->userSession->getUser()->getUID();
+        $userFolder = $this->root->getUserFolder($userId);
+
+        $file = $userFolder->get($filePath);
+
+        if ($file === NULL) {
+            $this->logger->error("File for generate presigned url was not found: " . $dir, array("app" => $this->appName));
+            return ["error" => $this->trans->t("File not found")];
+        }
+        if (!$file->isReadable()) {
+            $this->logger->error("Folder for saving file without permission: " . $dir, array("app" => $this->appName));
+            return ["error" => $this->trans->t("You do not have enough permissions to view the file")];
+        }
+
+        $fileName = $file->getName();
+        $ext = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
+        $fileId = $file->getId();
+        $fileUrl = $this->getUrl($fileId);
+
+        $result = [
+            "fileType" => $ext,
+            "url" => $fileUrl
+        ];
+
+        if (!empty($this->config->GetDocumentServerSecret())) {
+            $token = \Firebase\JWT\JWT::encode($result, $this->config->GetDocumentServerSecret());
+            $result["token"] = $token;
+        }
+
+        return $result;
+    }
+
     /**
      * Print editor section
      *
@@ -491,7 +599,7 @@ public function config($fileId, $filePath = NULL, $token = NULL, $desktop = fals
             ],
             "documentType" => $format["type"],
             "editorConfig" => [
-                "lang" => str_replace("_", "-", \OC::$server->getL10NFactory("")->get("")->getLanguageCode())
+                "lang" => str_replace("_", "-", $this->trans->getLanguageCode())
             ]
         ];
 
@@ -617,6 +725,10 @@ public function config($fileId, $filePath = NULL, $token = NULL, $desktop = fals
 
         $params = $this->setCustomization($params);
 
+        if ($this->config->UseDemo()) {
+            $params["editorConfig"]["tenant"] = $this->config->GetSystemValue("instanceid", true);
+        }
+
         if (!empty($this->config->GetDocumentServerSecret())) {
             $token = \Firebase\JWT\JWT::encode($params, $this->config->GetDocumentServerSecret());
             $params["token"] = $token;
@@ -765,7 +877,7 @@ private function getShare($token) {
      * @return string
      */
     private function getKey($file) {
-        $instanceId = $this->config->getSystemValue("instanceid", true);
+        $instanceId = $this->config->GetSystemValue("instanceid", true);
 
         $fileId = $file->getId();
 
@@ -837,27 +949,27 @@ private function setCustomization($params) {
 
         /* from system config */
 
-        $customer = $this->config->getSystemValue($this->config->_customization_customer);
+        $customer = $this->config->GetSystemValue($this->config->_customization_customer);
         if (isset($customer)) {
             $params["editorConfig"]["customization"]["customer"] = $customer;
         }
 
-        $feedback = $this->config->getSystemValue($this->config->_customization_feedback);
+        $feedback = $this->config->GetSystemValue($this->config->_customization_feedback);
         if (isset($feedback)) {
             $params["editorConfig"]["customization"]["feedback"] = $feedback;
         }
 
-        $loaderLogo = $this->config->getSystemValue($this->config->_customization_loaderLogo);
+        $loaderLogo = $this->config->GetSystemValue($this->config->_customization_loaderLogo);
         if (isset($loaderLogo)) {
             $params["editorConfig"]["customization"]["loaderLogo"] = $loaderLogo;
         }
 
-        $loaderName = $this->config->getSystemValue($this->config->_customization_loaderName);
+        $loaderName = $this->config->GetSystemValue($this->config->_customization_loaderName);
         if (isset($loaderName)) {
             $params["editorConfig"]["customization"]["loaderName"] = $loaderName;
         }
 
-        $logo = $this->config->getSystemValue($this->config->_customization_logo);
+        $logo = $this->config->GetSystemValue($this->config->_customization_logo);
         if (isset($logo)) {
             $params["editorConfig"]["customization"]["logo"] = $logo;
         }

diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
@@ -13,7 +13,7 @@
  * 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 17-2 Elijas street, Riga, Latvia, EU, LV-1021.
+ * 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.
@@ -113,10 +113,11 @@ public function __construct($AppName,
      */
     public function index() {
         $data = [
-            "documentserver" => $this->config->GetDocumentServerUrl(),
+            "documentserver" => $this->config->GetDocumentServerUrl(true),
             "documentserverInternal" => $this->config->GetDocumentServerInternalUrl(true),
             "storageUrl" => $this->config->GetStorageUrl(),
-            "secret" => $this->config->GetDocumentServerSecret(),
+            "secret" => $this->config->GetDocumentServerSecret(true),
+            "demo" => $this->config->GetDemoData(),
             "currentServer" => $this->urlGenerator->getAbsoluteURL("/"),
             "formats" => $this->config->FormatsSetting(),
             "sameTab" => $this->config->GetSameTab(),
@@ -139,39 +140,43 @@ public function index() {
      * @param string $documentserverInternal - document service address available from ownCloud
      * @param string $storageUrl - ownCloud address available from document server
      * @param string $secret - secret key for signature
-     * @param array $defFormats - formats array with default action
-     * @param array $editFormats - editable formats array
-     * @param bool $sameTab - open in same tab
-     * @param array $limitGroups - list of groups
+     * @param bool $demo - use demo server
      *
      * @return array
      */
     public function SaveAddress($documentserver,
                                     $documentserverInternal,
                                     $storageUrl,
-                                    $secret
+                                    $secret,
+                                    $demo
                                     ) {
-        $this->config->SetDocumentServerUrl($documentserver);
-        $this->config->SetDocumentServerInternalUrl($documentserverInternal);
+        if (!$this->config->SelectDemo($demo === true)) {
+            $error = $this->trans->t("The 30-day test period is over, you can no longer connect to demo ONLYOFFICE Document Server.");
+        }
+        if ($demo !== true) {
+            $this->config->SetDocumentServerUrl($documentserver);
+            $this->config->SetDocumentServerInternalUrl($documentserverInternal);
+            $this->config->SetDocumentServerSecret($secret);
+        }
         $this->config->SetStorageUrl($storageUrl);
-        $this->config->SetDocumentServerSecret($secret);
 
-        $documentserver = $this->config->GetDocumentServerUrl();
-        $error = NULL;
-        if (!empty($documentserver)) {
-            $error = $this->checkDocServiceUrl();
-            $this->config->SetSettingsError($error);
-        }
+        if (empty($error)) {
+            $documentserver = $this->config->GetDocumentServerUrl();
+            if (!empty($documentserver)) {
+                $error = $this->checkDocServiceUrl();
+                $this->config->SetSettingsError($error);
+            }
 
-        if ($this->config->checkEncryptionModule() === true) {
-            $this->logger->info("SaveSettings when encryption is enabled", array("app" => $this->appName));
+            if ($this->config->checkEncryptionModule() === true) {
+                $this->logger->info("SaveSettings when encryption is enabled", array("app" => $this->appName));
+            }
         }
 
         return [
-            "documentserver" => $this->config->GetDocumentServerUrl(),
+            "documentserver" => $this->config->GetDocumentServerUrl(true),
             "documentserverInternal" => $this->config->GetDocumentServerInternalUrl(true),
             "storageUrl" => $this->config->GetStorageUrl(),
-            "secret" => $this->config->GetDocumentServerSecret(),
+            "secret" => $this->config->GetDocumentServerSecret(true),
             "error" => $error
             ];
     }