From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 20 Jun 2013 13:33:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=47bee7da5c569bd0f9a2b66d248f6490478bce1b;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index b3108e808..7660b5005 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -214,12 +214,27 @@ class wsAjax extends cubeAjax {
 		if (!file_exists($dir)) {
 			mkdir($dir, 0777, true);
 		}
-		if (isset($_FILES['apns_dev'])) {
+		$wdir = WS_COLLECTIONS . '/working/' . $_POST['collection_id'];
+		if (!file_exists($wdir)) {
+			mkdir($wdir, 0777, true);
+		}
+
+		if (isset($_FILES['apns_dev']) && !$_FILES['apns_dev']['error']) {
 			move_uploaded_file($_FILES['apns_dev']['tmp_name'], $dir . '/apns_dev.pem');
 		}
-		if (isset($_FILES['apns_prod'])) {
+		if (isset($_FILES['apns_prod']) && $_FILES['apns_prod']['error']) {
 			move_uploaded_file($_FILES['apns_prod']['tmp_name'], $dir . '/apns_prod.pem');
 		}
+		if (isset($_FILES['back']) && !$_FILES['back']['error']) {
+			$ext = CubeIT_Files::getExtension($_FILES['back']['name']);
+			move_uploaded_file($_FILES['back']['tmp_name'], $wdir . '/back.' . $ext);
+			$_POST['theme']['back'] = 'back.' . $ext;
+		}
+		if (isset($_FILES['etagere']) && !$_FILES['etagere']['error']) {
+			$ext = CubeIT_Files::getExtension($_FILES['etagere']['name']);
+			move_uploaded_file($_FILES['etagere']['tmp_name'], $wdir . '/etagere.' . $ext);
+			$_POST['theme']['etagere'] = 'etagere.' . $ext;
+		}
 
 		foreach ($_POST['group'] as $gid => $group) {
 			if ($gid && $gid == 'new_') {
@@ -313,126 +328,6 @@ class wsAjax extends cubeAjax {
 		$exporter->export($book_id, $x, 'download', $version);
 	}
 
-	public static function instbook($args, &$x) {
-		global $core;
-		$book_id = $args[1];
-		$server = $args[2];
-
-		$dao = new wsDAOBook($core->con);
-		$book = $dao->selectById($book_id);
-
-		if (!in_array($book->proprietaire_id, explode(',', $core->user->ws_rights))) {
-			commonDroits::error();
-		}
-		if (!isset($_POST['dir'])) {
-			$popup = commonAjax::form('instbook/' . $book_id . '/' . $server, __('Installation de la publication'), wsUrl::formInstall($book, $server), __('Installer'), 2, '', '', true);
-			$x->addOpenPopup($popup);
-			return;
-		}
-		$version = 'html';
-		if ($book->parametres->version == 1) {
-			$version = 'v1';
-		}
-		if (stristr($server, 'phonegap')) {
-			if (stristr($server, 'ios')) {
-				$os = 'ios';
-			} elseif (stristr($server, 'android')) {
-				$os = 'android';
-			}
-			$packager = new wsPackagerPhonegap($book_id, null, true, false, $os);
-			$package = $packager->makePackage(false);
-		} else {
-			$package = wsPackager::package($book_id, $version, false);
-		}
-
-		if ($server == 'references') {
-			$root = '/home/fluidbook/www/references';
-			$url = 'http://www.fluidbook.com/references/';
-			$protocol = 'rsync';
-		} else if ($server == 'hosting') {
-			$root = '/home/fluidbook/hosting';
-			$url = 'http://hosting.fluidbook.com/';
-			$protocol = 'rsync';
-		} else if ($server == 'macbook_phonegap_ios') {
-			$root = '/mnt/macbook/Phonegap/Projects/';
-			$url = null;
-			$protocol = 'rsync';
-		} else if ($server == 'external') {
-			$protocol = 'ftp';
-			$root = 'ftp://';
-			$passive = 'on';
-			$url = null;
-		} else if ($server == 'phonegap_android') {
-			$protocol = 'ftp';
-			$root = 'ftp://android:DlSa1LGw@paris.cubedesigners.com:22122/';
-			$passive = 'off';
-			$url = null;
-		}
-
-		if ($protocol == 'rsync') {
-			$e = explode('/', $_POST['dir']);
-			$f = array();
-			foreach ($e as $d) {
-				if ($d == '..' || $d == '') {
-					continue;
-				}
-				$f[] = cubeText::str2URL($d);
-			}
-			$dir = implode('/', $f);
-		} else {
-			$dir = $_POST['dir'];
-		}
-
-		$dao->setInstallDir($book_id, $dir, $server);
-
-		if ($protocol == 'rsync') {
-
-			$finalDir = $root . '/' . $dir;
-			if (!file_exists($finalDir)) {
-				mkdir($finalDir, 0777, true);
-			}
-
-			/**  --del -r -z -v * */
-			$cp = new cubeCommandLine('rsync');
-			$cp->setPath(CONVERTER_PATH);
-			//$cp->setArg('del');
-			$cp->setArg('t');
-			$cp->setArg('r');
-			$cp->setArg('z');
-			$cp->setArg('v');
-			$cp->setArg(null, $package . '*');
-			$cp->setArg(null, $finalDir);
-			$cp->execute();
-		} elseif ($protocol == 'ftp') {
-
-			$u = parse_url($root . ltrim($dir, '/'));
-			if (!isset($u['port'])) {
-				$u['port'] = '21';
-			}
-
-			$commandes = array(
-				'set ftp:passive-mode ' . $passive,
-				'mkdir -p ' . $u['path'],
-				'cd ' . $u['path'],
-				'lcd ' . $package,
-				//'mirror -Rve --parallel=5'
-				'mirror -Rv --parallel=5'
-			);
-
-			$lftp = new cubeCommandLine('lftp');
-			$lftp->setArg('u', $u['user'] . ',' . $u['pass']);
-			$lftp->setArg('p', $u['port']);
-			$lftp->setArg('e', implode(';', $commandes));
-			$lftp->setArg(null, $u['host']);
-			$lftp->execute();
-		}
-
-		$x->addClosePopup();
-		if (!is_null($url)) {
-			$x->addTruePopup($url . $dir . '/');
-		}
-	}
-
 	public static function statusBook($args, &$x) {
 		global $core;