From dcce5f0a75ac4c8edf6b6239c3900b1c1e6b2d79 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 21 Jan 2013 17:53:18 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.ajax.php | 2 +- inc/ws/Controlleur/class.ws.flash.php | 11 ++--------- inc/ws/Controlleur/class.ws.services.php | 2 ++ inc/ws/Metier/class.ws.book.parametres.php | 13 +++++-------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php index d480fc9e8..9d47c5858 100644 --- a/inc/ws/Controlleur/class.ws.ajax.php +++ b/inc/ws/Controlleur/class.ws.ajax.php @@ -268,7 +268,7 @@ class wsAjax extends cubeAjax { fb(time(), 'start transfert'); if ($server == 'references') { - $root = '/home/fluidbook/dev/references'; + $root = '/home/fluidbook/www/references'; $url = 'http://www.fluidbook.com/references/'; $protocol = 'rsync'; } else if ($server == 'hosting') { diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index a82a13eca..ab79954a8 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -608,18 +608,11 @@ class wsFlash extends cubeFlashGateway { $size = $firstDoc->generalInfos['size']; $this->xml->addChild('width', $size[0]); $this->xml->addChild('height', $size[1]); - $res = __('Nombre de pages') . ' : ' . "\n"; + $res = ''.__('Nombre de pages') . ' : ' ; $res .= $nb_pages . ' ' . __('pages') . "\n"; $res .= "\n"; - $res .= __('Dimensions') . ' : ' . "\n"; + $res .= ''.__('Dimensions') . ' : ' . "\n"; $res .= round($size[0], 3) . ' x ' . round($size[1], 3) . ' pts' . "\n"; - $res .= "\n"; - $res .= __('Taille totale des pages') . ' : ' . "\n"; - $res .= $total . "\n"; - $res .= "\n"; - $res .= __('Taille moyenne des pages') . ' : ' . "\n"; - $res .= $average . "\n"; - $res .= "\n"; $this->xml->addChild('infos', $res); } diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php index 45894e8e0..450aee9cb 100644 --- a/inc/ws/Controlleur/class.ws.services.php +++ b/inc/ws/Controlleur/class.ws.services.php @@ -95,6 +95,8 @@ class wsServices extends cubeFlashGateway { if ($total > 1) { $s = ' (' . ($i + 1) . '/' . $total . ')'; } + + // Send the email $mail = new cubeMail(); diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php index fe41809b2..998404424 100644 --- a/inc/ws/Metier/class.ws.book.parametres.php +++ b/inc/ws/Metier/class.ws.book.parametres.php @@ -86,13 +86,14 @@ class wsBookParametres extends wsParametres { $this->fields['centerBook'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Centrer la publication sur les couvertures'), 'grade' => 2); $this->fields['correctCenter'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Corriger les lignes blanches entre les pages'), 'grade' => 2); $this->forms['3d_mode'] = array('label' => __('Options de visualisation'), - 'fieldsnames' => array('visualisationMode', 'antialiasReading','correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode')); + 'fieldsnames' => array('visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'extraYSpace', '|', 'viewMode')); + $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3); $this->fields['fullscreen'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le mode plein-écran')); $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 5); $this->fields['tooltipTimer'] = array('type' => 'float', 'default' => 3, "editable" => true, 'label' => __("Temps maximum d'apparition des infos-bulles (en secondes)")); $this->forms['general'] = array('label' => __('Fonctionnalités générales'), - 'fieldsnames' => array('fullscreen', 'navOrder', 'tooltipTimer', 'pages', 'width', 'height')); + 'fieldsnames' => array('fullscreen', 'navOrder', 'tooltipTimer', 'preload', 'pages', 'width', 'height')); //. // @@ -108,7 +109,7 @@ class wsBookParametres extends wsParametres { $this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage")); $this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes")); $this->forms['help'] = array('label' => __('Aide'), - 'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime','|','helpBookmarks')); + 'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime', '|', 'helpBookmarks')); // . // $this->fields['indexAutoScroll'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le scroll automatique')); @@ -147,10 +148,6 @@ class wsBookParametres extends wsParametres { $this->forms['sound'] = array('label' => __('Effets sonores'), 'fieldsnames' => array('soundTheme', 'soundOn')); // . - $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => true, 'label' => __('Nombre de pages à précharger'), 'grade' => 3); - $this->forms['general_settings'] = array('label' => __('Paramètres généraux'), - 'fieldsnames' => array('preload')); - // . $this->fields['pdf'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer les fonctions de téléchargement")); $this->fields['pdfName'] = array('type' => 'text', 'default' => 'document.pdf', 'editable' => true, 'label' => __("Nom du fichier PDF")); $this->fields['pdfComplex'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téchargement de PDF avancé'), "hint" => __("Permet à l'utilisateur de sélectionner les pages qu'il souhaite télécharger"), 'grade' => 3); @@ -159,7 +156,7 @@ class wsBookParametres extends wsParametres { 'label' => __('PDF de remplacement'), 'grade' => 3, 'fileFilter' => $pdfFilter); $this->fields['offlineExport'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Téléchargement des versions offline'), "hint" => __('Valable si le téléchargement avancé est activé'), 'grade' => 3); $this->forms['pdf'] = array('label' => __('Fonction de téléchargement'), - 'fieldsnames' => array('pdf', 'pdfName', 'pdfReplace','pdfCompress', 'pdfComplex', 'offlineExport')); + 'fieldsnames' => array('pdf', 'pdfName', 'pdfReplace', 'pdfCompress', 'pdfComplex', 'offlineExport')); // . $this->fields['zoomMode'] = array('type' => 'combo', 'default' => '0', 'editable' => true, 'label' => __("Mode de zoom"), 'grade' => 3, 'datas' => array(__('Normal') => '0', -- 2.39.5