wip #4706 @2

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 5768436fc0c33ea7581a61f8b999112ede8419ae..b4d2399ab2f88651cc872d0a816fa61a12de9313 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -911,7 +911,7 @@ class wsMaintenance
         header('Content-type: image/svg+xml');
         $svg = wsDocument::getDir($p['document_id']) . '/html/p' . $p['document_page'] . '.svg';
 
-        $pdftocairo = new cubeCommandLine('pdftocairo');
+        $pdftocairo = new cubeCommandLine(wsPDFConvert::PDFTOCAIRO);
         $pdftocairo->setPath(CONVERTER_PATH);
         $pdftocairo->setArg('f', $p['document_page']);
         $pdftocairo->setArg('l', $p['document_page']);

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index edb722f732174dfb4b73fd5f4f317e6165f6152f..e50ef3b0720e5d06329dddcea4c655f5c7f2a07c 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -132,7 +132,7 @@ class wsDocument extends cubeMetier
         $this->addToLog($pdftk);
 
         if (!file_exists($this->fixed)) {
-            $pdftocairo = new cubeCommandLine('pdftocairo');
+            $pdftocairo = new cubeCommandLine(wsPDFConvert::PDFTOCAIRO);
             $pdftocairo->setPath(CONVERTER_PATH);
             $pdftocairo->setArg(null, '-pdf');
             $pdftocairo->setArg(null, $this->in);

diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php
index 92baefa35c157ffb030899309db52d94a43a68e2..ebac91d44b45e4bc783595aa059b44a95a5f2894 100644 (file)
--- a/inc/ws/Util/class.ws.pdf.convert.php
+++ b/inc/ws/Util/class.ws.pdf.convert.php
@@ -8,6 +8,8 @@
  */\r
 class wsPDFConvert\r
 {\r
+    const PDFTOCAIRO = '/usr/bin/pdftocairo';\r
+    const PDFTOPPM = '/usr/bin/pdftoppm';\r
 \r
     public static function makeMiniShot($in, $out, $page, $format = 'jpg')\r
     {\r
@@ -103,7 +105,7 @@ class wsPDFConvert
 //            return;\r
 //        }\r
 \r
-        $pdftocairo = new CubeIT_CommandLine('pdftocairo');\r
+        $pdftocairo = new CubeIT_CommandLine(self::PDFTOCAIRO);\r
         $pdftocairo->setPath(CONVERTER_PATH);\r
         $pdftocairo->setArg('f', $page);\r
         $pdftocairo->setArg('l', $page);\r
@@ -227,7 +229,7 @@ class wsPDFConvert
         $antialiasing = $antialiasing ? 'yes' : 'no';\r
         $freetype = $texts ? 'yes' : 'no';\r
         // Exporte les fichiers\r
-        $pdftoppm = new CubeIT_CommandLine('pdftoppm', null, true);\r
+        $pdftoppm = new CubeIT_CommandLine(self::PDFTOPPM, null, true);\r
         $pdftoppm->setPath(CONVERTER_PATH);\r
 \r
         $pdftoppm->setArg('f', $page);\r