wait #4287 @0.5

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 954e279792b8212e125a89e1e8b7fc45718f259f..327b66cf4b329cccd58aee75b5c1be72f558d2be 100644 (file)
--- 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 e6b7cfb8b681c27ef0530a65f5dfdedaa9c51a62..f74e4af6ce32d492a03da79f521360b51496ab98 100644 (file)
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -184,7 +184,7 @@ class wsUtil
                 }\r
                 $r = [];\r
                 foreach ($vars as $j => $varname) {\r
-                    if(!trim[$varname]){\r
+                    if(!trim($varname)){\r
                         continue;\r
                     }\r
                     $r[$varname] = trim($line[$j]);\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 1dca84b39650a5ee8422ddfab7f27b4d0509107b..3dd1df10f343e8df7d8881cf65cb8d05627a9a2b 100644 (file)
--- 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"></iframe></noscript>
                 $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"></iframe></noscript>
             }
 
             $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) {