wip #4211 @1

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index c368c392b7124f64efd74846ddb511e8a4b18760..b27b84b39936298df402f269f23ce95deb1e44f8 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -986,7 +986,7 @@ class wsMaintenance
 
         foreach ($iconSets as $iconSet) {
             $dom = new DOMDocument();
-            $svgFile = WS_ICONS . '/' . $iconSet . '/interface.svg';
+            $svgFile = WS_ICONS . '/' . $iconSet . '/intefrface.svg';
             if (!$dom->loadXML(file_get_contents($svgFile))) {
                 die('Error loading xml : ' . $svgFile);
             }

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 0cb29ba1c53c8d3d9d3b0d08a96abce4d6178e9c..72af827e041d5e785d123b00f673aa6e89d8f26b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -556,12 +556,12 @@ class wsUrl
         $versions['online'] = array('title' => __('Version online') . $default, 'icon' => cubeMedia::silk('page_world.png'));
         $versions['sharepoint'] = array('title' => __('Version Sharepoint') . $default, 'icon' => cubeMedia::silk('page_world.png'));
         $versions['scorm'] = array('title' => __('Version SCORM') . $default, 'icon' => cubeMedia::silk('page_world.png'));
-        $versions['win-inss-html'] = array('title' => __('Version offline') . ' - ' . __('Executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
-        $versions['win-ins-html'] = array('title' => __('Version offline') . ' - ' . __('Installeur Auto-executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
-        $versions['win-exe-html'] = array('title' => __('Version offline') . ' - ' . __('ZIP Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
-        $versions['mac-exe-html'] = array('title' => __('Version offline') . ' - ' . __('Exécutable Mac OS X'), 'icon' => cubeMedia::image(IMG . '/macos.png'));
-        $versions['win-cd-html'] = array('title' => __('Version offline') . ' - ' . __('CD-ROM') . ' / ' . __('Clé USB'), 'icon' => cubeMedia::silk('cd.png'));
-        $versions['win-html'] = array('title' => __('Version offline') . ' - ' . __('HTML') . ' (' . __('Non adaptée à l\'installation sur un serveur web') . ')', 'icon' => cubeMedia::silk('cd.png'));
+        $versions['win_inss_html'] = array('title' => __('Version offline') . ' - ' . __('Executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
+        $versions['win_ins_html'] = array('title' => __('Version offline') . ' - ' . __('Installeur Auto-executable Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
+        $versions['win_exe_html'] = array('title' => __('Version offline') . ' - ' . __('ZIP Windows'), 'icon' => cubeMedia::silk('application_view_tile.png'));
+        $versions['mac_exe_html'] = array('title' => __('Version offline') . ' - ' . __('Exécutable Mac OS X'), 'icon' => cubeMedia::image(IMG . '/macos.png'));
+        $versions['win_cd_html'] = array('title' => __('Version offline') . ' - ' . __('CD-ROM') . ' / ' . __('Clé USB'), 'icon' => cubeMedia::silk('cd.png'));
+        $versions['win_html'] = array('title' => __('Version offline') . ' - ' . __('HTML') . ' (' . __('Non adaptée à l\'installation sur un serveur web') . ')', 'icon' => cubeMedia::silk('cd.png'));
         if ($droits->admin) {
             $versions['phonegap'] = array('title' => __('Version offline') . ' - ' . __('Application mobile'), 'icon' => cubeMedia::image(IMG . '/phonegap.png'));
             $versions['precompiled'] = array('title' => __('Version precompilée'), 'icon' => cubeMedia::image(IMG . '/phonegap.png'));

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 54ac923e1e80dcc2b7812c89a6d65631840d6be4..1053f3d9cc8e8e34b9489960e9e7434652d9120c 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -128,7 +128,7 @@ class wsBookParametres extends wsParametres
                 __("Laisser le choix à l'utilisateur (mode 3D par défaut)") => '2',
                 __("Laisser le choix à l'utilisateur (mode 2D par défaut)") => '3'));
         $this->fields['antialiasReading'] = array('type' => 'boolean', 'default' => true, 'editable' => false, 'label' => __("Amélioration de la lisibilité en mode 2D"));
-        $this->fields['pagesBaseAngle'] = array('type' => 'integer', 'default' => '2', 'editable' => false, 'label' => __('Angle de base entre les pages'), 'grade' => 3,
+        $this->fields['pagesBaseAngle'] = array('type' => 'integer', 'default' => 2, 'editable' => false, 'label' => __('Angle de base entre les pages'), 'grade' => 3,
             'hint' => __("0 : Publication à plat") . "\n" . __('2 : Valeur par défaut'));
         $this->fields['preload'] = array('type' => 'integer', 'default' => 16, 'editable' => false, 'label' => __('Nombre de pages à précharger'), 'grade' => 3);
         $this->fields['tooltipTimer'] = array('type' => 'float', 'default' => 3, "editable" => true, 'label' => __("Temps maximum d'apparition des infos-bulles (en secondes)"));
@@ -155,10 +155,10 @@ class wsBookParametres extends wsParametres
         $this->fields['linkTooltipManager'] = array('type' => 'text', 'default' => '', 'editable' => false, 'label' => __("Gestionnaire des info-bulles"), 'grade' => 5);
         $this->fields['linkMultimediaPerformanceMode'] = array('type' => 'boolean', 'default' => false, 'editable' => false, 'label' => __('Mode perfomance pour les liens multimédia'), 'grade' => 5);
         $this->fields['linkMultimediaQuality'] = array('type' => 'float', 'default' => 1.0, 'editable' => false, 'label' => __('Qualité de rendu des animations'), 'grade' => 5);
-        $this->fields['linkCornerSize'] = array('type' => 'integer', 'default' => '10', 'editable' => false, 'label' => __('Taille des liens de coins de page'), 'hint' => __("Pourcentage de la largeur de la page"));
+        $this->fields['linkCornerSize'] = array('type' => 'integer', 'default' => 10, 'editable' => false, 'label' => __('Taille des liens de coins de page'), 'hint' => __("Pourcentage de la largeur de la page"));
         $this->fields['videoReset'] = array('type' => 'boolean', 'default' => false, 'editable' => false, 'label' => __('Réinitialiser les vidéos après la lecture'), 'grade' => 3);
         $this->fields['videoBigPlay'] = array('type' => 'boolean', 'default' => true, 'editable' => false, 'label' => __('Afficher le gros bouton Play'), 'grade' => 3);
-        $this->fields['alwaysHTML5'] = array('type' => 'boolean', 'default' => 'true', 'editable' => false, 'label' => __('Toujours utiliser la version HTML5'), 'grade' => 1);
+        $this->fields['alwaysHTML5'] = array('type' => 'boolean', 'default' => true, 'editable' => false, 'label' => __('Toujours utiliser la version HTML5'), 'grade' => 1);
         $this->fields['html5priority'] = array('type' => 'combo', 'default' => 'true', 'editable' => false, 'label' => __("Rediriger vers la version HTML5"), 'grade' => 1,
             'datas' => array(__('Si l\'utilisateur a un appareil tactile') => 'false',
                 __('Si flash n\'est pas installé') => 'notinstalled',
@@ -262,9 +262,9 @@ class wsBookParametres extends wsParametres
             'fieldsnames' => array('seoVersion', 'seoRobots', 'seoDescription', "seoKeywords", '|', 'seoBaseURL', 'seoAdvanced'));
 
         // .
-        $this->fields['pages'] = array('type' => 'integer', 'default' => '', 'editable' => false, 'label' => __('Nombre de pages'));
-        $this->fields['width'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Largeur'));
-        $this->fields['height'] = array('type' => 'float', 'default' => '', 'editable' => false, 'label' => __('Hauteur'));
+        $this->fields['pages'] = array('type' => 'integer', 'default' => 0, 'editable' => false, 'label' => __('Nombre de pages'));
+        $this->fields['width'] = array('type' => 'float', 'default' => 0, 'editable' => false, 'label' => __('Largeur'));
+        $this->fields['height'] = array('type' => 'float', 'default' => 0, 'editable' => false, 'label' => __('Hauteur'));
         // .
 
         $this->fields['mobileTransitions'] = array('type' => 'combo', 'default' => 'flip3d', 'editable' => true, 'label' => __('Transitions entre les pages'), 'grade' => 3,
@@ -274,7 +274,7 @@ class wsBookParametres extends wsParametres
                 __('Tourner (rigide)') => 'flip',
                 __('Tourner (souple)') => 'flip3d')
         );
-        $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '0.5', 'editable' => true, 'label' => __('Durée de la transition'));
+        $this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => 0.5, 'editable' => true, 'label' => __('Durée de la transition'));
         $this->fields['mobileNavigationType'] = array('type' => 'combo', 'default' => 'book', 'editable' => true, 'label' => __('Mode de navigation'), 'grade' => 5,
             'datas' => array(__('Normal (automatique)') => 'book',
                 __('Normal (double page)') => 'landscape',
@@ -285,9 +285,9 @@ class wsBookParametres extends wsParametres
         $this->fields['forceWhiteBackground'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Ajouter un fond blanc aux pages')];
         $this->fields['rasterizePages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ecraser les pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1);
         $this->fields['vectorPages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Conserver les pages en vecteur'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1);
-        $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
-        $this->fields['mobileExtraXSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
-        $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Marge supplémentaire verticale'), 'grade' => 3);
+        $this->fields['extraXSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
+        $this->fields['mobileExtraXSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
+        $this->fields['extraYSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire verticale'), 'grade' => 3);
         $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' => true, 'editable' => true, 'label' => __('Corriger les lignes blanches entre les pages'), 'grade' => 2);
         $this->fields['maxResolution'] = array('type' => 'combo', 'default' => 300, 'editable' => true, 'datas' => array('300dpi' => 300, '150dpi' => 150, '125dpi' => 125, '100dpi' => 100), 'grade' => 2, 'label' => __('Résolution maximale des pages'));
@@ -316,7 +316,7 @@ class wsBookParametres extends wsParametres
         $this->fields['navOrder'] = array('type' => 'textarea', 'default' => 'index, chapters, search, print, friend, bookmark, pdf, notes, archives, basket, fullscreen, sound, 3d, extra, extra1, extra2, extra3, extra4, extra5, help, lang', 'editable' => true, 'label' => __('Ordre des icônes dans la nav'), 'grade' => 3);
         $this->fields['navOrderH'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ordre des icônes dans la nav') . ' (' . __('Si différente') . ')', 'grade' => 3);
         $this->fields['menuBreakpoint'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Breakpoint burger menu'), 'hint' => 'Par défaut 1023px', 'grade' => 3);
-        $this->fields['mobileNavScale'] = array('type' => 'integer', 'default' => '100', 'editable' => true, 'label' => __('Taille du menu (en %)'), 'grade' => 3);
+        $this->fields['mobileNavScale'] = array('type' => 'integer', 'default' => 100, 'editable' => true, 'label' => __('Taille du menu (en %)'), 'grade' => 3);
         $this->forms['menu'] = array('label' => __('Menu'), 'fieldsnames' => ['navOrder', 'navOrderH', '|', 'mobileNavScale', 'menuBreakpoint', '|', 'afterSearchDisplayForHTML', '|']);
 
         $this->fields['afterSearchDisplayForHTML'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Afficher l\'image après le moteur de recherche sur la version HTML5'), 'grade' => 1);
@@ -351,12 +351,12 @@ class wsBookParametres extends wsParametres
 
         $this->fields['bookmark'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer les marques-pages'));
         $this->fields['bookmarkDisablePages'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Désactiver les marques-pages sur ces pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1];
-        $this->fields['bookmarkSendEnable'] = array('type' => 'boolean', 'default' => 'true', 'editable' => true, 'label' => __("Activer l'envoi des marques-pages par e-mail"));
+        $this->fields['bookmarkSendEnable'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Activer l'envoi des marques-pages par e-mail"));
         $this->fields['bookmark_email_title'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut'));
         $this->fields['bookmark_email_body'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __("Corps de l'email") . ' "' . __('Envoyer à un ami') . '"', 'hint' => __('Laisser vide pour utiliser la valeur par défaut'));
         $this->fields['bookmarkCornerSize'] = array('type' => 'integer', 'default' => 8, 'editable' => true, 'label' => __("Taille des marques-pages"), 'hint' => __('Taille relative à la largeur de la page'));
         $this->fields['bookmarkOffset'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __("Décaler de x pixels vers l'intérieur"));
-        $this->fields['bookmarkBlinkOnPageChange'] = array('type' => 'boolean', 'default' => 'false', 'editable' => true, 'label' => __('Faire clignoter le marque page à l\'apparition de la page'));
+        $this->fields['bookmarkBlinkOnPageChange'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Faire clignoter le marque page à l\'apparition de la page'));
         $this->fields['bookmarkPermanentIcon'] = ['type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Afficher l\'icône en permanance')];
         $this->fields['bookmarkUsePDF'] = array('type' => 'combo', 'default' => 'pages', 'editable' => true, 'label' => __('PDF à utiliser pour l\'envoi ou le téléchargement de pages marquées'),
             'datas' => [__('PDF des pages') => 'pages',
@@ -511,8 +511,8 @@ class wsBookParametres extends wsParametres
                 __('Les deux') => 'both',
             ]
         ];
-        $this->fields['tabsMargin'] = ['type' => 'float', 'label' => __('Marge des onglets'), 'editable' => true, 'default' => '-10', 'grade' => 5, 'hint' => __('Une marge négative = les onglets passent sous la publication')];
-        $this->fields['tabsLinkWidth'] = ['type' => 'float', 'label' => __('Largeur des onglets'), 'editable' => true, 'default' => '30', 'grade' => 5, 'hint' => __('Largeur réservée pour les onglets et largeur de la zone cliquable des liens')];
+        $this->fields['tabsMargin'] = ['type' => 'float', 'label' => __('Marge des onglets'), 'editable' => true, 'default' => -10, 'grade' => 5, 'hint' => __('Une marge négative = les onglets passent sous la publication')];
+        $this->fields['tabsLinkWidth'] = ['type' => 'float', 'label' => __('Largeur des onglets'), 'editable' => true, 'default' => 30, 'grade' => 5, 'hint' => __('Largeur réservée pour les onglets et largeur de la zone cliquable des liens')];
         $this->forms['tabs'] = ['label' => __('Onglets'),
             'fieldsnames' => ['tabsHTML5', 'tabsPages', 'tabsSections', 'tabsPagesNumbers', '|', 'tabsSide', 'tabsMargin', '|', 'tabsHideOnPages', 'tabsHideOnCover', 'tabsHideOnLastPage', 'tabsHideEdges', '|', 'tabsPriority', 'tabsLinkWidth', 'tabsHideWhenOverlapingArrows', 'tabsHideOnPortrait', 'tabsHideOnZoom']];
 
@@ -526,7 +526,7 @@ class wsBookParametres extends wsParametres
         $this->fields['linkTracker'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Tracking des liens'), 'grade' => 5);
         $this->fields['linkTrackerRegexp'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Tracking des liens applicables aux liens du domaine'), 'grade' => 5);
         $this->fields['linkFilePrefix'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Préfixer les liens de téléchargement'));
-        $this->fields['linkTooltipMaxWidth'] = array('type' => 'integer', 'default' => '140', 'editable' => true, 'label' => __('Largeur max des infobulles des liens de type "infobulle"'));
+        $this->fields['linkTooltipMaxWidth'] = array('type' => 'integer', 'default' => 140, 'editable' => true, 'label' => __('Largeur max des infobulles des liens de type "infobulle"'));
         $this->fields['openLinkAtStartup'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Déclencher un lien à l\'ouverture du fluidbook')];
 
         $this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background'));
@@ -535,10 +535,10 @@ class wsBookParametres extends wsParametres
         //.
 
         $this->fields['textPopupStylesheet'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Feuille de style des popups de texte'), 'fileFilter' => $cssFilter];
-        $this->fields['textPopupWidth'] = ['type' => 'integer', 'default' => '600', 'editable' => true, 'label' => __('Largeur optimale des popups')];
-        $this->fields['iframePopupMaxWidth'] = ['type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Largeur maximale des popups iframe')];
-        $this->fields['OAMChromeFactor'] = ['type' => 'float', 'default' => '1', 'editable' => true, 'label' => __('Facteur OAM Chrome')];
-        $this->fields['OAMIEFactor'] = ['type' => 'float', 'default' => '1', 'editable' => true, 'label' => __('Facteur OAM IE11')];
+        $this->fields['textPopupWidth'] = ['type' => 'integer', 'default' => 600, 'editable' => true, 'label' => __('Largeur optimale des popups')];
+        $this->fields['iframePopupMaxWidth'] = ['type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Largeur maximale des popups iframe')];
+        $this->fields['OAMChromeFactor'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Facteur OAM Chrome')];
+        $this->fields['OAMIEFactor'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Facteur OAM IE11')];
 
         $this->forms['multimedia'] = ['label' => __('Multimedia'),
             'fieldsnames' => ['textPopupStylesheet', 'textPopupWidth', '|', 'iframePopupMaxWidth', '|', 'OAMChromeFactor', 'OAMIEFactor']];
@@ -647,7 +647,7 @@ class wsBookParametres extends wsParametres
         $this->fields['splashImage'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Image'), 'grade' => 3, 'fileFilter' => $imageFilter];
         $this->fields['splashURL'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('URL'), 'grade' => 3];
         $this->fields['splashTarget'] = ['type' => 'combo', 'datas' => $target, 'default' => '_self', 'editable' => true, 'label' => __('Ouvrir le lien'), 'grade' => 3];
-        $this->fields['splashMinimalTime'] = ['type' => 'float', 'default' => '1', 'editable' => true, 'label' => __('Temps minimal d\'affichage'), 'grade' => 3];
+        $this->fields['splashMinimalTime'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Temps minimal d\'affichage'), 'grade' => 3];
 
         $this->forms['splash'] = ['label' => __('Ecran de chargement'), 'fieldsnames' => ['splashImage', 'splashURL', 'splashTarget', 'splashMinimalTime']];
 
@@ -660,7 +660,7 @@ class wsBookParametres extends wsParametres
         $this->fields['articlesFile'] = ['type' => 'freefile', 'default' => '', 'editable' => true,
             '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' => self::$fonts, 'editable' => 'true', 'grade' => 3];
+        $this->fields['articlesFont'] = ['type' => 'combo', 'label' => __('Police des articles'), 'default' => 'OpenSans', 'datas' => self::$fonts, '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', 'Business Immo' => 'business-immo']];
@@ -686,7 +686,7 @@ class wsBookParametres extends wsParametres
 
         $this->fields['cookieConsent'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Message cookie'));
         $this->fields['cookieConsentMessage'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Texte du consentement'));
-        $this->fields['cookieConsentAutoclose'] = array('type' => 'integer', 'default' => '0', 'editable' => true, 'label' => __('Masquer automatiquement après x secondes'));
+        $this->fields['cookieConsentAutoclose'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Masquer automatiquement après x secondes'));
         $this->forms['privacy'] = array('label' => __('Respect de la vie privée'),
             'fieldsnames' => array('cookieConsent', 'cookieConsentMessage', 'cookieConsentAutoclose'));
 

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 6e8dc40c5e938b4aebd73585375f6c462e789ce6..04829edf4899a8b13a7420c8b88d26094871cee2 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -362,15 +362,14 @@ class wsParametres extends cubeMetier implements Iterator
 \r
     public function _generateV3Field($name, $f, $tab = false)\r
     {\r
-        $typeMap = ['combo' => 'SelectFromArray', 'boolean' => 'Checkbox', 'couleur' => 'Color', 'couleurAlpha' => 'Color', 'integer' => 'Integer', 'float' => 'Number', 'text' => 'Text', 'textarea' => 'Textarea', 'file' => 'Images', 'freefile' => 'FilesOrURL'];\r
+        if (stristr($name, '-')) {\r
+            die($name);\r
+        }\r
+\r
+        $typeMap = ['combo' => 'SelectFromArray', 'boolean' => 'Checkbox', 'couleur' => 'Color', 'couleurAlpha' => 'Color', 'integer' => 'Integer', 'float' => 'Number', 'text' => 'LongText', 'textarea' => 'Textarea', 'file' => 'Images', 'freefile' => 'FilesOrURL'];\r
         $copyAttrs = ['min' => 'min', 'max' => 'max', 'default' => 'default', 'allows_alpha' => 'allows_alpha'];\r
         $transAttrs = ['label' => 'label', 'hint' => 'hint'];\r
 \r
-        if ($name === 'iconSet') {\r
-            $f['type'] = 'combo';\r
-            $f['default'] = 15;\r
-            $f['datas'] = [__('Jeu d\'icônes par défaut') => 15];\r
-        }\r
 \r
         if ($f['type'] === 'couleur') {\r
             $f['allows_alpha'] = false;\r

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
index c3f650868e19b0bbd8e83b2e1e2487e19ec6ea56..7ce274c8de3adece80217eb28223591b1f5223a8 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
@@ -10,7 +10,7 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
     public function __construct($book_id)\r
     {\r
         parent::__construct($book_id);\r
-        $this->version = 'mac-exe-html';\r
+        $this->version = 'mac_exe_html';\r
     }\r
 \r
     public function makePackage($zip)\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.cd.html.php b/inc/ws/Util/packager/class.ws.packager.win.cd.html.php
index 26b6d076b69204e9effb0895f63bf77d0bff3e44..351ec0f09e61eb5c51fdfc8b76185524911a948f 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.cd.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.cd.html.php
@@ -7,7 +7,7 @@ class wsPackagerWinCDHTML extends wsPackagerMacEXEHTML
        {\r
                parent::__construct($book_id);\r
                $this->book->parametres->alwaysHTML5 = true;\r
-               $this->version = 'win-cd-html';\r
+               $this->version = 'win_cd_html';\r
        }\r
 \r
        protected function preparePackage()\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index de1a09ae9c028ccf6aaeca60651bf3e6031c55d1..93b44f4554f1a98c9ce0f40122a93a6246af47fa 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -14,7 +14,7 @@ class wsPackagerWinEXEHTML extends wsPackager
     public function __construct($book_id)\r
     {\r
         parent::__construct($book_id, null, true, true);\r
-        $this->version = 'win-exe-html';\r
+        $this->version = 'win_exe_html';\r
         $this->appName = '';\r
         $this->appversion = '1.0.' . time();\r
         $this->_clean = false;\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
index 0cf67ef8fa652c5cde08c8382841db784064709c..452958eb34f9b2f1d0b24a49172f823f8bff2be1 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.html.php
@@ -9,7 +9,7 @@ class wsPackagerWinINSTHTML extends wsPackagerWinEXEHTML
     public function __construct($book_id)\r
     {\r
         parent::__construct($book_id);\r
-        $this->version = 'win-ins-html';\r
+        $this->version = 'win_ins_html';\r
     }\r
 \r
     protected function preparePackage()\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.silent.html.php b/inc/ws/Util/packager/class.ws.packager.win.inst.silent.html.php
index 9f41a8005d58d6c70a0b75124a14b4739d915718..877b302f1c81b57775da6aaf8c46b9f732d66d9c 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.silent.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.silent.html.php
@@ -6,6 +6,6 @@ class wsPackagerWinINSTSilentHTML extends wsPackagerWinINSTHTML {
 \r
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
-               $this->version = 'win-inss-html';\r
+               $this->version = 'win_inss_html';\r
        }\r
 }
\ No newline at end of file