From be081f8485be7bb7164291ff2597a08c41fc0ea9 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 15 Mar 2011 16:40:28 +0000 Subject: [PATCH] --- inc/config.inc.php | 2 +- inc/extranet/Controlleur/class.extranet.url.php | 2 +- inc/ws/Metier/class.ws.document.php | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/inc/config.inc.php b/inc/config.inc.php index b89892959..df786274d 100644 --- a/inc/config.inc.php +++ b/inc/config.inc.php @@ -8,7 +8,7 @@ define('SITE_PATH', WEBROOT . '/'); define('FONT_PATH', ROOT . '/fluidbook/fonts/'); define('FTPROOT', '/home/extranet/ftp/'); define('WINDOWS', false); -define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/dev/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF'); +define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/www/fluidbook/tools:/usr/local/flex:/usr/local/secureSWF'); define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc'); define('AS3_SOURCES', '/home/ws/sources/as3'); diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php index be5941cf7..91adcc2ff 100644 --- 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); $res .= '
'; if ($devis->client_id) { - $res .= self::adresse($devis->client_id, null, 'devis', $devis->adresse); + $res .= commonUrl::adresse($devis->client_id, null, 'devis', $devis->adresse); } $res .= '
'; $res .= ''; diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 5e52dbc8e..cb83d90b4 100644 --- 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); } - /*$pdfextract = new cubeCommandLine('pdfextract'); - $pdfextract->cd($out); - $pdfextract->setPath(CONVERTER_PATH); - $pdfextract->setArg(null, $this->cropped); - $pdfextract->execute(); - $this->addToLog($pdfextract);*/ - $gs = new cubeCommandLine('gs'); $gs->setPath(CONVERTER_PATH); $gs->cd($out); -- 2.39.5