(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index b8989295900976425680bdb6eb0f15e8f202954e..df786274d8ba43324153ef720d0fa730537d7b86 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -8,7 +8,7 @@ define('SITE_PATH', WEBROOT . '/');
 define('FONT_PATH', ROOT . '/fluidbook/fonts/');\r
 define('FTPROOT', '/home/extranet/ftp/');\r
 define('WINDOWS', false);\r
-define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/dev/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF');\r
+define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF');\r
 define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');\r
 define('AS3_SOURCES', '/home/ws/sources/as3');\r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index be5941cf77c8d2c91f006510b15a1ea2b1d24a81..91adcc2ffeb127b7d877e5b4e58d6015bd4cf415 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -991,7 +991,7 @@ class extranetUrl {
                $res .= form::hidden('client', $default_id);\r
                $res .= '<div id="devisAdresseDisplay">';\r
                if ($devis->client_id) {\r
-                       $res .= self::adresse($devis->client_id, null, 'devis', $devis->adresse);\r
+                       $res .= commonUrl::adresse($devis->client_id, null, 'devis', $devis->adresse);\r
                }\r
                $res .= '</div>';\r
                $res .= '</div>';\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 5e52dbc8e3817170bd79e48227e55b52e0bdc84c..cb83d90b4dd51df947cb6bbbec9df46cf8170859 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -97,13 +97,6 @@ class wsDocument extends cubeMetier {
                        mkdir($out, 0777, true);\r
                }\r
 \r
-               /*$pdfextract = new cubeCommandLine('pdfextract');\r
-               $pdfextract->cd($out);\r
-               $pdfextract->setPath(CONVERTER_PATH);\r
-               $pdfextract->setArg(null, $this->cropped);\r
-               $pdfextract->execute();\r
-               $this->addToLog($pdfextract);*/\r
-\r
                $gs = new cubeCommandLine('gs');\r
                $gs->setPath(CONVERTER_PATH);\r
                $gs->cd($out);\r