new FPDF version

lam-packaging/debian/control

@@ -8,7 +8,7 @@ Homepage: http://www.ldap-account-manager.org/
 
 Package: ldap-account-manager
 Architecture: all
-Depends: php5 (>= 5.2.4), php5-ldap, php5-gd, apache2 | httpd, php-fpdf (>= 1.6), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
+Depends: php5 (>= 5.2.4), php5-ldap, php5-gd, apache2 | httpd, php-fpdf (>= 1.7), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
 Suggests: ldap-server, php5-mcrypt, ldap-account-manager-lamdaemon, perl
 Description: webfrontend for managing accounts in an LDAP directory
  LDAP Account Manager (LAM) runs on an existing webserver.

lam/lib/pdf.inc

@@ -54,7 +54,7 @@ $line_width = LAMPDF_LINEWIDTH;
 function createModulePDF($accounts,$pdf_structure="default") {
 	
 	/** PDF generator class */
-	include_once(dirname(__FILE__) . "/fpdf.php");
+	include_once("fpdf.php");
 	/** Unicode support for FPDF */
 	include_once("ufpdf.php");
 	/** LAM PDF generator class */

lam/lib/ufpdf.php

@@ -128,7 +128,7 @@ function Cell($w,$h=0,$txt='',$border=0,$ln=0,$align='J',$fill=0,$link='')
       $this->ws=0;
       $this->_out('0 Tw');
     }
-    $this->AddPage($this->CurOrientation, $this->CurPageFormat);
+    $this->AddPage($this->CurOrientation, $this->CurPageSize);
     $this->x=$x;
     if($ws>0)
     {
@@ -530,13 +530,13 @@ function _putpages()
 	}
 	if($this->DefOrientation=='P')
 	{
-		$wPt=$this->DefPageFormat[0]*$this->k;
-		$hPt=$this->DefPageFormat[1]*$this->k;
+		$wPt=$this->DefPageSize[0]*$this->k;
+		$hPt=$this->DefPageSize[1]*$this->k;
 	}
 	else
 	{
-		$wPt=$this->DefPageFormat[1]*$this->k;
-		$hPt=$this->DefPageFormat[0]*$this->k;
+		$wPt=$this->DefPageSize[1]*$this->k;
+		$hPt=$this->DefPageSize[0]*$this->k;
 	}
 	$filter=($this->compress) ? '/Filter /FlateDecode ' : '';
 	for($n=1;$n<=$nb;$n++)