lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Gre cas ou Imagemagick est install dans /usr/local/bin

Browse Source
This commit is contained in:
Laurent Destailleur 2005-02-14 21:08:37 +00:00
parent a15027e9c5
commit b8528b83f8
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
htdocs/dossier/client/fiche.php
View File

@ -1,6 +1,6 @@
<?PHP <?PHP
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -20,6 +20,7 @@
* $Source$ * $Source$
* *
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once DOL_DOCUMENT_ROOT.'/client.class.php'; require_once DOL_DOCUMENT_ROOT.'/client.class.php';
@ -49,34 +50,32 @@ if ($user->societe_id > 0)
if ($_GET["facid"]) if ($_GET["facid"])
{ {
require_once DOL_DOCUMENT_ROOT.'/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/facture.class.php';
$fac = new Facture($db); $fac = new Facture($db);
$fac->fetch($_GET["facid"]); $fac->fetch($_GET["facid"]);
$file = DOL_DATA_ROOT."/facture/".$fac->ref."/".$fac->ref.".pdf"; $file = DOL_DATA_ROOT."/facture/".$fac->ref."/".$fac->ref.".pdf";
$file_img = DOL_DATA_ROOT."/facture/".$fac->ref."/".$fac->ref.".pdf.png"; $file_img = DOL_DATA_ROOT."/facture/".$fac->ref."/".$fac->ref.".pdf.png";
if (file_exists($file_img)) // Si image n'existe pas, on la genere
if (! file_exists($file_img))
{ {
print '<br><img src="./image.php?file='.$file_img.'"></img>'; $converttool="";
if (file_exists("/usr/bin/convert")) $converttool="/usr/bin/convert";
elseif (file_exists("/usr/local/bin/convert")) $converttool="/usr/local/bin/convert";
if ($converttool) {
// Si convert est dispo
//print "x $file_img $converttool $file $file_img x";
exec("$converttool $file $file_img");
}
} }
else
if (file_exists($file_img))
{ {
if ( exec("/usr/bin/convert $file $file_img")) print '<br><img src="./image.php?file='.$file_img.'"></img>';
{
if (file_exists($file_img))
{
print '<br><img src="./image.php?file='.$file_img.'"></img>';
}
}
else
{
print "Erreur ";
}
} }
} }
$db->close(); $db->close();