(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 69ea3c6b5db630a8f8e6d79f6c8d16d604ad1525..f043e18596cb9c90172be0882924acd45c0db44f 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -552,8 +552,8 @@ class wsDAOBook extends commonDAO {
                if ($r->compiledate < $r->changedate) {\r
                        return false;\r
                }\r
-               \r
-               if(!file_exists(WS_BOOKS.'/finalv1/'.$book_id.'/index.swf')){\r
+\r
+               if (!file_exists(WS_BOOKS . '/finalv1/' . $book_id . '/index.swf')) {\r
                        return false;\r
                }\r
 \r
@@ -715,8 +715,8 @@ class wsDAOBook extends commonDAO {
                $finalDir = WS_BOOKS . '/finalv1/' . $book_id . '/';\r
                $packager = new wsPackagerV1($book_id, $finalDir, false);\r
                $packager->makePackage(false);\r
-               \r
-               mkdir($finalDir,0777,true);\r
+\r
+               mkdir($finalDir, 0777, true);\r
        }\r
 \r
        public function compile3($book_id, $complete) {\r
@@ -1062,18 +1062,31 @@ class wsDAOBook extends commonDAO {
 \r
                $tempimage = array();\r
                $tempswf = array();\r
+               $timg = array();\r
 \r
 \r
                for ($i = $from; $i <= $to; $i++) {\r
                        $page = $pages[$i];\r
 \r
-                       $tempimage[$i] = cubeFiles::tempnam();\r
+                       $timg[$i] = $tempimage[$i] = cubeFiles::tempnam();\r
                        $tempswf[$i] = cubeFiles::tempnam();\r
 \r
                        $it = new imageTools();\r
-                       $it->loadImage(WS_DOCS . '/' . $page['document_id'] . '/html/t36-' . $page['document_page'] . '.jpg');\r
-                       $it->resize($book->parametres->widgetSize, 10000);\r
-                       $it->output('jpeg', $tempimage[$i], 100);\r
+\r
+\r
+                       $image = WS_DOCS . '/' . $page['document_id'] . '/html/t36-' . $page['document_page'] . '.jpg';\r
+\r
+\r
+                       try {\r
+                               $it->loadImage($image);\r
+                               $it->resize($book->parametres->widgetSize, 10000);\r
+                               $it->output('jpeg', $tempimage[$i], 100);\r
+                       } catch (Exception $e) {\r
+                               $tempimage[$i] = $image;\r
+                       }\r
+\r
+\r
+\r
 \r
                        $jpg2swf = new cubeCommandLine('jpeg2swf');\r
                        $jpg2swf->setEnv('PATH', '/bin:/usr/bin:/usr/local/bin');\r
@@ -1086,8 +1099,10 @@ class wsDAOBook extends commonDAO {
                }\r
                $swfcombine->execute();\r
 \r
-               foreach ($tempimage as $t) {\r
-                       unlink($t);\r
+               foreach ($timg as $t) {\r
+                       if (file_exists($t)) {\r
+                               unlink($t);\r
+                       }\r
                }\r
                foreach ($tempswf as $t) {\r
                        unlink($t);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 3f48865746a3d57ca94de4dab816c093a785525c..afcb3826326c31711d58e7251ceb85900a754771 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -58,8 +58,9 @@ class wsBookParametres extends wsParametres {
                        'hint' => __("0 : Publication à plat") . "\n" . __('2 : Valeur par défaut'));\r
                $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);\r
                $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire verticale'), 'grade' => 3);\r
+               $this->fields['centerBook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Centrer la publication sur les couvertures'), 'grade' => 2);\r
                $this->forms['3d_mode'] = array('label' => __('Options de visualisation'),\r
-                       'fieldsnames' => array('visualisationMode', 'pagesBaseAngle', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));\r
+                       'fieldsnames' => array('visualisationMode', 'pagesBaseAngle','centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode'));\r
 \r
 \r
                $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));\r