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

Fix: view multi page

Browse Source
This commit is contained in:
Regis Houssin 2011-03-04 18:50:54 +00:00
parent 90eac50277
commit 0bbde401ef
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/apercu.php
View File

@ -202,7 +202,7 @@ elseif (file_exists($fileimagebis))
{ {
$multiple = $relativepath . "-"; $multiple = $relativepath . "-";
for ($i = 0; $i < 20; $i++) for ($i = 0; $i < $ret; $i++)
{ {
$preview = $multiple.$i.'.png'; $preview = $multiple.$i.'.png';

7
htdocs/commande/apercu.php
View File

@ -114,7 +114,6 @@ if ($id > 0 || ! empty($ref))
$relativepathdetail = "${objectref}/${objectref}-detail.pdf"; $relativepathdetail = "${objectref}/${objectref}-detail.pdf";
// Chemin vers png apercus // Chemin vers png apercus
$relativepathimage = "${objectref}/${objectref}.pdf.png";
$fileimage = $file.".png"; // Si PDF d'1 page $fileimage = $file.".png"; // Si PDF d'1 page
$fileimagebis = $file.".png.0"; // Si PDF de plus d'1 page $fileimagebis = $file.".png.0"; // Si PDF de plus d'1 page
@ -210,11 +209,11 @@ if (file_exists($fileimage))
// Si fichier png PDF de plus d'1 page trouve // Si fichier png PDF de plus d'1 page trouve
elseif (file_exists($fileimagebis)) elseif (file_exists($fileimagebis))
{ {
$multiple = $relativepathimage . "."; $multiple = $relativepath . "-";
for ($i = 0; $i < 20; $i++) for ($i = 0; $i < $ret; $i++)
{ {
$preview = $multiple.$i; $preview = $multiple.$i.'.png';
if (file_exists($dir_output.$preview)) if (file_exists($dir_output.$preview))
{ {

9
htdocs/compta/facture/apercu.php
View File

@ -128,9 +128,8 @@ if ($id > 0 || ! empty($ref))
$relativepathdetail = "${objectref}/${objectref}-detail.pdf"; $relativepathdetail = "${objectref}/${objectref}-detail.pdf";
// Chemin vers png apercus // Chemin vers png apercus
$relativepathimage = "${obejctref}/${objectref}.pdf.png";
$fileimage = $file.".png"; // Si PDF d'1 page $fileimage = $file.".png"; // Si PDF d'1 page
$fileimagebis = $file.".png.0"; // Si PDF de plus d'1 page $fileimagebis = $file."-0.png"; // Si PDF de plus d'1 page
$var=true; $var=true;
@ -228,11 +227,11 @@ if (file_exists($fileimage))
// Si fichier png PDF de plus d'1 page trouve // Si fichier png PDF de plus d'1 page trouve
elseif (file_exists($fileimagebis)) elseif (file_exists($fileimagebis))
{ {
$multiple = $relativepathimage . "."; $multiple = $relativepath . "-";
for ($i = 0; $i < 20; $i++) for ($i = 0; $i < $ret; $i++)
{ {
$preview = $multiple.$i; $preview = $multiple.$i.'.png';
if (file_exists($dir_output.$preview)) if (file_exists($dir_output.$preview))
{ {

9
htdocs/fichinter/apercu.php
View File

@ -87,9 +87,8 @@ if ($id > 0 || ! empty($ref))
$relativepathdetail = "${objectref}/${objectref}-detail.pdf"; $relativepathdetail = "${objectref}/${objectref}-detail.pdf";
// Chemin vers png apercus // Chemin vers png apercus
$relativepathimage = "${objectref}/${objectref}.pdf.png";
$fileimage = $file.".png"; // Si PDF d'1 page $fileimage = $file.".png"; // Si PDF d'1 page
$fileimagebis = $file.".png.0"; // Si PDF de plus d'1 page $fileimagebis = $file."-0.png"; // Si PDF de plus d'1 page
$var=true; $var=true;
@ -171,11 +170,11 @@ if (file_exists($fileimage))
// Si fichier png PDF de plus d'1 page trouve // Si fichier png PDF de plus d'1 page trouve
elseif (file_exists($fileimagebis)) elseif (file_exists($fileimagebis))
{ {
$multiple = $relativepathimage . "."; $multiple = $relativepath . "-";
for ($i = 0; $i < 20; $i++) for ($i = 0; $i < $ret; $i++)
{ {
$preview = $multiple.$i; $preview = $multiple.$i.'.png';
if (file_exists($dir_output.$preview)) if (file_exists($dir_output.$preview))
{ {

4
htdocs/lib/files.lib.php
View File

@ -661,8 +661,10 @@ function dol_convert_file($file,$ext='png')
$ret = $image->setImageFormat($ext); $ret = $image->setImageFormat($ext);
if ($ret) if ($ret)
{ {
$count = $image->getNumberImages();
$ret = $image->writeImages( $file . "." . $ext, true ); $ret = $image->writeImages( $file . "." . $ext, true );
if (! $ret) return -3; if ($ret) return $count;
else return -3;
} }
else else
{ {