wip #5112 @2

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index e31ae80f085a2ecc3d29d00d345f565695df0c62..2855e6747c281bb4c81e24b87b5838a1200f601c 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -321,7 +321,7 @@ class commonTools
         $res .= '<tr><td>' . __('Adresse IP') . '</td><td colspan="2">' . $_SERVER['REMOTE_ADDR'] . '</td></tr>';
         $res .= '<tr><td>' . __('Adobe Flash Player') . '</td><td colspan="2" class="flashversion"></td></tr>';
         $res .= '<tr><td rowspan="4">' . __('Support de la video') . '</td><td colspan="2"><strong class="f" data-feature="video"></strong></td></tr>';
-        $res .= '<tr><td>OGV</td><td><span class="f" data-feature="video . ogg"></span></td></tr>';
+        $res .= '<tr><td>OGV</td><td><span class="f" data-feature="video.ogg"></span></td></tr>';
         $res .= '<tr><td>H264</td><td><span class="f" data-feature="video . h264"></span></td></tr>';
         $res .= '<tr><td>WEBM</td><td><span class="f" data-feature="video . webm"></span></tr>';
         $res .= '<tr><td rowspan="3">' . __('Ecran') . '</td><td>' . __('Orientation') . '</td><td><span id="op">' . __('Portrait') . '</span><span id="ol">' . __('Paysage') . '</span></td></tr>';

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 4d1cd255329710a0bfe927a7039a1fef7d910098..413a079028e0c3c32731b8d208936e08d19fc54a 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -483,12 +483,13 @@ class wsBookParametres extends wsParametres
         $this->fields['xiti'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Code XiTi global'));
         $this->fields['xiti_page'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Modèle code xiti (pour tags relatifs aux pages)'));
         $this->fields['tagcommander_id'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => 'Tag commander ID', 'grade' => 3];
+        $this->fields['tagcommander_scriptname'] = ['type' => 'text', 'default' => 'tc_Multisite_Head.js,tc_Multisite_Analytics.js,tc_Multisite_Medias.js', 'editable' => true, 'label' => 'Nom du script Tagcommander', 'grade' => 3];
         $this->fields['tagcommander_prod'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => 'Production', 'grade' => 3];
         $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->fields['anchorsAliases'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Alias des ancres')];
         $this->forms['stats'] = array('label' => __('Statistiques avancées'),
-            'fieldsnames' => array('tagcommander_id', 'tagcommander_prod', 'tagcommander_plan', 'tagcommander_default_vars', 'anchorsAliases', '|', 'stats_score', 'stats_exclude_ip', '|', 'relay_url_params', '|', 'gtag_additional_code', '|', 'googleAnalyticsCustom', 'statsCustom', '|', 'xiti', 'xiti_page'));
+            'fieldsnames' => array('tagcommander_id', 'tagcommander_scriptname', 'tagcommander_prod', 'tagcommander_plan', 'tagcommander_default_vars', 'anchorsAliases', '|', 'stats_score', 'stats_exclude_ip', '|', 'relay_url_params', '|', 'gtag_additional_code', '|', 'googleAnalyticsCustom', 'statsCustom', '|', 'xiti', 'xiti_page'));
 
         $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);

diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index 0b41286d9dc544fb321214cd9eb11eaf56e3c4b9..e6b7cfb8b681c27ef0530a65f5dfdedaa9c51a62 100644 (file)
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -184,6 +184,9 @@ class wsUtil
                 }\r
                 $r = [];\r
                 foreach ($vars as $j => $varname) {\r
+                    if(!trim[$varname]){\r
+                        continue;\r
+                    }\r
                     $r[$varname] = trim($line[$j]);\r
                 }\r
                 $id = trim($line[0]);\r

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 30b5a7eb5216492fc371cc52d2ce331168202602..21d031900fae3a702485a5e3277b47ce16953d64 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1031,9 +1031,11 @@ class wsHTML5Compiler
             $this->config->tagcommander_default_vars = array_merge($default, $this->parseVariables($this->book->parametres->tagcommander_default_vars));
             $this->config->tagcommander_default_vars['env_work'] = $this->book->parametres->tagcommander_prod ? 'prod' : 'pre-prod';
 
-            $this->book->parametres->googleAnalyticsCustom .= '<script>window.tc_vars=' . json_encode($this->config->tagcommander_default_vars) . ';</script><script src="//cdn.tagcommander.com/' . $id . '/tc_Multisite_Head.js"></script>';
-            $this->book->parametres->statsCustom .= '<script src="//cdn.tagcommander.com/' . $id . '/tc_Multisite_Analytics.js"></script>';
-            $this->book->parametres->statsCustom .= '<script src="//cdn.tagcommander.com/' . $id . '/tc_Multisite_Medias.js"></script>';
+            $scriptNames=explode(',', $this->config->tagcommander_scriptname);
+            $this->book->parametres->googleAnalyticsCustom .= '<script>window.tc_vars=' . json_encode($this->config->tagcommander_default_vars) . ';</script><script src="//cdn.tagcommander.com/' . $id . '/' .$scriptNames[0] . '"></script>';
+            for($i=1;$i<count($scriptNames);$i++) {
+                $this->book->parametres->statsCustom .= '<script src="//cdn.tagcommander.com/' . $id . '/' . $scriptNames[$i] . '"></script>';
+            }
 
             if ($this->book->parametres->tagcommander_plan) {
                 $plan = wsUtil::excelToArrayKeyVars($this->_wdirOrAbsolute($this->book->parametres->tagcommander_plan));