wip #3733 @1

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index f691ba418b6040de284035d4252cc6179aee655e..9197bd8e360624a2ed1b4209870e96209542d499 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -32,9 +32,9 @@ class wsBookParametres extends wsParametres
         $basketFilter->name = __('Liste de produits') . ' (*.xml, *.xlsx)';
         $basketFilter->extensions = '*.xml;*.xlsx';
 
-        $xmlFilter = new stdClass();
-        $xmlFilter->name = __('Liste d\'articles') . ' (*.xml)';
-        $xmlFilter->extensions = '*.xml';
+        $articlesFilter = new stdClass();
+        $articlesFilter->name = __('Liste d\'articles') . ' (*.xml, *.zip)';
+        $articlesFilter->extensions = '*.xml;*.zip';
 
         $htmlFilter = new stdClass();
         $htmlFilter->name = __('Fichier HTML') . ' (*.html)';
@@ -354,7 +354,7 @@ class wsBookParametres extends wsParametres
         $this->fields['tagcommander_plan'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => 'Plan de taggage "Tag commander"', 'grade' => 3];
         $this->fields['tagcommander_default_vars'] = ['type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Variables par défaut', 'grade' => 3];
         $this->forms['stats'] = array('label' => __('Statistiques'),
-            'fieldsnames' => array('stats', 'stats_score', 'stats_exclude_ip', '|', 'relay_url_params', '|', 'googleAnalytics', '|', 'googleAnalyticsCustom', 'statsCustom', '|', 'xiti', 'xiti_page', '|', 'tagcommander_id','tagcommander_prod', 'tagcommander_plan', 'tagcommander_default_vars'));
+            'fieldsnames' => array('stats', 'stats_score', 'stats_exclude_ip', '|', 'relay_url_params', '|', 'googleAnalytics', '|', 'googleAnalyticsCustom', 'statsCustom', '|', 'xiti', 'xiti_page', '|', 'tagcommander_id', 'tagcommander_prod', 'tagcommander_plan', 'tagcommander_default_vars'));
 
         $this->fields['displayChaptersPopup'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Always display chapters in a popup'), 'grade' => 1);
         $this->fields['displayChaptersIcon'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Affiche l'icône du sommaire"), 'grade' => 1);
@@ -487,14 +487,15 @@ class wsBookParametres extends wsParametres
 
         // Articles
         $this->fields['articlesFile'] = ['type' => 'freefile', 'default' => '', 'editable' => true,
-            'label' => 'Articles', 'grade' => 3, 'fileFilter' => $xmlFilter];
+            'label' => 'Articles', 'grade' => 3, 'fileFilter' => $articlesFilter];
+        $this->fields['articlesFormat'] = ['type' => 'combo', 'default' => 'fluidbook', 'editable' => true, 'label' => 'Format', 'grade' => 3, 'datas' => [__('Fluidbook') => 'fluidbook', 'Business Immo' => 'business-immo']];
         $this->fields['articlesFont'] = ['type' => 'combo', 'label' => __('Police des articles'), 'default' => 'OpenSans', 'datas' => [
             'Open Sans (police du Fluidbook)' => 'OpenSans', 'Montserrat' => 'Montserrat'], 'editable' => 'true', 'grade' => 3];
         $this->fields['articlesImages'] = ['type' => 'freefile', 'label' => __('Images des articles'), 'default' => '', 'hint' => __('Les noms des fichiers doivent être les même que ceux des balises <image> du XML'), 'editable' => true, 'grade' => 3, 'dir' => 'articles', 'multiple' => true];
         $this->fields['articlesShare'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le partage'), 'grade' => 3];
-        $this->fields['articlesStyle'] = ['type' => 'combo', 'default' => true, 'editable' => true, 'label' => __('Style'), 'grade' => 3, 'datas' => ['Défaut' => 'default', 'Atlantic' => 'atlantic', 'Harmonie Mutuelle' => 'harmonie-mutuelle']];
+        $this->fields['articlesStyle'] = ['type' => 'combo', 'default' => true, 'editable' => true, 'label' => __('Style'), 'grade' => 3, 'datas' => ['Défaut' => 'default', 'Atlantic' => 'atlantic', 'Harmonie Mutuelle' => 'harmonie-mutuelle', 'Business Immo' => 'business-immo']];
 
-        $this->forms['articles'] = ['label' => __('Articles'), 'fieldsnames' => ['articlesFile', 'articlesShare', 'articlesImages', '|', 'articlesStyle', 'articlesFont']];
+        $this->forms['articles'] = ['label' => __('Articles'), 'fieldsnames' => ['articlesFile', 'articlesFormat', 'articlesImages', '|', 'articlesShare', '|', 'articlesStyle', 'articlesFont']];
 
         //.
         $this->fields['externalArchives'] = array('type' => 'freefile', 'default' => '', 'editable' => true,