From 7ce5232efbf457b4e24c1060a0b0e86ad8bd1470 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 7 Jul 2010 13:46:49 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.url.php | 4 ++-- inc/ws/Metier/class.ws.book.parametres.php | 9 +-------- inc/ws/Metier/class.ws.parametres.php | 8 ++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index e0e3ba915..4497c96a4 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -132,12 +132,12 @@ html{height:100%}' . "\n"; $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')); $flex->addVariable('links', $book->links); - $flex->addVariable('datas', $book->parametres); + $flex->addVariable('datas', $book->parametres->toStandardObject()); $flex->addVariable('traductions', $book->traductions); $flex->addVariable('chapters', $book->chapters); $flex->addVariable('extras', $book->extras); $flex->addVariable('numerotation', $book->numerotation); - $flex->addVariable('theme', $theme->parametres); + $flex->addVariable('theme', $theme->parametres->toStandardObject()); $flex->addVariable('pages', count($pages)); 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.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index 663a4360d..75770f27d 100644 --- 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')); // . // . - $this->fields['fonctions_friend'] = __('Fonction Envoyer à un ami et partage'); $this->fields['friend'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Envoyer à un ami'), 'extra' => false, 'grade' => 1); $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); $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); @@ -27,7 +26,7 @@ class wsBookParametres extends wsParametres { $this->fields['addThis'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Identifiant addThis"), 'extra' => false, 'grade' => 4); $this->fields['addThisOptions'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Paramètres addThis"), 'extra' => false, 'grade' => 4); $this->forms['share'] = array('label' => __('Fonctions de partage'), - 'fieldsnames' => array('friend','email_title', 'email_body', 'email_editable', 'askAcknowledge', 'attachPDFInEmail', 'attachmentName', 'addThis', 'addThisOptions')); + 'fieldsnames' => array('friend', 'email_title', 'email_body', 'email_editable', 'askAcknowledge', 'attachPDFInEmail', 'attachmentName', 'addThis', 'addThisOptions')); // . $this->fields['pages'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Nombre de pages'), 'extra' => false, 'grade' => 0); $this->fields['width'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Largeur'), 'extra' => false, 'grade' => 0); @@ -60,14 +59,12 @@ class wsBookParametres extends wsParametres { $this->forms['zoom'] = array('label' => __('Zoom'), 'fieldsnames' => array('zoom', 'zoomw', 'fixedZoom')); // . - $this->fields['fonctions_stats'] = __('Fonction Statistiques'); $this->fields['stats'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les statistiques'), 'extra' => false, 'grade' => 1); $this->fields['statsWeborama'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Statistiques Weborama'), 'size' => 10, 'extra' => true, 'grade' => 1); $this->fields['googleAnalytics'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Code Google Analytics'), 'size' => 10, 'extra' => true, 'grade' => 1); $this->forms['stats'] = array('label' => __('Statistiques'), 'fieldsnames' => array('stats', 'statsWeborama')); // . - $this->fields['fonctions_sommaire'] = __('Fonction Sommaire'); $this->fields['displayChaptersAtStart'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher le sommaire au chargement de la publication"), 'extra' => true, 'grade' => 4); $this->fields['chaptersPosition'] = array('type' => 'combo', 'datas' => array(__('Centré') => 'center' , __("Calé sur l'icône") => 'icon', __('Calé sur la gauche') => 'left'), @@ -77,25 +74,21 @@ class wsBookParametres extends wsParametres { $this->forms['sommaire'] = array('label' => __('Sommaire'), 'fieldsnames' => array('displayChaptersAtStart', 'chaptersPosition')); // . - $this->fields['fonctions_liens'] = __('Liens et multimedia'); $this->fields['playVideoAtStart'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Jouer les vidéos à l'affichage de la page"), 'extra' => true, 'grade' => 4); $this->fields['permanentLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Liens visibles en permanence'), 'extra' => true, 'grade' => 4); $this->forms['multimedia'] = array('label' => __('Liens et multimédia'), 'fieldsnames' => array('playVideoAtStart', 'permanentLinks')); $this->fields['zoomAreas'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Activer le zoom sur les liens ''Plus d'infos''"), 'extra' => true, 'grade' => 4); // . - $this->fields['fonctions_sousmenu'] = __('Sous-menu supplémentaire'); $this->fields['extraSubMenu'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Sous-menu supplémentaire'), 'extra' => true, 'grade' => 4); $this->fields['extraSMsizeX'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Largeur du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4); $this->fields['extraSMsizeY'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Hauteur du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4); $this->fields['extraName'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __('Nom du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4); $this->fields['extraFileName'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __('Fichier du sous-menu supplémentaire'), 'extra' => true, 'grade' => 4); // . - $this->fields['fonctions_onglets'] = __('Fonds multimédia et onglets'); $this->fields['backClipName'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __('Fichier du fond animé'), 'extra' => true, 'grade' => 4); $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => false, 'label' => __('Largeur du décalage des flèches'), 'extra' => true, 'grade' => 4); // . - $this->fields['fonctions_diverses'] = __('Fonctions diverses'); $this->fields['immediateResize'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Redimensionner immédiatement la fenêtre"), 'extra' => true, 'grade' => 4); } } diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php index eca957eb5..11c25d8ed 100644 --- 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 { } } } + + public function toStandardObject(){ + $res=new stdClass(); + foreach($this as $k=>$v){ + $res->$k=$v; + } + return $res; + } } ?> \ No newline at end of file -- 2.39.5