From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 22 Feb 2013 13:41:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=13e74e4942808ea636e203dfe2f4cfef8454251e;p=cubeextranet.git

---

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 0e784b13a..5a6ab5891 100644
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -654,6 +654,7 @@ class commonTools {
 		$res.='<tr><th colspan="2"><strong>' . __('Générer un p12 et pem à partir d\'un certificat et d\'une clé ') . '</strong></th></tr>';
 		$res.='<tr><td>' . __("Clé privée") . '</td><td><input type="file" name="key" /></td></tr>';
 		$res.='<tr><td>' . __("Certificat") . '</td><td><input type="file" name="cert" /></td></tr>';
+		$res.='<tr><td>' . __('Mot de passe') . '</td><td><input type="text" name="password" /></td></tr>';
 		$res.='<tr><td class="right" colspan="2"><a href="#" class="submit">' . $core->typo->BoutonOK(__('Exporter')) . '</a></td></td>';
 		$res.='</table>';
 		$res.='</form>';
@@ -694,7 +695,7 @@ class commonTools {
 		$openssl->setEnv('RANDFILE', $tmp . '/.rnd');
 		$openssl->setArg(null, 'pkcs12');
 		$openssl->setArg('-export');
-		$openssl->setArg('-password', 'pass:');
+		$openssl->setArg('-password', 'pass:' . $_POST['password']);
 		$openssl->setArg('-inkey', $_FILES['key']['tmp_name']);
 		$openssl->setArg('-in', $pem);
 		$openssl->setArg('-out', $p12);
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index ef91a7e44..e830178e0 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -116,7 +116,8 @@ class wsExporter {
 			$this->_rsync($package, '/home/dev/Works/Phonegap/Projects/' . $destination, true);
 			`/usr/local/bin/updatephonegapandroid`;
 		} else if ($os == 'ios') {
-			$this->_rsync($package, '/mnt/macbook/Phonegap/Projects/' . $destination, true);
+			`/usr/local/bin/remountmac`;
+			$this->_rsync($package, '/mnt/macbox/Phonegap/Projects/' . $destination, true);
 		}
 	}