From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 22 Mar 2018 19:36:38 +0000 (+0000)
Subject: fix #819 @4
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f0a5046f7956f67943095ec46a05a2d9041a471b;p=cubeextranet.git

fix #819 @4
---

diff --git a/fluidbook/compile/_exehtml/exeshortcut/fluidbook.cpp b/fluidbook/compile/_exehtml/exeshortcut/fluidbook.cpp
index 69ffed832..bc7e6805d 100644
--- a/fluidbook/compile/_exehtml/exeshortcut/fluidbook.cpp
+++ b/fluidbook/compile/_exehtml/exeshortcut/fluidbook.cpp
@@ -13,7 +13,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
   // start the program up
   CreateProcess( "$platform\\$exename.exe",   // the path
-    __argv[1],        // Command line
+    NULL,        // Command line
     NULL,           // Process handle not inheritable
     NULL,           // Thread handle not inheritable
     FALSE,          // Set handle inheritance to FALSE
diff --git a/inc/extranet/Metier/class.extranet.document.php b/inc/extranet/Metier/class.extranet.document.php
index 50395f828..f79b3fe9e 100644
--- a/inc/extranet/Metier/class.extranet.document.php
+++ b/inc/extranet/Metier/class.extranet.document.php
@@ -123,7 +123,7 @@ abstract class extranetDocument extends cubeMetier {
 				$this->pdf->setY(25);
 			}
 
-			$y = $this->pdf->getY() + 5;
+			$y = $this->pdf->getY() + 4;
 
 			$this->pdf->SetFont('Klavika', '', 10);
 			// Prix
diff --git a/inc/extranet/Metier/class.extranet.facture.php b/inc/extranet/Metier/class.extranet.facture.php
index 06c2bda87..eb088658b 100644
--- a/inc/extranet/Metier/class.extranet.facture.php
+++ b/inc/extranet/Metier/class.extranet.facture.php
@@ -39,6 +39,4 @@ class extranetFacture extends extranetDocument {
 	protected function isFacture() {
 		return true;
 	}
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 0505a4dbf..95f860a15 100644
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -341,7 +341,7 @@ class wsExporter {
 			$rootURL = 'https://www.fluidbook.com/references/';
 		} else if ($this->action == 'hosting') {
 			$root = '/mnt/sshfs/fluidbook/hosting/';
-			$rootURL = 'http://hosting.fluidbook.com/';
+			$rootURL = 'https://hosting.fluidbook.com/';
 		} else if ($this->action == 'ftp') {
 			$root = 'ftp://';
 			$rootURL = null;
diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index 65327c563..14ada3252 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -36,6 +36,8 @@ class wsPackagerWinEXEHTML extends wsPackager {
 			mkdir($this->buildPath . '/win32/', 0777, true);
 		}
 
+		`rm -rf /home/extranetfiles/tmp/webexectemp/$this->appName.nwf/`;
+
 		$cl = new CubeIT_CommandLine('/usr/local/web2exe/web2exe-linux');
 		$cl->setPath(CONVERTER_PATH);
 		$cl->setEnv('TMPDIR', '/home/extranetfiles/tmp');
@@ -59,47 +61,47 @@ class wsPackagerWinEXEHTML extends wsPackager {
 		$cl->setArg('verbose');
 		$cl->setArg(null, $this->vdir);
 		$cl->execute();
+		$cl->debug();
 
-		$this->compileShortcut();
+		//		$this->compileShortcut();
 
 	}
 
-	function compileShortcut() {
-		$tmp = CubeIT_Files::tmpdir();
-
-		$files = array('fluidbook.cpp', 'fluidbook.rc');
-		$vars = array('icofile' => $this->vdir . '/icon.ico',
-		              'exename' => $this->exeName,
-		              'platform' => $this->nwplatform,
-		              'appversion' => $this->appversion,
-		              'appname' => $this->appName);
-		foreach ($files as $file) {
-			$c = file_get_contents(WS_COMPILE_ASSETS . '/_exehtml/exeshortcut/' . $file);
-			foreach ($vars as $k => $v) {
-				$c = str_replace('$' . $k, $v, $c);
-			}
-			file_put_contents($tmp . '/' . $file, $c);
-		}
-
-		$cl = new CubeIT_CommandLine('i686-w64-mingw32-windres');
-		$cl->setPath(CONVERTER_PATH);
-		$cl->setArg(null, $tmp . '/fluidbook.rc');
-		$cl->setArg('O', 'coff');
-		$cl->setArg('o', $tmp . '/fluidbook.res');
-		$cl->execute();
-		$cl->debug();
-
-		//i686-w64-mingw32-g++ -lmingw32 -o fluidbook.exe /home/extranet/www/fluidbook/compile/_exehtml/fluidbook.cpp
-		$cl = new CubeIT_CommandLine('i686-w64-mingw32-g++');
-		$cl->setPath(CONVERTER_PATH);
-		$cl->setManualArg('-lmingw32');
-		$cl->setManualArg('-mwindows');
-		$cl->setArg('o', $this->buildPath . '/' . $this->exeName . '/' . $this->exeName . '.exe');
-		$cl->setArg(null, $tmp . '/fluidbook.cpp');
-		$cl->setArg(null, $tmp . '/fluidbook.res');
-		$cl->execute();
-		$cl->debug();
-	}
+	//	function compileShortcut() {
+	//		$tmp = CubeIT_Files::tmpdir();
+	//
+	//		$files = array('fluidbook.cpp', 'fluidbook.rc');
+	//		$vars = array('icofile' => $this->vdir . '/icon.ico',
+	//		              'exename' => $this->exeName,
+	//		              'platform' => $this->nwplatform,
+	//		              'appversion' => $this->appversion,
+	//		              'appname' => $this->appName);
+	//		foreach ($files as $file) {
+	//			$c = file_get_contents(WS_COMPILE_ASSETS . '/_exehtml/exeshortcut/' . $file);
+	//			foreach ($vars as $k => $v) {
+	//				$c = str_replace('$' . $k, $v, $c);
+	//			}
+	//			file_put_contents($tmp . '/' . $file, $c);
+	//		}
+	//
+	//		$cl = new CubeIT_CommandLine('i686-w64-mingw32-windres');
+	//		$cl->setPath(CONVERTER_PATH);
+	//		$cl->setArg(null, $tmp . '/fluidbook.rc');
+	//		$cl->setArg('O', 'coff');
+	//		$cl->setArg('o', $tmp . '/fluidbook.res');
+	//		$cl->execute();
+	//		$cl->debug();
+	//
+	//		$cl = new CubeIT_CommandLine('i686-w64-mingw32-g++');
+	//		$cl->setPath(CONVERTER_PATH);
+	//		$cl->setManualArg('-lmingw32');
+	//		$cl->setManualArg('-mwindows');
+	//		$cl->setArg('o', $this->buildPath . '/' . $this->exeName . '/' . $this->exeName . '.exe');
+	//		$cl->setArg(null, $tmp . '/fluidbook.cpp');
+	//		$cl->setArg(null, $tmp . '/fluidbook.res');
+	//		$cl->execute();
+	//		$cl->debug();
+	//	}
 
 	function makeJSON() {
 		$data = ['app_name' => $this->appName, 'main' => 'index.html', 'name' => $this->exeName, 'version' => '1.0.' . time(),
@@ -131,7 +133,7 @@ class wsPackagerWinEXEHTML extends wsPackager {
 	}
 
 	public function getFinalPackageDir() {
-		return $this->buildPath . '/' . $this->exeName . '/';
+		return $this->buildPath . '/' . $this->exeName . '/' . $this->nwplatform;
 	}
 
 	protected function compile() {