Merge pull request 'hotfix/1.4.1' from develop into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-chamilo/pulls/10

Author: LinneyS

CHANGELOG.md

@@ -2,12 +2,15 @@
 
 This plugin is developed and maintained at https://github.com/ONLYOFFICE/onlyoffice-chamilo.
 
+## 1.4.1
+## Changed
+- minor fixes
+
 ## 1.4.0
 ## Added
 - using onlyoffice/docs-integration-sdk
-- Arabic and Serbian empty file templates
 - default empty file templates
-- Finnish, Hebrew, Norwegian, Slovenian empty file templates
+- Arabic, Serbian, Finnish, Hebrew, Norwegian, Slovenian empty file templates
 
 ## 1.3.0
 ## Added

ajax/saveas.php

@@ -72,7 +72,7 @@
 
 if (isset($result['error'])) {
     if ('fileIsExist' === $result['error']) {
-        $result['error'] = 'File is exist';
+        $result['error'] = 'File already exists';
     }
     if ('impossibleCreateFile' === $result['error']) {
         $result['error'] = 'Impossible to create file';

callback.php

@@ -75,6 +75,9 @@
         case 'download':
             $callbackResponseArray = download();
             exit(json_encode($callbackResponseArray));
+        case 'empty':
+            $callbackResponseArray = emptyFile();
+            exit(json_encode($callbackResponseArray));
         default:
             $callbackResponseArray['status'] = 'error';
             $callbackResponseArray['error'] = '404 Method not found';
@@ -210,3 +213,51 @@ function download()
     readfile($filePath);
     exit;
 }
+
+/**
+ * Downloading empty file by the document service.
+ */
+function emptyFile()
+{
+    global $plugin;
+    global $type;
+    global $courseCode;
+    global $userId;
+    global $docId;
+    global $groupId;
+    global $sessionId;
+    global $courseInfo;
+    global $appSettings;
+    global $jwtManager;
+
+
+    if ($type !== 'empty') {
+        $result['status'] = 'error';
+        $result['error'] = 'Download empty with other action';
+        return $result;
+    }
+
+    if ($jwtManager->isJwtEnabled()) {
+        $token = substr(getallheaders()[$appSettings->getJwtHeader()], strlen('Bearer '));
+        try {
+            $payload = $jwtManager->decode($token, $appSettings->getJwtKey());
+        } catch (UnexpectedValueException $e) {
+            $result['status'] = 'error';
+            $result['error'] = '403 Access denied';
+            return $result;
+        }
+    }
+
+    $template = TemplateManager::getEmptyTemplate('docx');
+
+    if (!$template) {
+        $result['status'] = 'error';
+        $result['error'] = 'File not found';
+        return $result;
+    }
+
+    @header('Content-Type: application/vnd.openxmlformats-officedocument.wordprocessingml.document');
+    @header('Content-Disposition: attachment; filename='.'docx.docx');
+    readfile($template);
+    exit;
+}

composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "onlyoffice/docs-integration-sdk": "^1.0.0"
+        "onlyoffice/docs-integration-sdk": "^1.0.1"
     },
     "repositories": [
         {

create.php

@@ -77,7 +77,6 @@
     $values = $form->exportValues();
 
     $fileType = $values['fileFormat'];
-    var_dump($fileType);
     $fileExt = $documentManager->getDocExtByType($fileType);
 
     $result = OnlyofficeDocumentManager::createFile(

lib/onlyofficeAppRequests.php

@@ -29,47 +29,18 @@ class OnlyofficeAppRequests extends RequestService
     public function __construct($settingsManager, $httpClient, $jwtManager)
     {
         parent::__construct($settingsManager, $httpClient, $jwtManager);
-        $tempFile = self::createTempFile();
-        $this->convertFileUrl = $tempFile['fileUrl'];
-        $this->convertFilePath = $tempFile['filePath'];
-    }
-
-    public function __destruct()
-    {
-        unlink($this->convertFilePath);
     }
 
     public function getFileUrlForConvert()
     {
-        return $this->convertFileUrl;
-    }
-
-    /**
-     * Create temporary file for convert service testing.
-     *
-     * @return array
-     */
-    private function createTempFile()
-    {
-        $fileUrl = null;
-        $fileName = 'convert.docx';
-        $fileExt = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
-        $baseName = strtolower(pathinfo($fileName, PATHINFO_FILENAME));
-        $templatePath = TemplateManager::getEmptyTemplate($fileExt);
-        $folderPath = api_get_path(SYS_PLUGIN_PATH).$this->settingsManager->plugin->getPluginName();
-        $filePath = $folderPath.'/'.$fileName;
-
-        if ($fp = @fopen($filePath, 'w')) {
-            $content = file_get_contents($templatePath);
-            fputs($fp, $content);
-            fclose($fp);
-            chmod($filePath, api_get_permissions_for_new_files());
-            $fileUrl = api_get_path(WEB_PLUGIN_PATH).$this->settingsManager->plugin->getPluginName().'/'.$fileName;
-        }
-
-        return [
-            'fileUrl' => $fileUrl,
-            'filePath' => $filePath,
+        $data = [
+            'type' => 'empty',
+            'courseId' => api_get_course_int_id(),
+            'userId' => api_get_user_id(),
+            'sessionId' => api_get_session_id(),
         ];
+        $hashUrl = $this->jwtManager->getHash($data);
+        return api_get_path(WEB_PLUGIN_PATH).'onlyoffice/callback.php?hash='.$hashUrl;
     }
+
 }

lib/onlyofficeFormatsManager.php

@@ -25,7 +25,7 @@ public function __construct()
         $this->formatsList = self::buildNamedFormatsArray($formats);
     }
 
-    private function getFormats()
+    private static function getFormats()
     {
         $formats = file_get_contents(dirname(__DIR__).
         DIRECTORY_SEPARATOR.

lib/onlyofficePlugin.php

@@ -33,7 +33,7 @@ class OnlyofficePlugin extends Plugin implements HookPluginInterface
     protected function __construct()
     {
         parent::__construct(
-            '1.4.0',
+            '1.4.1',
             'Asensio System SIA',
             [
                 'enable_onlyoffice_plugin' => 'boolean',

lib/onlyofficeSettingsFormBuilder.php

@@ -29,7 +29,7 @@ class OnlyofficeSettingsFormBuilder
      *
      * @return FormValidator
      */
-    public function buildSettingsForm(OnlyofficeAppsettings $settingsManager)
+    public static function buildSettingsForm(OnlyofficeAppsettings $settingsManager)
     {
         $plugin = $settingsManager->plugin;
         $demoData = $settingsManager->getDemoData();
@@ -78,7 +78,7 @@ public function buildSettingsForm(OnlyofficeAppsettings $settingsManager)
      *
      * @return OnlyofficePlugin
      */
-    public function validateSettingsForm(OnlyofficeAppsettings $settingsManager)
+    public static function validateSettingsForm(OnlyofficeAppsettings $settingsManager)
     {
         $plugin = $settingsManager->plugin;
         $errorMsg = null;
@@ -114,7 +114,7 @@ public function validateSettingsForm(OnlyofficeAppsettings $settingsManager)
      *
      * @return string
      */
-    private function buildTemplate($templateName, $params = [])
+    private static function buildTemplate($templateName, $params = [])
     {
         $tpl = new Template('', false, false, false, false, false, false);
         if (!empty($params)) {
@@ -135,7 +135,7 @@ private function buildTemplate($templateName, $params = [])
      *
      * @return void
      */
-    private function displayError($errorMessage, $location = null)
+    private static function displayError($errorMessage, $location = null)
     {
         Display::addFlash(
             Display::return_message(