wait #5304 @0.5

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 2855e6747c281bb4c81e24b87b5838a1200f601c..0d4b9c8929a7f0b1305ab101e3da06fc488cd96e 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -567,7 +567,7 @@ class commonTools
         foreach ($icns as $s) {
             $r = CubeIT_Files::tempnam() . '.png';
             $tmp[] = $r;
-            $it = new cubeImageTools();
+            $it = new CubeIT_Image_Resizer_ImageMagick();
             $it->loadImage($file);
             $it->resize($s, $s, 'crop', true, 'C', 'M', 'transparent');
             $it->output('png', $r);

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 36a5fb3e55754f9060403291df516461c0271f6e..73f62ccb437e578b86e298385377c46cb734e9bc 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
@@ -35,7 +35,9 @@ class wsPackagerWinEXEHTML extends wsPackager
 \r
     protected function preparePackage()\r
     {\r
+\r
         parent::preparePackage();\r
+\r
         $this->copyFluidbookFiles();\r
         $this->makeJSON();\r
 \r
@@ -83,7 +85,7 @@ class wsPackagerWinEXEHTML extends wsPackager
         copy($exe, '/mnt/sshfs/codesign/' . $rand);\r
         $cli = new CubeIT_CommandLine('C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe');\r
         $cli->setManualArg("sign /f C:/Users/vince/Documents/Cubedesigners.cer /csp \"eToken Base Cryptographic Provider\" /k \"[SafeNet Token JC 0{{TYWjZacq%hAH98}}]=54C3F1B91759268A\" /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /a C:/Sign/$rand");\r
-        $cli->execute(new CubeIT_Networking_SSH2('paris.cubedesigners.com','vince','Y@mUC9mY2DOYWXkN','22422'));\r
+        $cli->execute(new CubeIT_Networking_SSH2('paris.cubedesigners.com', 'vince', 'Y@mUC9mY2DOYWXkN', '22422'));\r
         $cli->debug();\r
         sleep(2);\r
         copy('/mnt/sshfs/codesign/' . $rand, $exe);\r
@@ -110,6 +112,7 @@ class wsPackagerWinEXEHTML extends wsPackager
             $data['chromium-args'] = '--crash-dumps-dir=\'' . $datadir . '\' --user-data-dir=\'' . $datadir . '\'';\r
         }\r
 \r
+\r
         $pngIcon = $this->vdir . '/icon.png';\r
         $winIcon = $this->vdir . '/icon.ico';\r
 \r
@@ -128,9 +131,9 @@ class wsPackagerWinEXEHTML extends wsPackager
         $icns = $this->vdir . '/icon.icns';\r
         $this->copy($png, $pngIcon);\r
         $this->copy($ico, $winIcon);\r
-\r
         commonTools::pngToIcns($png, $icns);\r
 \r
+\r
         file_put_contents($this->vdir . '/package.json', json_encode($data));\r
     }\r
 \r
@@ -147,13 +150,14 @@ class wsPackagerWinEXEHTML extends wsPackager
         return $this->buildPath . '/' . $this->exeName . '/' . $this->nwplatform;\r
     }\r
 \r
-    protected function compile()\r
+    protected function compile($forceCompile = false)\r
     {\r
         // For exe version, force to export only the html5 version\r
         // No need to export pages with texts for this version, we are certain that svg is supported if enabled\r
         if ($this->book->parametres->mobileVersion == 'html5-desktop') {\r
             $this->book->parametres->mobileVersion = 'html5';\r
         }\r
+        $this->book->parametres->seoVersion = false;\r
 \r
         $this->daoBook->compile($this->book_id, 'html5', false, $this->book->parametres->forceCompileOnDownload, false, $this->book);\r
     }\r