FEAT #14242 TIME 1:00 check maarchUrl before converting with onlyoffice +...

FEAT #14242 TIME 1:00 check maarchUrl before converting with onlyoffice + convert with unoconv if conversion failed

src/app/contentManagement/controllers/OnlyOfficeController.php

@@ -318,7 +318,20 @@ class OnlyOfficeController
             return false;
         }
 
-        return $isAvailable;
+        if (!$isAvailable) {
+            return false;
+        }
+
+        $file = CoreConfigModel::getJsonLoaded(['path' => 'apps/maarch_entreprise/xml/config.json']);
+        if (empty($file['config']['maarchUrl'])) {
+            return false;
+        }
+
+        if (strpos($file['config']['maarchUrl'], 'localhost') !== false || strpos($file['config']['maarchUrl'], '127.0.0.1') !== false ) {
+            return false;
+        }
+
+        return true;
     }
 
     public static function convert(array $args)

src/app/convert/controllers/ConvertPdfController.php

@@ -41,18 +41,17 @@ class ConvertPdfController
             exec('export DISPLAY=:0 && '.$command.' 2>&1', $output, $return);
         } else {
             if (OnlyOfficeController::canConvert()) {
-                $output = [];
-                $return = 0;
                 $converted = OnlyOfficeController::convert(['fullFilename' => $aArgs['fullFilename']]);
-                if (!empty($converted['errors'])) {
-                    $output = [$converted['errors']];
+                if (empty($converted['errors'])) {
+                    return ['output' => [], 'return' => 0];
                 }
-            } else {
-                ConvertPdfController::addBom($aArgs['fullFilename']);
-                $command = "timeout 30 unoconv -f pdf " . escapeshellarg($aArgs['fullFilename']);
-
-                exec('export HOME=' . $tmpPath . ' && ' . $command . ' 2>&1', $output, $return);
             }
+
+            ConvertPdfController::addBom($aArgs['fullFilename']);
+            $command = "timeout 30 unoconv -f pdf " . escapeshellarg($aArgs['fullFilename']);
+
+            exec('export HOME=' . $tmpPath . ' && ' . $command . ' 2>&1', $output, $return);
+
         }
 
         return ['output' => $output, 'return' => $return];

src/app/convert/scripts/ConvertPdfScript.php

@@ -101,13 +101,13 @@ class ConvertPdfScript
         if (strtolower($docInfo['extension']) != 'pdf') {
 
             $fullFilename = "{$tmpPath}{$fileNameOnTmp}.{$docInfo['extension']}";
+            $converted = false;
+            $output = [];
             if (OnlyOfficeController::canConvert()) {
-                $output = [];
                 $converted = OnlyOfficeController::convert(['fullFilename' => $fullFilename]);
-                if (!empty($converted['errors'])) {
-                    $output = [$converted['errors']];
-                }
-            } else {
+                $converted = empty($converted['errors']);
+            }
+            if (!$converted){
                 ConvertPdfController::addBom($fullFilename);
                 $command = "timeout 30 unoconv -f pdf " . escapeshellarg($fullFilename);
                 exec('export HOME=' . $tmpPath . ' && '.$command, $output, $return);