From 641bc1e62c6d3bcc0c510c66dc816fce14f2afe7 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 16 Jul 2010 13:23:33 +0000
Subject: [PATCH]

---
 inc/ws/DAO/class.ws.dao.book.php      | 7 +++++++
 inc/ws/Metier/class.ws.parametres.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 1bcf640a8..a035de9b4 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -24,6 +24,7 @@ class wsDAOBook extends extranetDAO {
 		$book->parametres = $r->parametres;
 		$book->extras = $r->extras;
 		$book->numerotation = $r->numerotation;
+
 		return $book;
 	}
 
@@ -417,6 +418,10 @@ class wsDAOBook extends extranetDAO {
 		$book = $this->selectById($book_id);
 		$pages = $this->getPagesOfBook($book_id);
 
+		$daoDoc = new wsDAODocument($this->con);
+		$firstDoc = $daoDoc->selectById($pages[1]['document_id']);
+		$size=$firstDoc->generalInfos['size'];
+
 		$daoTheme = new wsDAOTheme($this->con);
 		$theme = $daoTheme->getThemeOfBook($book_id);
 
@@ -429,6 +434,8 @@ class wsDAOBook extends extranetDAO {
 		$flex->addVariable('numerotation', $book->numerotation);
 		$flex->addVariable('theme', $theme->parametres->toStandardObject());
 		$flex->addVariable('pages', count($pages));
+		$flex->addVariable('fwidth',$size[0],false,true,'Number');
+		$flex->addVariable('fheight',$size[1],false,true,'Number');
 		foreach($pages as $i => $infos) {
 			$flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);
 		}
diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 9fc8c0e9d..d54df7d6e 100644
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -220,7 +220,7 @@ class wsParametres extends cubeMetier implements Iterator {
 					$rub[] = '|';
 				} else {
 					$field = $this->fields[$f];
-					$rub[$f] = '('.$field['type'].')'.str_repeat("\t", 2 - floor((strlen($field['type'])+2) / 12)).$field['label'];
+					$rub[$f] = '(' . $field['type'] . ')' . str_repeat("\t", 2 - floor((strlen($field['type']) + 2) / 12)) . $field['label'];
 				}
 			}
 			$rubriques[$form['label']] = $rub;
-- 
2.39.5