(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a406c5a6dfbb57a77bbf61c910f511833a1cf3bf..2f95c2b99520afe5641a3a9315adb7b1d65e3f1a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -130,7 +130,7 @@ html{height:100%}' . "\n";
                $daoTheme = new wsDAOTheme($core->con);\r
                $theme = $daoTheme->getThemeOfBook(2963);\r
 \r
-               $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES),MXMLC_PATH);\r
+               $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flex->addVariable('links', $book->links);\r
                $flex->addVariable('datas', $book->parametres->toStandardObject());\r
                $flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions));\r
@@ -142,6 +142,14 @@ html{height:100%}' . "\n";
                foreach($pages as $i => $infos) {\r
                        $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
                }\r
+               $themeRoot = ROOT . '/themes/' . $theme->theme_id . '/';\r
+               if ($theme->parametres->useBackgroundImage) {\r
+                       $flex->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background');\r
+               }\r
+               if ($theme->parametres->useMenuImage) {\r
+                       $flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu');\r
+               }\r
+               $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
 \r
                ob_clean();\r
                $flex->compile();\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 11c25d8ed8f6e74cd98e83e78300832fe1ff5659..8b2b1d876a2241ef857bd7136f687f46d92674a9 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -124,6 +124,10 @@ class wsParametres extends cubeMetier implements Iterator {
                                        $value = intval($value);\r
                                }\r
                                break;\r
+                       case 'file':\r
+                               $e = explode('/', $value);\r
+                               $value = array_pop($e);\r
+                               break;\r
                        default:\r
                                $value = (string)$value;\r
                                break;\r
@@ -197,10 +201,11 @@ class wsParametres extends cubeMetier implements Iterator {
                }\r
        }\r
 \r
-       public function toStandardObject(){\r
-               $res=new stdClass();\r
-               foreach($this as $k=>$v){\r
-                       $res->$k=$v;\r
+       public function toStandardObject()\r
+       {\r
+               $res = new stdClass();\r
+               foreach($this as $k => $v) {\r
+                       $res->$k = $v;\r
                }\r
                return $res;\r
        }\r