(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index e0e3ba915b6ab55b74fb11250f3f0aa3d9d003e1..4497c96a4a252d0a68bd57ccfdd92c84ccb1d162 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -132,12 +132,12 @@ html{height:100%}' . "\n";
 \r
                $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/test', 'flash.display.Sprite', array('C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src', 'C:\Users\Vincent\Documents\Works\as3'));\r
                $flex->addVariable('links', $book->links);\r
-               $flex->addVariable('datas', $book->parametres);\r
+               $flex->addVariable('datas', $book->parametres->toStandardObject());\r
                $flex->addVariable('traductions', $book->traductions);\r
                $flex->addVariable('chapters', $book->chapters);\r
                $flex->addVariable('extras', $book->extras);\r
                $flex->addVariable('numerotation', $book->numerotation);\r
-               $flex->addVariable('theme', $theme->parametres);\r
+               $flex->addVariable('theme', $theme->parametres->toStandardObject());\r
                $flex->addVariable('pages', count($pages));\r
                foreach($pages as $i => $infos) {\r
                        $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 663a4360d83045b0c3febba582f5d1c60d430054..75770f27d981d4e04c17e6f2ce9d978803f7be6c 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -16,7 +16,6 @@ class wsBookParametres extends wsParametres {
                        'fieldsnames' => array('title', 'url_link'));\r
                // .\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
                $this->fields['email_title'] = array('type' => 'text', 'default' => __('%name% vous invite à découvrir %title%'), 'editable' => true, 'label' => __("Titre de l'email \"Envoyer à un ami\""), 'extra' => false, 'grade' => 1);\r
                $this->fields['email_body'] = array('type' => 'textarea', 'default' => __('Veuillez cliquer sur le lien suivant : %link%'), 'editable' => true, 'label' => __("Corps de l'email \"Envoyer à un ami\""), 'extra' => false, 'grade' => 1);\r
@@ -27,7 +26,7 @@ class wsBookParametres extends wsParametres {
                $this->fields['addThis'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Identifiant addThis"), 'extra' => false, 'grade' => 4);\r
                $this->fields['addThisOptions'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Paramètres addThis"), 'extra' => false, 'grade' => 4);\r
                $this->forms['share'] = array('label' => __('Fonctions de partage'),\r
-                       'fieldsnames' => array('friend','email_title', 'email_body',  'email_editable', 'askAcknowledge', 'attachPDFInEmail', 'attachmentName', 'addThis', 'addThisOptions'));\r
+                       'fieldsnames' => array('friend', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', 'attachPDFInEmail', 'attachmentName', 'addThis', 'addThisOptions'));\r
                // .\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
@@ -60,14 +59,12 @@ class wsBookParametres extends wsParametres {
                $this->forms['zoom'] = array('label' => __('Zoom'),\r
                        'fieldsnames' => array('zoom', 'zoomw', 'fixedZoom'));\r
                // .\r
-               $this->fields['fonctions_stats'] = __('Fonction Statistiques');\r
                $this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques'), 'extra' => false, 'grade' => 1);\r
                $this->fields['statsWeborama'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Statistiques Weborama'), 'size' => 10, 'extra' => true, 'grade' => 1);\r
                $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10, 'extra' => true, 'grade' => 1);\r
                $this->forms['stats'] = array('label' => __('Statistiques'),\r
                        'fieldsnames' => array('stats', 'statsWeborama'));\r
                // .\r
-               $this->fields['fonctions_sommaire'] = __('Fonction Sommaire');\r
                $this->fields['displayChaptersAtStart'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher le sommaire au chargement de la publication"), 'extra' => true, 'grade' => 4);\r
                $this->fields['chaptersPosition'] = array('type' => 'combo',\r
                        'datas' => array(__('Centré') => 'center' , __("Calé sur l'icône") => 'icon', __('Calé sur la gauche') => 'left'),\r
@@ -77,25 +74,21 @@ class wsBookParametres extends wsParametres {
                $this->forms['sommaire'] = array('label' => __('Sommaire'),\r
                        'fieldsnames' => array('displayChaptersAtStart', 'chaptersPosition'));\r
                // .\r
-               $this->fields['fonctions_liens'] = __('Liens et multimedia');\r
                $this->fields['playVideoAtStart'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Jouer les vidéos à l'affichage de la page"), 'extra' => true, 'grade' => 4);\r
                $this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'extra' => true, 'grade' => 4);\r
                $this->forms['multimedia'] = array('label' => __('Liens et multimédia'),\r
                        'fieldsnames' => array('playVideoAtStart', 'permanentLinks'));\r
                $this->fields['zoomAreas'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Activer le zoom sur les liens ''Plus d'infos''"), 'extra' => true, 'grade' => 4);\r
                // .\r
-               $this->fields['fonctions_sousmenu'] = __('Sous-menu supplémentaire');\r
                $this->fields['extraSubMenu'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Sous-menu supplémentaire'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraSMsizeX'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Largeur du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraSMsizeY'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Hauteur du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraName'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __('Nom du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraFileName'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __('Fichier du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4);\r
                // .\r
-               $this->fields['fonctions_onglets'] = __('Fonds multimédia et onglets');\r
                $this->fields['backClipName'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __('Fichier du fond animé'), 'extra' => true, 'grade' => 4);\r
                $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => false, 'label' => __('Largeur du décalage des flèches'), 'extra' => true, 'grade' => 4);\r
                // .\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
 }\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index eca957eb5bfe27631d52fb1543ff39d9741e6312..11c25d8ed8f6e74cd98e83e78300832fe1ff5659 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -196,6 +196,14 @@ class wsParametres extends cubeMetier implements Iterator {
                        }\r
                }\r
        }\r
+\r
+       public function toStandardObject(){\r
+               $res=new stdClass();\r
+               foreach($this as $k=>$v){\r
+                       $res->$k=$v;\r
+               }\r
+               return $res;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file