(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index fb28ae4f348a4f7bf2bd8d009a839d9cad7322a4..9fce8671748651c996660aa9dc58d9fd85749ebd 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -137,9 +137,10 @@ class wsFlash extends cubeFlashGateway {
                $this->_themeToXML($theme);\r
        }\r
 \r
-       public function saveTheme(){\r
+       public function saveTheme()\r
+       {\r
                global $core;\r
-               $dao=new wsDAOTheme($core->con);\r
+               $dao = new wsDAOTheme($core->con);\r
                $dao->sauve($this->args);\r
        }\r
 \r
@@ -264,16 +265,42 @@ class wsFlash extends cubeFlashGateway {
                }\r
        }\r
 \r
-       public function getFluidbookForm()\r
+       public function getFluidbookForms()\r
        {\r
                global $core;\r
                $dao = new wsDAOBook($core->con);\r
                $book = $dao->selectById($this->args['book_id']);\r
+               fb($book->parametres->getForms());\r
                foreach($book->parametres->getForms() as $name) {\r
                        $f = $this->xml->addChild('form', json_encode($book->parametres->getForm($name)));\r
                        $f->addAttribute('name', $name);\r
                }\r
        }\r
+\r
+       public function getBookInfos()\r
+       {\r
+               global $core;\r
+               $dao = new wsDAOBook($core->con);\r
+               $book = $dao->selectById($this->args['book_id']);\r
+               $res = 'Nombre de pages :' . "\n";\r
+               $res .= '76 pages' . "\n";\r
+               $res .= "\n";\r
+               $res .= 'Dimensions :' . "\n";\r
+               $res .= '651.97 x 822.05 pt' . "\n";\r
+               $res .= "\n";\r
+               $res .= 'Taille totale des pages : ' . "\n";\r
+               $res .= '7898 Ko' . "\n";\r
+               $res .= "\n";\r
+               $res .= 'Taille moyenne des pages :' . "\n";\r
+               $res .= '198 Ko' . "\n";\r
+               $res .= "\n";\r
+               $res .= 'Taille du PDF:' . "\n";\r
+               $res .= '7898 Ko' . "\n";\r
+               $res .= "\n";\r
+               $res .= 'Qualité de conversion :' . "\n";\r
+               $res .= '150dpi (qualité 85%)' . "\n";\r
+               $this->xml->addChild('infos', $res);\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f11febee8ed530db3426efef414186a3099a2d8e..46a831ba41ddd650ee2411e1fb5c66515e3dd7e4 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -19,7 +19,7 @@ class wsDAOBook extends extranetDAO {
                $book->pages = array();\r
 \r
                $p = unserialize($r->parametres);\r
-               if (!$p) {\r
+               if (!$p || $p->isEmpty()) {\r
                        $p = new wsBookParametres($book);\r
                } else {\r
                        $p->setParent($book);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index f912fb93a530a5b67b43d80d9f8e8cd8cca9e247..e22e1065c52d8a6e03e13cd21ce5be9d2afb97ab 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -12,31 +12,36 @@ class wsBookParametres extends wsParametres {
                        return;\r
                }\r
                // .\r
-               $this->fields['general'] = __('Informations générales');\r
                $this->fields['pages'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Nombre de pages'), 'extra' => false, 'grade' => 0);\r
                $this->fields['width'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Largeur'), 'extra' => false, 'grade' => 0);\r
                $this->fields['height'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Hauteur'), 'extra' => false, 'grade' => 0);\r
-               $this->fields['first_page_nr'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('La numérotation débute à la page'), 'extra' => false, 'grade' => 1);\r
-               $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'extra' => false, 'grade' => 1);\r
-               $this->fields['reading_dir'] = array('type' => 'combo',\r
-                       'datas' => array(__('De la gauche vers la droite') => 'ltr', __('De la droite vers la gauche') => 'rtl'),\r
-                       'default' => 'ltr', 'editable' => true, 'label' => __('Sens de lecture'), 'extra' => false, 'grade' => 1);\r
                // .\r
-               $this->fields['fonctions_generales'] = __('Fonctionnalités générales');\r
                $this->fields['print'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Impression'), 'extra' => false, 'grade' => 1);\r
                $this->fields['search'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Moteur de recherche'), 'extra' => false, 'grade' => 1);\r
                $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Marques-pages'), 'extra' => false, 'grade' => 1);\r
                $this->fields['url_link'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du lien de retour au site"), 'extra' => false, 'grade' => 1);\r
+               $this->forms['general'] = array('label' => __('Fonctionnalités générales'),\r
+                       'fieldsnames' => array('print', 'search', 'bookmark', 'url_link'));\r
+               // .\r
+               $this->fields['first_page_nr'] = array('type' => 'integer', 'default' => 1, 'editable' => true, 'label' => __('La numérotation débute à la page'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'extra' => false, 'grade' => 1);\r
+               $this->fields['reading_dir'] = array('type' => 'combo',\r
+                       'datas' => array(__('De la gauche vers la droite') => 'ltr', __('De la droite vers la gauche') => 'rtl'),\r
+                       'default' => 'ltr', 'editable' => true, 'label' => __('Sens de lecture'), 'extra' => false, 'grade' => 1);\r
+               $this->forms['general_settings'] = array('label' => __('Paramètres généraux'),\r
+                       'fieldsnames' => array('preload', 'reading_dir'));\r
                // .\r
-               $this->fields['fonctions_pdf'] = __('Fonction Export PDF');\r
                $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Export PDF'), 'extra' => false, 'grade' => 1);\r
                $this->fields['optimizepdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Optimiser le PDF'), 'extra' => false, 'grade' => 4);\r
                $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Export PDF avancé'), 'extra' => false, 'grade' => 3);\r
+               $this->forms['pdf'] = array('label' => __('Fonction Export PDF'),\r
+                       'fieldsnames' => array('pdf', 'optimizepdf', 'pdfComplex'));\r
                // .\r
-               $this->fields['fonctions_zoom'] = __('Zoom');\r
                $this->fields['zoom'] = array('type' => 'integer', 'default' => 200, 'editable' => true, 'label' => __('Zoom par défaut (atteint au clic)'), 'extra' => false, 'grade' => 1);\r
                $this->fields['zoomw'] = array('type' => 'integer', 'default' => 300, 'editable' => true, 'label' => __("Zoom maximal (atteint à l'aide de la molette)"), 'extra' => false, 'grade' => 1);\r
                $this->fields['fixedZoom'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Zoom magnétique'), 'extra' => true, 'grade' => 4);\r
+               $this->forms['zoom'] = array('label' => __('Zoom'),\r
+                       'fieldsnames' => array('zoom', 'zoomw', 'fixedZoom'));\r
                // .\r
                $this->fields['fonctions_friend'] = __('Fonction Envoyer à un ami et partage');\r
                $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'), 'extra' => false, 'grade' => 1);\r
@@ -80,8 +85,6 @@ class wsBookParametres extends wsParametres {
                // .\r
                $this->fields['fonctions_diverses'] = __('Fonctions diverses');\r
                $this->fields['immediateResize'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Redimensionner immédiatement la fenêtre"), 'extra' => true, 'grade' => 4);\r
-\r
-               $this->forms['fluidbook'] = array('label' => __('Paramètres du fluidbook'), 'fieldsnames' => array_keys($this->fields));\r
        }\r
 }\r
 \r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 144cb5642253f73322f1b8e578c8355e26486930..dfd93309b00e01c0c77e9d4de2c4acd39acbc837 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -12,6 +12,10 @@ class wsParametres extends cubeMetier implements Iterator {
                $this->datas = array();\r
        }\r
 \r
+       public function isEmpty(){\r
+               return count($this->datas)==0;\r
+       }\r
+\r
        public function setParent($parent)\r
        {\r
                $this->parent = $parent;\r