wait #4518

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 803cfd5a9b73e50d57dc380b793a68479bf27380..36a47d741de18818ac9326749f88720598aa9281 100644 (file)
--- 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 5171da710f1e42b11d6d1c2353d25c096b0969b0..3cba98bd4e461547800f476121853bed3cff63f4 100644 (file)
--- 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 0d83453f635f9d4093cd0da84bf774f6aed7f658..c3f650868e19b0bbd8e83b2e1e2487e19ec6ea56 100644 (file)
--- 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
 \r
         // Sign app\r
         $cl = new CubeIT_CommandLine($local_root . 'sign');\r
-        //$cl->setSSH('paris.cubedesigners.com', 'vincent', 'atacama', 22022);\r
-        $cl->setSSH('tortuga.enhydra.fr', 'vincent', 'atacama', 22022);\r
+        $cl->setSSH(wsExporter::VINCENT, 'vincent', 'atacama', 22022);\r
         $cl->setArg(null, $local_root . $f);\r
         $cl->execute();\r
         $cl->debug();\r