wip #1584 @0.5

diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index abf777e9f0081154c10ece030d4b7aeb0da771bd..9a19a5d577305c9161eccfa9d213286668787e63 100644 (file)
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -148,19 +148,22 @@ class wsTools {
 
 
                if ($optimize) {
-                       $cmd = "/usr/local/bin/svgcleaner --paths-coordinates-precision 3 --copy-on-error $original $optimized";
-                       $res = $cmd . ' : ' . `$cmd`;
-                       return $res;
+                       $cmd = "/usr/local/bin/svgcleaner --allow-bigger-file --paths-coordinates-precision 3 --copy-on-error --stdout $original";
+                       $svg = `$cmd`;
+                       $svg = substr_replace($svg, 'preserveAspectRatio="none" ', 5, 0);
+                       file_put_contents($optimized, $svg);
+                       return true;
                }
+               return false;
        }
 
        public static function copy($source, $dest) {
                if (!file_exists($source)) {
                        return;
                }
-               $dir=dirname($dest);
-               if(!file_exists($dir)){
-                       mkdir($dir,0777,true);
+               $dir = dirname($dest);
+               if (!file_exists($dir)) {
+                       mkdir($dir, 0777, true);
                }
                copy($source, $dest);
                touch($dest, filemtime($source));