From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 8 Jul 2010 17:18:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=444f531328f5171dc84378537f4f7c5f78ca8c05;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a406c5a6d..2f95c2b99 100644
--- 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);
 		$theme = $daoTheme->getThemeOfBook(2963);
 
-		$flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES),MXMLC_PATH);
+		$flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);
 		$flex->addVariable('links', $book->links);
 		$flex->addVariable('datas', $book->parametres->toStandardObject());
 		$flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions));
@@ -142,6 +142,14 @@ html{height:100%}' . "\n";
 		foreach($pages as $i => $infos) {
 			$flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);
 		}
+		$themeRoot = ROOT . '/themes/' . $theme->theme_id . '/';
+		if ($theme->parametres->useBackgroundImage) {
+			$flex->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background');
+		}
+		if ($theme->parametres->useMenuImage) {
+			$flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu');
+		}
+		$flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');
 
 		ob_clean();
 		$flex->compile();
diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 11c25d8ed..8b2b1d876 100644
--- 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);
 				}
 				break;
+			case 'file':
+				$e = explode('/', $value);
+				$value = array_pop($e);
+				break;
 			default:
 				$value = (string)$value;
 				break;
@@ -197,10 +201,11 @@ class wsParametres extends cubeMetier implements Iterator {
 		}
 	}
 
-	public function toStandardObject(){
-		$res=new stdClass();
-		foreach($this as $k=>$v){
-			$res->$k=$v;
+	public function toStandardObject()
+	{
+		$res = new stdClass();
+		foreach($this as $k => $v) {
+			$res->$k = $v;
 		}
 		return $res;
 	}