From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 9 Oct 2013 14:07:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=78563585ed60ff1a56a458d90b93ee0be4e62b0b;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 0709e3bf8..faa3ccbec 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -876,7 +876,6 @@ class wsAjax extends cubeAjax {
 	}
 
 	public static function exportbookExe($args, &$x) {
-		fb($_POST);
 
 		$dest = array('dir' => null, 'file' => null);
 		if (isset($_POST['destination']) && is_array($_POST['destination'])) {
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index e380b5b67..f8f77b092 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -388,7 +388,9 @@ class wsExporter {
 	}
 
 	protected function _download() {
-		$this->x->addRedirection(wsPackager::package($this->book_id, $this->version));
+		$r = wsPackager::package($this->book_id, $this->version);
+		fb($r);
+		$this->x->addRedirection($r);
 	}
 
 	protected function _getVersion($version) {
@@ -429,5 +431,4 @@ class wsExporter {
 	}
 
 }
-
 ?>
diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.php b/inc/ws/Util/packager/class.ws.packager.win.inst.php
index b909d74a8..1a5d7976a 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -51,17 +51,17 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 
 	public function makePackage($zip) {
 		$this->preparePackage();
-		if (SERVER == 'dictator') {
-			$url = 'http://installer.fluidbook.com/make.php?nsi=' . base64_encode($this->nsi) . '&junk=' . TIME;
-			file_get_contents($url);
-		} else {
-			$tmp=cubeFiles::tempnam();
-			file_put_contents($tmp, $this->nsi);
-			$makensis=new cubeCommandLine('makensis');
-			$makensis->setArg(null,$tmp);
-			$makensis->execute();
-			unlink($tmp);
-		}
+
+		$tmp = cubeFiles::tempnam();
+		file_put_contents($tmp, $this->nsi);
+		$makensis = new cubeCommandLine('makensis');
+		$makensis->setArg(null, $tmp);
+		$makensis->execute();
+
+		fb($this->nsi);
+		fb($makensis->command);
+		fb($makensis->output);
+		unlink($tmp);
 
 
 		return $this->getURLBase('exe');