(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index e2e9d3b1535ae2ee2bd1d8a6aa50df252f0a6dc5..1432e34920d77abe534083675a52da27dca5eab4 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -248,9 +248,16 @@ class wsFlash extends cubeFlashGateway {
                foreach ($pages as $page => $info) {\r
                        $file = WS_DOCS . '/' . $info['document_id'] . '/p' . $info['document_page'] . '.jpg';\r
                        if (!file_exists($file)) {\r
-                               continue;\r
+                               $dim = array(0, 0);\r
+                               $info['resolution'] = 150;\r
+                               $info['method'] = 1;\r
+                               $info['objects'] = 1800;\r
+                               $info['quality'] = 85;\r
+                       } else {\r
+                               $dim = getimagesize($file);\r
                        }\r
-                       $dim = getimagesize($file);\r
+\r
+\r
 \r
                        $pa = $p->addChild('page');\r
                        $pa->addAttribute('page', $page);\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ed52de13c26d1b6b9641c8028ab3a6c8eb460a8d..d55eff8c63151b3787eb451b6c00d66ede470ff7 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -779,7 +779,7 @@ html{height:100%}' . "\n";
                $res = '';\r
 \r
                if ($r->count() > 0) {\r
-                       $res .= '<tr><td>' . __('Choisir une tâche') . ' : </td><td>' . form::hidden('book_id', $book_id) . form::hidden('projet_id', $projet_id) . form::combo('tache', $taches,'0', 'hide_new_value') . '</td></tr>';\r
+                       $res .= '<tr><td>' . __('Choisir une tâche') . ' : </td><td>' . form::hidden('book_id', $book_id) . form::hidden('projet_id', $projet_id) . form::combo('tache', $taches, '0', 'hide_new_value') . '</td></tr>';\r
                        $res .= '<tr class="new"><td>' . __('ou créer une nouvelle tâche') . ' : </td><td>' . form::field('nom', 32, 1024, 'Fluidbook #' . $book->book_id . ' : ' . $book->nom) . ' ' . __('ayant le budget suivant') . ' ' . form::field('budget', 6, 6) . '</td></tr>';\r
                } else {\r
                        $res .= '<tr><td>' . __('Créer une tâche') . ' : </td><td>'\r
@@ -838,7 +838,7 @@ html{height:100%}' . "\n";
                if ($book->version == 2) {\r
                        return;\r
                }\r
-               $pages = $dao->getPagesOfBook($book_id);\r
+               $pages = $daoBook->getPagesOfBook($book_id);\r
                $toUpdate = array();\r
                foreach ($pages as $p => $infos) {\r
                        if ($infos['version'] < 2) {\r
@@ -852,7 +852,7 @@ html{height:100%}' . "\n";
                }\r
 \r
                if (count($toUpdate) > 0) {\r
-                       $dao->setChaptersFromOldFluidbook($book_id);\r
+                       $daoBook->setChaptersFromOldFluidbook($book_id);\r
                        $daoDoc = new wsDAODocument($core->con);\r
                        $daoDoc->setLinksFromOldFluidbook($book_id);\r
                }\r