From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 25 Sep 2013 10:18:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=62ec1c5303ba212977b8073ce55b5d447c3951d8;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_zinc/send.bat b/fluidbook/compile/_zinc/send.bat
index bb95bafab..064b15b1d 100644
--- a/fluidbook/compile/_zinc/send.bat
+++ b/fluidbook/compile/_zinc/send.bat
@@ -1,4 +1,4 @@
 rm Fluidbook.app.zip
 "C:\Program Files\7-Zip\7z.exe" a -tzip Fluidbook.app.zip Fluidbook.app
-"H:\Applications\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.exe" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
-"H:\Applications\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.app.zip" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
\ No newline at end of file
+"H:\Applications\PortableApps\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.exe" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
+"H:\Applications\PortableApps\PuTTYPortable\App\putty\pscp.exe" "Fluidbook.app.zip" extranet@extranet.cubedesigners.com:/home/extranet/www/fluidbook/compile/
\ No newline at end of file
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 9254efe5a..8de9f9553 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -61,8 +61,18 @@ class wsExporter {
 				)
 		);
 
-		$full = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true';
-		$phonegap->run($full);
+		$ctrl = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true';
+		$alt = isset($_GET['alt']) && $_GET['alt'] == 'true';
+
+		$run = CubeIT_Mobile_Phonegap::RUN_SYNC;
+		if ($ctrl) {
+			$run = CubeIT_Mobile_Phonegap::RUN_RUN;
+			if ($alt) {
+				$run = CubeIT_Mobile_Phonegap::RUN_CREATE;
+			}
+		}
+
+		$phonegap->run($run);
 
 		/* $this->_createProject($os, $collection->nom, $collection->settings['namespace']);
 		  $this->_collectionAssets($os, $compiler);
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 99ab3b234..f36343b8d 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -808,7 +808,7 @@ class wsHTML5Compiler {
 		$this->config->phonegap = $this->phonegap;
 		$this->config->retinaResolution = $this->maxRes;
 		if ($this->home) {
-			$this->config->home = '%apphome%';
+			$this->config->home = 'http://home';
 		}
 		$this->config->multiApp = $this->multiApp;
 		foreach ($this->additionalConfig as $k => $v) {