From 0bbde401efed9d4678ba080bd6f686ed2c3712d4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 4 Mar 2011 18:50:54 +0000
Subject: [PATCH] Fix: view multi page

---
 htdocs/comm/propal/apercu.php    | 2 +-
 htdocs/commande/apercu.php       | 7 +++----
 htdocs/compta/facture/apercu.php | 9 ++++-----
 htdocs/fichinter/apercu.php      | 9 ++++-----
 htdocs/lib/files.lib.php         | 4 +++-
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index d8259edcaea..565e31ce3f7 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -202,7 +202,7 @@ elseif (file_exists($fileimagebis))
 {
 	$multiple = $relativepath . "-";
 
-	for ($i = 0; $i < 20; $i++)
+	for ($i = 0; $i < $ret; $i++)
 	{
 		$preview = $multiple.$i.'.png';
 
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 7fb75545529..e7232249a87 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -114,7 +114,6 @@ if ($id > 0 || ! empty($ref))
 		$relativepathdetail = "${objectref}/${objectref}-detail.pdf";
 
 		// Chemin vers png apercus
-		$relativepathimage = "${objectref}/${objectref}.pdf.png";
 		$fileimage = $file.".png";          // Si PDF 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
 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))
 		{
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 18cbea2db3b..096b83ac2fa 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -128,9 +128,8 @@ if ($id > 0 || ! empty($ref))
         $relativepathdetail = "${objectref}/${objectref}-detail.pdf";
 
         // Chemin vers png apercus
-        $relativepathimage = "${obejctref}/${objectref}.pdf.png";
         $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;
 
@@ -228,11 +227,11 @@ if (file_exists($fileimage))
 // Si fichier png PDF de plus d'1 page trouve
 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))
 		{
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index d59987a57a0..df90be9d4cf 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -87,9 +87,8 @@ if ($id > 0 || ! empty($ref))
 		$relativepathdetail = "${objectref}/${objectref}-detail.pdf";
 		
 		// Chemin vers png apercus
-		$relativepathimage = "${objectref}/${objectref}.pdf.png";
 		$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;
 		
@@ -171,11 +170,11 @@ if (file_exists($fileimage))
 // Si fichier png PDF de plus d'1 page trouve
 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))
 		{
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index d6a47bc4448..5dbaaf8aaa2 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -661,8 +661,10 @@ function dol_convert_file($file,$ext='png')
 		$ret = $image->setImageFormat($ext);
 		if ($ret)
 		{
+			$count = $image->getNumberImages();
 			$ret = $image->writeImages( $file . "." . $ext, true );
-			if (! $ret) return -3;
+			if ($ret) return $count;
+			else return -3;
 		}
 		else
 		{