From 7d22feb17e5eb38c5d72635bc72c7e9bd92f6b63 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 19 May 2022 16:31:24 +0000 Subject: [PATCH] wait #4287 @0.5 --- inc/ws/Metier/class.ws.document.php | 3 +-- inc/ws/Util/class.ws.util.php | 2 +- inc/ws/Util/html5/master/class.ws.html5.compiler.php | 6 +++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 954e27979..327b66cf4 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -248,7 +248,6 @@ class wsDocument extends cubeMetier { $this->addToLog('Detect spreads'); // Détection des spreads - $this->autocut = false; $this->manualcut = false; if ($this->generalInfos['pages'] <= 2) { @@ -510,7 +509,7 @@ class wsDocument extends cubeMetier global $core; $farmTesters = [1, 2, 3, 5]; if (!$core->user) { - return true; + return false; } return in_array($core->user->utilisateur_id, $farmTesters); } diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php index e6b7cfb8b..f74e4af6c 100644 --- a/inc/ws/Util/class.ws.util.php +++ b/inc/ws/Util/class.ws.util.php @@ -184,7 +184,7 @@ class wsUtil } $r = []; foreach ($vars as $j => $varname) { - if(!trim[$varname]){ + if(!trim($varname)){ continue; } $r[$varname] = trim($line[$j]); 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 1dca84b39..3dd1df10f 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -728,6 +728,9 @@ class wsHTML5Compiler foreach ($this->config->basketReferences as $ref => $data) { $r = []; foreach ($files as $file) { + if (!isset($data[$file])) { + $data[$file] = ''; + } $fname = trim($data[$file]); if ($fname !== '') { $fname = str_replace(' ', '-', $fname); @@ -2013,6 +2016,7 @@ height="0" width="0" style="display:none;visibility:hidden"> $this->vdir->copy($this->wdir . '/' . $this->book->parametres->tabsHTML5, 'data/tabs.svg'); $this->config->svgTabs = true; $pagesLists = ['tabsPages', 'tabsSections']; + foreach ($pagesLists as $pagesList) { $e = explode(',', $this->book->parametres->$pagesList); $list = []; @@ -2203,7 +2207,7 @@ height="0" width="0" style="display:none;visibility:hidden"> } $linkData['hidden'] = in_array($linkData['uid'], $hiddenLinks); - if ($linkData['zindex'] < 50 && in_array($linkData['uid'], $closedLinks)) { + if (isset($linkData['zindex']) && $linkData['zindex'] < 50 && in_array($linkData['uid'], $closedLinks)) { $linkData['zindex'] = 50; } if ($linkData['type'] == 28) { -- 2.39.5