wip #4346 @0.5

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index f6aa47be322ff1415a52d6fd532433d1b0adadd8..6acbeda4c412e9e87b4c45cad681ee9727284bcd 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -491,7 +491,7 @@ class wsBookParametres extends wsParametres
             'fieldsnames' => ['tabsHTML5', 'tabsPages', 'tabsSections', 'tabsPagesNumbers', '|', 'tabsSide', 'tabsMargin', '|', 'tabsHideOnPages', 'tabsHideOnCover', 'tabsHideOnLastPage', 'tabsHideEdges', '|', 'tabsPriority', 'tabsLinkWidth', 'tabsHideWhenOverlapingArrows', 'tabsHideOnPortrait', 'tabsHideOnZoom']];
 
         /*** **/
-
+        $this->fields['linksAssets'] = ['type' => 'freefile', 'label' => __('Charger ou remplacer des fichiers de liens'), 'default' => '', 'editable' => true, 'grade' => 3, 'multiple' => true];
         $this->fields['customLinkClass'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Classe pour les liens personnalisés'), 'grade' => 5);
         $this->fields['ignoreLinksTypes'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Ignorer les liens de type'), 'hint' => __('Liste des numéros séparés par des virgules'), 'grade' => 5);
         $this->fields['mobileLinksRevealAnim'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Animer les liens après un changement de page"), 'grade' => 3);
@@ -505,7 +505,7 @@ class wsBookParametres extends wsParametres
 
         $this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background'));
         $this->forms['links'] = array('label' => __('Liens'),
-            'fieldsnames' => array('permanentLinks', 'mobileLinksRevealAnim', 'linkBlinkTime', 'linkBlinkRepetition', '|', 'openLinkAtStartup', '|', 'customLinkClass', 'ignoreLinksTypes', 'mobileIgnoreBackgroundLinks', 'linkTooltipManager', 'linkCornerSize', 'linkTooltipMaxWidth', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkFilePrefix'));
+            'fieldsnames' => array('linksAssets', '|', 'permanentLinks', 'mobileLinksRevealAnim', 'linkBlinkTime', 'linkBlinkRepetition', '|', 'openLinkAtStartup', '|', 'customLinkClass', 'ignoreLinksTypes', 'mobileIgnoreBackgroundLinks', 'linkTooltipManager', 'linkCornerSize', 'linkTooltipMaxWidth', '|', 'linkTracker', 'linkTrackerRegexp', '|', 'linkFilePrefix'));
         //.
 
         $this->fields['textPopupStylesheet'] = ['type' => 'freefile', 'default' => '', 'editable' => true, 'label' => __('Feuille de style des popups de texte'), 'fileFilter' => $cssFilter];

diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index e01544bfb22a5e8bc79196082ec6f9fbf92d86c5..397f80f5be0cbee17d40ae1f60343678b4fa0ba8 100644 (file)
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -31,9 +31,9 @@ class wsUtil
             return array();\r
         }\r
 \r
-        $cacheFile = $cacheBase . sha1($excelFile . '/' . filemtime($excelFile));\r
+        $cacheFile = $cacheBase . sha1($excelFile . '/' . filemtime($excelFile).'/'.$assoc);\r
 \r
-        if (!$force && file_exists($cacheFile) && filemtime($cacheFile) > filemtime($excelFile) && !$assoc) {\r
+        if (!$force && file_exists($cacheFile) && filemtime($cacheFile) > filemtime($excelFile)) {\r
             $worksheets = json_decode(file_get_contents($cacheFile), true);\r
         } else {\r
             set_time_limit(0);\r
@@ -44,11 +44,14 @@ class wsUtil
             }\r
             $objPHPExcel = $objReader->load($excelFile);\r
 \r
+\r
+\r
             foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) {\r
                 if ($worksheet->getSheetState() != PHPExcel_Worksheet::SHEETSTATE_VISIBLE) {\r
                     continue;\r
                 }\r
                 $title = $worksheet->getTitle();\r
+\r
                 if (strlen($title) == 2 && cubeCountry::getCountry($title)) {\r
                     $title = cubeCountry::getCountry($title);\r
                 }\r
@@ -112,9 +115,9 @@ class wsUtil
         return $res;\r
     }\r
 \r
-    public static function excelToArrayKeyValMulti($excelFile, $reader = 'Excel2007')\r
+    public static function excelToArrayKeyValMulti($excelFile, $reader = 'Excel2007', $force = false)\r
     {\r
-        $worksheets = self::excelToArray($excelFile, false, $reader);\r
+        $worksheets = self::excelToArray($excelFile, false, $reader, $force);\r
         $res = [];\r
         foreach ($worksheets as $worksheet) {\r
             foreach ($worksheet as $line) {\r

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index ac2f330a1341d187ef1c32565a370b7f1c8c5644..93a02c80dbf5b150057425331886d8f1262e4f53 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -575,6 +575,7 @@ class wsHTML5Link
         $datas = parse_url($loc);
 
         if ((isset($datas['scheme']) && !is_null($datas['scheme'])) || strpos($loc, '#') === 0) {
+
             return $loc;
         } else {
             if ($css) {