From: vincent@cubedesigners.com Date: Thu, 29 Oct 2020 12:30:40 +0000 (+0000) Subject: wait #4007 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=79abc89157f84a9e886abaad4fd6e9b87fdf9cee;p=cubeextranet.git wait #4007 --- diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index a6431e53d..2f8a9de16 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -22,7 +22,6 @@ class wsExporter { global $core; - $ctrl = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true'; $alt = isset($_GET['alt']) && $_GET['alt'] == 'true'; 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 25d6ba5e2..dc400c74f 100644 --- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php @@ -416,7 +416,7 @@ class wsHTML5Compiler $this->addJsLib('cookie', 'js/libs/jquery/jquery.cookie.js'); $this->addJsLib('puma', 'js/libs/fluidbook/cart/fluidbook.cart.puma.js'); $this->addJsLib('html2pdf', 'js/libs/html2pdf/html2pdf.min.js'); - $this->addJsLib('xlsx', 'js/libs/xlsx.full.min.js'); + $this->addJsLib('exceljs', 'js/libs/exceljs.min.js'); $this->addVideoJs(); $this->config->basketReferences = wsUtil::excelToArrayKeyVars($this->wdir . '/commerce/' . $this->book->parametres->basketReferences); 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 698795670..d5fe9493c 100644 --- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php +++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php @@ -107,7 +107,8 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML // Sign app $cl = new CubeIT_CommandLine($local_root . 'sign'); - $cl->setSSH('paris.cubedesigners.com', 'vincent', 'atacama', 22022); + //$cl->setSSH('paris.cubedesigners.com', 'vincent', 'atacama', 22022); + $cl->setSSH('tortuga.enhydra.fr', 'vincent', 'atacama', 22022); $cl->setArg(null, $local_root . $f); $cl->execute(); $cl->debug();