(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 1bcf640a8bfc7645a74bef2bca441999eabe1a64..a035de9b405a711cb213b9ce5ceb1ee7e2ef4545 100644 (file)
--- 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;\r
                $book->extras = $r->extras;\r
                $book->numerotation = $r->numerotation;\r
+\r
                return $book;\r
        }\r
 \r
@@ -417,6 +418,10 @@ class wsDAOBook extends extranetDAO {
                $book = $this->selectById($book_id);\r
                $pages = $this->getPagesOfBook($book_id);\r
 \r
+               $daoDoc = new wsDAODocument($this->con);\r
+               $firstDoc = $daoDoc->selectById($pages[1]['document_id']);\r
+               $size=$firstDoc->generalInfos['size'];\r
+\r
                $daoTheme = new wsDAOTheme($this->con);\r
                $theme = $daoTheme->getThemeOfBook($book_id);\r
 \r
@@ -429,6 +434,8 @@ class wsDAOBook extends extranetDAO {
                $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
                foreach($pages as $i => $infos) {\r
                        $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
                }\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 9fc8c0e9d0df4baf4edbf25b1a45b49b4646a4e0..d54df7d6ead5a5955151610abd9c48317160bfed 100644 (file)
--- 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[] = '|';\r
                                } else {\r
                                        $field = $this->fields[$f];\r
-                                       $rub[$f] = '('.$field['type'].')'.str_repeat("\t", 2 - floor((strlen($field['type'])+2) / 12)).$field['label'];\r
+                                       $rub[$f] = '(' . $field['type'] . ')' . str_repeat("\t", 2 - floor((strlen($field['type']) + 2) / 12)) . $field['label'];\r
                                }\r
                        }\r
                        $rubriques[$form['label']] = $rub;\r