fix #819 @4

diff --git a/fluidbook/compile/_exehtml/exeshortcut/fluidbook.cpp b/fluidbook/compile/_exehtml/exeshortcut/fluidbook.cpp
index 69ffed83293f4f2d04db5d7ca601f733c18f5ea7..bc7e6805d3345bf523f9de95edd7360bc3638c2a 100644 (file)
--- 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,
 \r
   // start the program up\r
   CreateProcess( "$platform\\$exename.exe",   // the path\r
-    __argv[1],        // Command line\r
+    NULL,        // Command line\r
     NULL,           // Process handle not inheritable\r
     NULL,           // Thread handle not inheritable\r
     FALSE,          // Set handle inheritance to FALSE\r

diff --git a/inc/extranet/Metier/class.extranet.document.php b/inc/extranet/Metier/class.extranet.document.php
index 50395f8287178d72f880617d0e07e3be2bac7475..f79b3fe9e45ca514e0fa33d4bf868cc97297f0c7 100644 (file)
--- 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);\r
                        }\r
 \r
-                       $y = $this->pdf->getY() + 5;\r
+                       $y = $this->pdf->getY() + 4;\r
 \r
                        $this->pdf->SetFont('Klavika', '', 10);\r
                        // Prix\r

diff --git a/inc/extranet/Metier/class.extranet.facture.php b/inc/extranet/Metier/class.extranet.facture.php
index 06c2bda878d0582533b009630846967036cd0a19..eb088658bfb62ddda5411c0777b1021f9de05643 100644 (file)
--- 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() {\r
                return true;\r
        }\r
-}\r
-\r
-?>
\ 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 0505a4dbf472f3f55bc4dde23d0c766318c776b6..95f860a15abc32c9271cd702ace2f6aced1d7977 100644 (file)
--- 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 65327c563c0ac56b8516b79ef50c90bacf4e529a..14ada3252404224d4d6d76c64cf4ed6bed9b6af4 100644 (file)
--- 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);\r
                }\r
 \r
+               `rm -rf /home/extranetfiles/tmp/webexectemp/$this->appName.nwf/`;\r
+\r
                $cl = new CubeIT_CommandLine('/usr/local/web2exe/web2exe-linux');\r
                $cl->setPath(CONVERTER_PATH);\r
                $cl->setEnv('TMPDIR', '/home/extranetfiles/tmp');\r
@@ -59,47 +61,47 @@ class wsPackagerWinEXEHTML extends wsPackager {
                $cl->setArg('verbose');\r
                $cl->setArg(null, $this->vdir);\r
                $cl->execute();\r
+               $cl->debug();\r
 \r
-               $this->compileShortcut();\r
+               //              $this->compileShortcut();\r
 \r
        }\r
 \r
-       function compileShortcut() {\r
-               $tmp = CubeIT_Files::tmpdir();\r
-\r
-               $files = array('fluidbook.cpp', 'fluidbook.rc');\r
-               $vars = array('icofile' => $this->vdir . '/icon.ico',\r
-                             'exename' => $this->exeName,\r
-                             'platform' => $this->nwplatform,\r
-                             'appversion' => $this->appversion,\r
-                             'appname' => $this->appName);\r
-               foreach ($files as $file) {\r
-                       $c = file_get_contents(WS_COMPILE_ASSETS . '/_exehtml/exeshortcut/' . $file);\r
-                       foreach ($vars as $k => $v) {\r
-                               $c = str_replace('$' . $k, $v, $c);\r
-                       }\r
-                       file_put_contents($tmp . '/' . $file, $c);\r
-               }\r
-\r
-               $cl = new CubeIT_CommandLine('i686-w64-mingw32-windres');\r
-               $cl->setPath(CONVERTER_PATH);\r
-               $cl->setArg(null, $tmp . '/fluidbook.rc');\r
-               $cl->setArg('O', 'coff');\r
-               $cl->setArg('o', $tmp . '/fluidbook.res');\r
-               $cl->execute();\r
-               $cl->debug();\r
-\r
-               //i686-w64-mingw32-g++ -lmingw32 -o fluidbook.exe /home/extranet/www/fluidbook/compile/_exehtml/fluidbook.cpp\r
-               $cl = new CubeIT_CommandLine('i686-w64-mingw32-g++');\r
-               $cl->setPath(CONVERTER_PATH);\r
-               $cl->setManualArg('-lmingw32');\r
-               $cl->setManualArg('-mwindows');\r
-               $cl->setArg('o', $this->buildPath . '/' . $this->exeName . '/' . $this->exeName . '.exe');\r
-               $cl->setArg(null, $tmp . '/fluidbook.cpp');\r
-               $cl->setArg(null, $tmp . '/fluidbook.res');\r
-               $cl->execute();\r
-               $cl->debug();\r
-       }\r
+       //      function compileShortcut() {\r
+       //              $tmp = CubeIT_Files::tmpdir();\r
+       //\r
+       //              $files = array('fluidbook.cpp', 'fluidbook.rc');\r
+       //              $vars = array('icofile' => $this->vdir . '/icon.ico',\r
+       //                            'exename' => $this->exeName,\r
+       //                            'platform' => $this->nwplatform,\r
+       //                            'appversion' => $this->appversion,\r
+       //                            'appname' => $this->appName);\r
+       //              foreach ($files as $file) {\r
+       //                      $c = file_get_contents(WS_COMPILE_ASSETS . '/_exehtml/exeshortcut/' . $file);\r
+       //                      foreach ($vars as $k => $v) {\r
+       //                              $c = str_replace('$' . $k, $v, $c);\r
+       //                      }\r
+       //                      file_put_contents($tmp . '/' . $file, $c);\r
+       //              }\r
+       //\r
+       //              $cl = new CubeIT_CommandLine('i686-w64-mingw32-windres');\r
+       //              $cl->setPath(CONVERTER_PATH);\r
+       //              $cl->setArg(null, $tmp . '/fluidbook.rc');\r
+       //              $cl->setArg('O', 'coff');\r
+       //              $cl->setArg('o', $tmp . '/fluidbook.res');\r
+       //              $cl->execute();\r
+       //              $cl->debug();\r
+       //\r
+       //              $cl = new CubeIT_CommandLine('i686-w64-mingw32-g++');\r
+       //              $cl->setPath(CONVERTER_PATH);\r
+       //              $cl->setManualArg('-lmingw32');\r
+       //              $cl->setManualArg('-mwindows');\r
+       //              $cl->setArg('o', $this->buildPath . '/' . $this->exeName . '/' . $this->exeName . '.exe');\r
+       //              $cl->setArg(null, $tmp . '/fluidbook.cpp');\r
+       //              $cl->setArg(null, $tmp . '/fluidbook.res');\r
+       //              $cl->execute();\r
+       //              $cl->debug();\r
+       //      }\r
 \r
        function makeJSON() {\r
                $data = ['app_name' => $this->appName, 'main' => 'index.html', 'name' => $this->exeName, 'version' => '1.0.' . time(),\r
@@ -131,7 +133,7 @@ class wsPackagerWinEXEHTML extends wsPackager {
        }\r
 \r
        public function getFinalPackageDir() {\r
-               return $this->buildPath . '/' . $this->exeName . '/';\r
+               return $this->buildPath . '/' . $this->exeName . '/' . $this->nwplatform;\r
        }\r
 \r
        protected function compile() {\r