fix #1622 @1

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 0991b9dc3522b14dfc5e1e4f78a2612d2fb73b2d..c3b347a48d35ae6ff6ead3887b28a18594787ddf 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -600,7 +600,6 @@ class wsDocument extends cubeMetier {
                $pdftocairo->setArg('f', $page);
                $pdftocairo->setArg('l', $page);
                $pdftocairo->setArg(null, '-svg');
-               //$pdftocairo->setArg(null, '-cropbox');
                $pdftocairo->setArg(null, $this->cropped);
                $pdftocairo->setArg(null, $svgFile);
                $pdftocairo->execute();

diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index a19475506ca779edd689345ddc2d9615ba4e7a93..4c55e9bd97584fb856498da4d3b865f0ce562944 100644 (file)
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -146,8 +146,11 @@ class wsTools {
                        filemtime($optimized) < filemtime('/usr/local/bin/svgcleaner') ||
                        filemtime($optimized) < filemtime($original);
 
+
                if ($optimize) {
-                       `/usr/local/bin/svgcleaner $original $optimized --paths-coordinates-precision 3 --copy-on-error`;
+                       $cmd = "/usr/local/bin/svgcleaner --paths-coordinates-precision 3 --copy-on-error $original $optimized";
+                       $res = $cmd . ' : ' . `$cmd`;
+                       return $res;
                }
        }