wait #5628 @1

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 993fe6fb2348dc7661ce75db6a75fe88b1f1e736..34d5cecccbaea7bc6484f3740ae2e022e58dc150 100644 (file)
--- 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 f51771c2ea10324e118210736931eceae60b9fd9..eb2931691d7f56fb3e5489de08c5f7c3b16170ac 100644 (file)
--- 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 7a3928a47d3b5de8a192a014d60ad8ab532b50ca..d154f1e50b0743673de9463645ebb01976c4d316 100644 (file)
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -81,7 +81,7 @@ class wsUtil
 \r
         try {\r
             $w = $worksheet->toArray(null, true, true);\r
-        }catch (Exception $e){\r
+        } catch (Exception $e) {\r
             die($e->getMessage());\r
         }\r
 \r
@@ -463,6 +463,9 @@ class wsUtil
             }\r
         }\r
 \r
+        if (!$book->parametres->print && !$book->parametres->pdf) {\r
+            return $normalPDF;\r
+        }\r
 \r
         if ($book->parametres->pdfReplace) {\r
             $replace = $book->getAssetDir() . $book->parametres->pdfReplace;\r
@@ -477,9 +480,7 @@ class wsUtil
 \r
         if ($book->parametres->pdfCompress) {\r
             if (!file_exists($compressedPDF) || filemtime($compressedPDF) < filemtime($normalPDF)) {\r
-                $gs = new cubeCommandLine('gs', null, true);\r
-                $gs->setPath(CONVERTER_PATH);\r
-                $gs->setEnv('GS_FONTPATH', '/home/ws/fonts');\r
+                $gs = new CubeIT_CommandLine('gs', null, true);\r
                 $gs->setArg('-dBATCH');\r
                 $gs->setArg('-dNOPAUSE');\r
                 $gs->setArg('-dNOPROMPT');\r
@@ -490,7 +491,12 @@ class wsUtil
                 $gs->setArg('-dAutoRotatePages=/None');\r
                 $gs->setArg('-dColorConversionStrategy=/LeaveColorUnchanged');\r
                 $gs->setArg(null, $normalPDF);\r
+                $gs->setTimeout(360);\r
                 $gs->execute();\r
+                if (!file_exists($compressedPDF) || filemtime($compressedPDF) < filemtime($normalPDF)) {\r
+                    copy($normalPDF, $compressedPDF);\r
+                }\r
+\r
             }\r
             return $compressedPDF;\r
         }\r