wip #819 @1.5

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 6742ac0392753b1df7be6048117e9a6f39a0e887..90769cc3fe89e282c9e74c7daad57600dd962a95 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -509,7 +509,6 @@ class commonTools {
                }
 
                $icotool->execute();
-               $png2icns->execute();
 
                rename($tmp . '/ico-16.png', $tmp . '/favicon.png');
 
@@ -541,6 +540,9 @@ class commonTools {
        }
 
        public static function pngToIcns($file, $res) {
+               if(!file_exists($file)){
+                       return;
+               }
                $icns = array(128, 256, 512);
 
                $png2icns = new cubeCommandLine('png2icns');
@@ -550,7 +552,7 @@ class commonTools {
 
                foreach ($icns as $s) {
                        $r = CubeIT_Files::tempnam() . '.png';
-                       $tmp[]=$r;
+                       $tmp[] = $r;
                        $it = new cubeImageTools();
                        $it->loadImage($file);
                        $it->resize($s, $s, 'crop', true, 'C', 'M', 'transparent');
@@ -561,7 +563,6 @@ class commonTools {
                }
 
                $png2icns->execute();
-
                foreach ($tmp as $item) {
                        unlink($tmp);
                }

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 5e40df2bc8357f092204158a5013f1fb4af2c391..65327c563c0ac56b8516b79ef50c90bacf4e529a 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
@@ -61,6 +61,7 @@ class wsPackagerWinEXEHTML extends wsPackager {
                $cl->execute();\r
 \r
                $this->compileShortcut();\r
+\r
        }\r
 \r
        function compileShortcut() {\r