From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 26 Jun 2015 14:43:23 +0000 (+0000)
Subject: Disable ssl for lftp calls
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=51efbf1f62c15dda9eae516d0b0caac39b7a3983;p=cubeextranet.git

Disable ssl for lftp calls
---

diff --git a/inc/commons/class.common.ajax.php b/inc/commons/class.common.ajax.php
index 866d36563..32f8912cd 100644
--- a/inc/commons/class.common.ajax.php
+++ b/inc/commons/class.common.ajax.php
@@ -306,6 +306,7 @@ class commonAjax {
 		}
 
 		$commandes = array(
+			'set ftp:ssl-allow false',
 			'set ftp:passive-mode ' . $_POST['mode'],
 			'mkdir -p ' . $u['path'],
 			'cd ' . $u['path'],
@@ -359,7 +360,7 @@ Nom de la base : $user
 Mot de passe : $password";
 
 		if ($svn != '') {
-			$body.="\n\nSVN : svn+ssh://svn@svn.cubedesigners.com/projects/$svn";
+			$body .= "\n\nSVN : svn+ssh://svn@svn.cubedesigners.com/projects/$svn";
 		}
 
 		$users = array();
@@ -369,9 +370,9 @@ Mot de passe : $password";
 				$userpassword = CubeIT_Crypt::generateRandomString(10);
 				$users[$u] = $userpassword;
 				$b = $body . "\n\n";
-				$b.='Admin : http://' . $domain . '.dev.cubedesigners.com/admin/' . "\n";
-				$b.='Nom d\'utilisateur : ' . $u . "\n";
-				$b.='Mot de passe : ' . $userpassword . "\n";
+				$b .= 'Admin : http://' . $domain . '.dev.cubedesigners.com/admin/' . "\n";
+				$b .= 'Nom d\'utilisateur : ' . $u . "\n";
+				$b .= 'Mot de passe : ' . $userpassword . "\n";
 
 				$mail = new cubeMail();
 				$mail->charset = 'UTF-8';
@@ -393,13 +394,13 @@ Mot de passe : $password";
 
 		$args = "-l $user -o $domain -u $user -p $password";
 		if ($zend) {
-			$args.=" -n $zend";
+			$args .= " -n $zend";
 		}
 		if ($svn) {
-			$args.=" -d $svn";
+			$args .= " -d $svn";
 		}
 		if (count($users)) {
-			$args.=' -e ' . base64_encode(json_encode($users));
+			$args .= ' -e ' . base64_encode(json_encode($users));
 		}
 
 		$cmd = "ssh root@chihiro.cubedesigners.com /usr/local/bin/tools/projectcreator/make.php $args";
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 4e4abbbf1..2255cbff6 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -65,7 +65,7 @@ class wsExporter {
 			$phonegap->addLibrary(WS_COMPILE_ASSETS . '/_html5app/_android/lib');
 			$phonegap->setDistantCompiler('paris.cubedesigners.com', 'Vincent', 's77vpo*wu', 'h:/Phonegap/Projects/' . $d, '/mnt/vincent/cygdrive/h/Phonegap/Projects/' . $d, 22322, SSH_KEY);
 			$phonegap->setSourceVariables(array('background' => '0xff' . $collection->settings['couleurD'],
-				'orientation' => $collection->settings['orientation'])
+			                                    'orientation' => $collection->settings['orientation'])
 			);
 		}
 		$phonegap->setPreference('orientation', CubeIT_Mobile_Phonegap::ORIENTATION_PORTRAIT);
@@ -78,18 +78,18 @@ class wsExporter {
 			$phonegap->setPreference('EnableViewportScale', true);
 		}
 		$phonegap->addFeatures(array(
-			CubeIT_Mobile_Phonegap::FEATURE_CONNECTION,
-			CubeIT_Mobile_Phonegap::FEATURE_DEVICE,
-			CubeIT_Mobile_Phonegap::FEATURE_FILE,
-			CubeIT_Mobile_Phonegap::FEATURE_FILETRANSFER,
-			CubeIT_Mobile_Phonegap::FEATURE_STORAGE,
-			CubeIT_Mobile_Phonegap::FEATURE_NOTIFICATION_DIALOG,
-			CubeIT_Mobile_Phonegap::FEATURE_INAPPBROWSER,
-			CubeIT_Mobile_Phonegap::FEATURE_SPLASHSCREEN,
-			CubeIT_Mobile_Phonegap::FEATURE_GLOBALIZATION,
-			CubeIT_Mobile_Phonegap::FEATURE_PUSHNOTIFICATION,
-			CubeIT_Mobile_Phonegap::FEATURE_DEBUG
-				)
+				CubeIT_Mobile_Phonegap::FEATURE_CONNECTION,
+				CubeIT_Mobile_Phonegap::FEATURE_DEVICE,
+				CubeIT_Mobile_Phonegap::FEATURE_FILE,
+				CubeIT_Mobile_Phonegap::FEATURE_FILETRANSFER,
+				CubeIT_Mobile_Phonegap::FEATURE_STORAGE,
+				CubeIT_Mobile_Phonegap::FEATURE_NOTIFICATION_DIALOG,
+				CubeIT_Mobile_Phonegap::FEATURE_INAPPBROWSER,
+				CubeIT_Mobile_Phonegap::FEATURE_SPLASHSCREEN,
+				CubeIT_Mobile_Phonegap::FEATURE_GLOBALIZATION,
+				CubeIT_Mobile_Phonegap::FEATURE_PUSHNOTIFICATION,
+				CubeIT_Mobile_Phonegap::FEATURE_DEBUG
+			)
 		);
 		if ($os == 'ios') {
 			$phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_EXTERNALFILEUTIL);
@@ -395,6 +395,7 @@ class wsExporter {
 		}
 
 		$commandes = array(
+			'set ftp:ssl-allow false',
 			'mkdir -p ' . $u['dir']
 		);