From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 6 Dec 2022 18:03:16 +0000 (+0000)
Subject: wait #5628 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=002cb2bbaac5e0c862af2c0feea54f1c1751d8f9;p=cubeextranet.git

wait #5628 @1
---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 993fe6fb2..34d5ceccc 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -846,7 +846,7 @@ class wsFlash extends cubeFlashGateway
         global $core;
         $dao = new wsDAOBook($core->con);
 
-        $log = $dao->compile($this->args['book_id'], '2');
+       // $log = $dao->compile($this->args['book_id'], '2');
 
         $book = $dao->selectById($this->args['book_id']);
         $viewer = 'viewer';
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f51771c2e..eb2931691 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1119,7 +1119,7 @@ class wsDAOBook extends commonDAO
         }
     }
 
-    public function compile($book_id, $version = 'all', $complete = false, $force = false, $dev = false, $book = null, $delete = true, $forceTheme = false,$hybrid=false)
+    public function compile($book_id, $version = 'all', $complete = false, $force = false, $dev = false, $book = null, $delete = true, $forceTheme = false, $hybrid = false)
     {
 
         if (is_null($book_id) || !$book_id) {
@@ -1133,6 +1133,7 @@ class wsDAOBook extends commonDAO
 
         $this->_compileLock = WS_BOOKS . '/locks/' . $lockId . '.lock';
 
+
         while (file_exists($this->_compileLock) && filemtime($this->_compileLock) > (time() - 900)) {
             sleep(10);
         }
@@ -1147,7 +1148,7 @@ class wsDAOBook extends commonDAO
         $res = '';
         try {
             $this->compilePDF($book, $pages);
-            $res .= $this->compileHTML5($book_id, $book, $dev, $delete, $forceTheme,$hybrid);
+            $res .= $this->compileHTML5($book_id, $book, $dev, $delete, $forceTheme, $hybrid);
             $this->touchCompile($book_id, 'html5');
         } catch (Exception $e) {
 
@@ -1184,14 +1185,14 @@ class wsDAOBook extends commonDAO
         return wsBook::getAssetDirOfBook($book_id, $dir) . $path;
     }
 
-    public function compileHTML5($book_id, $book, $dev = false, $delete = true, $forceTheme = false,$hybrid=false)
+    public function compileHTML5($book_id, $book, $dev = false, $delete = true, $forceTheme = false, $hybrid = false)
     {
         $version = $book->parametres->mobileLVersion;
         if ($dev) {
             $version = 'dev';
         }
 
-        $htmlCompiler = wsHTML5::compilerFactory($book_id, $version, false, 'latest', null, false, false, false, $book, $forceTheme,$hybrid);
+        $htmlCompiler = wsHTML5::compilerFactory($book_id, $version, false, 'latest', null, false, false, false, $book, $forceTheme, $hybrid);
         $htmlCompiler->compile($delete);
 
         self::$lastHTML5Compiler = $htmlCompiler;
diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index 7a3928a47..d154f1e50 100644
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -81,7 +81,7 @@ class wsUtil
 
         try {
             $w = $worksheet->toArray(null, true, true);
-        }catch (Exception $e){
+        } catch (Exception $e) {
             die($e->getMessage());
         }
 
@@ -463,6 +463,9 @@ class wsUtil
             }
         }
 
+        if (!$book->parametres->print && !$book->parametres->pdf) {
+            return $normalPDF;
+        }
 
         if ($book->parametres->pdfReplace) {
             $replace = $book->getAssetDir() . $book->parametres->pdfReplace;
@@ -477,9 +480,7 @@ class wsUtil
 
         if ($book->parametres->pdfCompress) {
             if (!file_exists($compressedPDF) || filemtime($compressedPDF) < filemtime($normalPDF)) {
-                $gs = new cubeCommandLine('gs', null, true);
-                $gs->setPath(CONVERTER_PATH);
-                $gs->setEnv('GS_FONTPATH', '/home/ws/fonts');
+                $gs = new CubeIT_CommandLine('gs', null, true);
                 $gs->setArg('-dBATCH');
                 $gs->setArg('-dNOPAUSE');
                 $gs->setArg('-dNOPROMPT');
@@ -490,7 +491,12 @@ class wsUtil
                 $gs->setArg('-dAutoRotatePages=/None');
                 $gs->setArg('-dColorConversionStrategy=/LeaveColorUnchanged');
                 $gs->setArg(null, $normalPDF);
+                $gs->setTimeout(360);
                 $gs->execute();
+                if (!file_exists($compressedPDF) || filemtime($compressedPDF) < filemtime($normalPDF)) {
+                    copy($normalPDF, $compressedPDF);
+                }
+
             }
             return $compressedPDF;
         }