From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 17 Jan 2018 13:16:34 +0000 (+0000)
Subject: wip #1584 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=450cbc648ad6dec3e6bbfaf181ba90896ed73525;p=cubeextranet.git

wip #1584 @0.5
---

diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index abf777e9f..9a19a5d57 100644
--- 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));