(no commit message)

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 0e784b13ab322cc911069666bf1aa2798d224477..5a6ab5891340de47ba6c78e4d97c2ff7450d7de2 100644 (file)
--- 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 ef91a7e4404fb2458f1e800afea399ecb8b1315a..e830178e067b99892b746f7263db9923501f1205 100644 (file)
--- 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);
                }
        }