From 74997b440d0b391262d327d1287220eed5f18140 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 13 Sep 2021 14:07:21 +0000 Subject: [PATCH] wait #4518 --- inc/ws/Controlleur/class.ws.ajax.php | 4 ++-- inc/ws/Util/class.ws.exporter.php | 4 ++-- inc/ws/Util/packager/class.ws.packager.mac.exe.html.php | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php index 803cfd5a9..36a47d741 100644 --- a/inc/ws/Controlleur/class.ws.ajax.php +++ b/inc/ws/Controlleur/class.ws.ajax.php @@ -1351,12 +1351,12 @@ class wsAjax extends cubeAjax self::cleanCachesCollection($id); - if ($_GET['ctrl']) { + if (isset($_GET['ctrl']) && $_GET['ctrl'] !== 'false') { $_GET['ctrl'] = false; self::exportCollection(array('exportCollection', $id, 'ios'), $x); } - if ($_GET['alt']) { + if (isset($_GET['alt']) && $_GET['alt'] !== 'false') { $_GET['alt'] = false; self::exportCollection(array('exportCollection', $id, 'android'), $x); } diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php index 5171da710..3cba98bd4 100644 --- a/inc/ws/Util/class.ws.exporter.php +++ b/inc/ws/Util/class.ws.exporter.php @@ -16,8 +16,8 @@ class wsExporter public $x; public $ftpPassiveMode = false; - //const VINCENT = "paris.cubedesigners.com"; - const VINCENT = "tortuga.enhydra.fr"; + const VINCENT = "paris.cubedesigners.com"; + //const VINCENT = "tortuga.enhydra.fr"; public function exportCollection($collectionId, $os) { 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 0d83453f6..c3f650868 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 @@ -96,8 +96,7 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML // Sign app $cl = new CubeIT_CommandLine($local_root . 'sign'); - //$cl->setSSH('paris.cubedesigners.com', 'vincent', 'atacama', 22022); - $cl->setSSH('tortuga.enhydra.fr', 'vincent', 'atacama', 22022); + $cl->setSSH(wsExporter::VINCENT, 'vincent', 'atacama', 22022); $cl->setArg(null, $local_root . $f); $cl->execute(); $cl->debug(); -- 2.39.5