(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index f7a58720254b6b96072e2dce9bfa8e6f25035d67..f436f159b55937adfd819711641adde3000983b5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -128,7 +128,7 @@ html{height:100%}' . "\n";
                $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
                ob_clean();\r
-               echo $dao->compile(2963, 3);\r
+               echo $dao->compile(2963, 3,false);\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 739f33f570456323963ccd0c0b9f54638d6e3e5a..34eedd7bef1fd0ccc576202bb53c38ffb4e0f474 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -442,15 +442,23 @@ class wsDAOBook extends extranetDAO {
                $pages = $this->getPagesOfBook($book_id);\r
        }\r
 \r
-       public function compile($book_id, $version = 3)\r
+       public function compile($book_id, $version = 3, $complete = false)\r
        {\r
                if ($version == 3) {\r
-                       return $this->compile3($book_id);\r
+                       return $this->compile3($book_id, $complete);\r
                }\r
        }\r
 \r
-       public function compile3($book_id)\r
+       /**\r
+        * wsDAOBook::compile3()\r
+        *\r
+        * @param mixed $book_id\r
+        * @param mixed $complete\r
+        * @return\r
+        */\r
+       public function compile3($book_id, $complete)\r
        {\r
+               $res = '';\r
                $book = $this->selectById($book_id);\r
                $pages = $this->getPagesOfBook($book_id);\r
 \r
@@ -464,29 +472,44 @@ class wsDAOBook extends extranetDAO {
                $this->makeTextsIndexes($book_id, $index, $textes);\r
 \r
                $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/' . $book_id, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
+               $flexLight = new cubeFlexCompiler('FluidbookDatasLight', ROOT . '/books/datasCompiler/' . $book_id, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flex->addVariable('links', $book->links);\r
-               $flex->addVariable('datas', $book->parametres->toStandardObject());\r
+               $flexLight->addVariable('datas', $book->parametres->toStandardObject());\r
                $flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions));\r
                $flex->addVariable('chapters', $book->chapters);\r
                $flex->addVariable('extras', '<extras>' . $book->extras . '</extras>', false, true, 'XML');\r
                $flex->addVariable('numerotation', $book->numerotation);\r
-               $flex->addVariable('theme', $theme->parametres->toStandardObject());\r
-               $flex->addVariable('pages', count($pages));\r
-               $flex->addVariable('fwidth', $size[0], false, true, 'Number');\r
-               $flex->addVariable('fheight', $size[1], false, true, 'Number');\r
+               $flexLight->addVariable('theme', $theme->parametres->toStandardObject());\r
+               $flexLight->addVariable('pages', count($pages));\r
+               $flexLight->addVariable('fwidth', $size[0], false, true, 'Number');\r
+               $flexLight->addVariable('fheight', $size[1], false, true, 'Number');\r
+               $flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');\r
                $flex->addVariable('index', $index);\r
                $flex->addVariable('textes', $textes);\r
                foreach($pages as $i => $infos) {\r
-                       $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
+                       if ($i == 1) {\r
+                               $flexLight->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb1');\r
+                       } else {\r
+                               $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
+                       }\r
+               }\r
+\r
+               if ($complete) {\r
+                       foreach($pages as $i => $infos) {\r
+                               $flex->addSWF(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.swf', 'page' . $i);\r
+                       }\r
                }\r
                // Theme assets\r
                $themeRoot = ROOT . '/themes/' . $theme->theme_id . '/';\r
                if ($theme->parametres->useBackgroundImage) {\r
-                       $flex->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background');\r
+                       $flexLight->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background');\r
                }\r
                if ($theme->parametres->useMenuImage) {\r
                        $flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu');\r
                }\r
+               if ($theme->parametres->logoLoader != '') {\r
+                       $flexLight->addBitmap($themeRoot . $theme->parametres->logoLoader, 'logoLoader');\r
+               }\r
                $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
                // Icons assets\r
                $iconsRoot = ROOT . '/icones/' . $theme->parametres->iconSet . '/';\r
@@ -494,9 +517,14 @@ class wsDAOBook extends extranetDAO {
                        $flex->addBitmap($iconsRoot . 'nav-' . $file . '.png', 'nav_' . $file);\r
                }\r
                // Fonts\r
-               $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'Atlantis', 'ASCII');\r
-               $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'DinMedium', 'Latin');\r
-               return $flex->compile();\r
+               $flex->addFont(FONT_PATH . '/FFFATLAN_0.TTF', 'CreditsFont', 'ASCII');\r
+               $flex->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'GeneralFont', 'Latin');\r
+               $flexLight->addFont(FONT_PATH . '/DIN Medium_0.ttf', 'GeneralFont', 'Numerals');\r
+               $res .= $flexLight->compile() . "\n\n-------------------\n\n";\r
+               $res .= $flex->compile();\r
+               //$flex->clean();\r
+               //$flexLight->clean();\r
+               return $res;\r
        }\r
 }\r
 \r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index eae44393ab7a207d983f316886df3bd1ded4213e..946e2c80427edfcb78a441887edb6a9a5d34fe5e 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -645,7 +645,7 @@ disablelinks                Disable links.
 \r
                        $pdf2swf->setArg('stop');\r
                        // $pdf2swf->setManualArg('-v');\r
-                       $pdf2swf->setArg('T', 8);\r
+                       $pdf2swf->setArg('T', 9);\r
                        if ($storeAllChars) {\r
                                $pdf2swf->setArg('fonts');\r
                        }\r
@@ -671,7 +671,7 @@ disablelinks                Disable links.
 \r
        protected function makeAS3($page)\r
        {\r
-               $swffile = $this->out . 'p' . $page . '.swf';\r
+               /*$swffile = $this->out . 'p' . $page . '.swf';\r
 \r
                $swfcombine = new cubeCommandLine('swfcombine');\r
                $swfcombine->setPath(CONVERTER_PATH);\r
@@ -683,7 +683,7 @@ disablelinks                Disable links.
                $swfcombine->setArg(null, ROOT . '/swf/as3Container.swf');\r
                $swfcombine->setManualArg('content=' . $swffile);\r
                $swfcombine->execute();\r
-               $this->addToLog($swfcombine);\r
+               $this->addToLog($swfcombine);*/\r
        }\r
 \r
        protected function pdf2swfBarbare($page, $resolution = 150, $quality = 85, $method = 4)\r