WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ship with patched version of fpdf

This commit is contained in:
Roland Gruber 2016-05-10 18:37:01 +02:00
parent c4075de648
commit 06e716139a
7 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam-packaging/debian/control
View File

@ -8,7 +8,7 @@ Homepage: https://www.ldap-account-manager.org/
Package: ldap-account-manager Package: ldap-account-manager
Architecture: all Architecture: all
Depends: php5 (>= 5.4.26) | php (>= 21), php5-ldap | php-ldap, php5-gd | php-gd, php5-json | php-json , php5-imagick | php-imagick, apache2 | httpd, php-fpdf (>= 1.7), debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends} Depends: php5 (>= 5.4.26) | php (>= 21), php5-ldap | php-ldap, php5-gd | php-gd, php5-json | php-json , php5-imagick | php-imagick, apache2 | httpd, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
Recommends: php-apc Recommends: php-apc
Suggests: ldap-server, php5-mcrypt, ldap-account-manager-lamdaemon, perl Suggests: ldap-server, php5-mcrypt, ldap-account-manager-lamdaemon, perl
Description: webfrontend for managing accounts in an LDAP directory Description: webfrontend for managing accounts in an LDAP directory

2
lam-packaging/debian/copyright
View File

@ -173,7 +173,7 @@ D:
Programs and licenses with other licenses and/or authors than the Programs and licenses with other licenses and/or authors than the
main license and authors: main license and authors:
lib/fpdf.php A 2008 Olivier Plathey lib/fpdf-lam.inc A 2008 Olivier Plathey
lib/font/Vera* B 2003 Bitstream, Inc. lib/font/Vera* B 2003 Bitstream, Inc.
templates/lib/*wz_tooltip.js C Walter Zorn templates/lib/*wz_tooltip.js C Walter Zorn
lib/3rdParty/phpseclib D Jim Wigginton lib/3rdParty/phpseclib D Jim Wigginton

2
lam-packaging/debian/postinst
View File

@ -24,8 +24,6 @@ files=`ls -a *.jpg`
for file in $files; do for file in $files; do
cp $file /var/lib/ldap-account-manager/config/templates/pdf/logos/$file cp $file /var/lib/ldap-account-manager/config/templates/pdf/logos/$file
done done
if [ ! -h /usr/share/ldap-account-manager/lib/fpdf.php ]; then\
ln -s /usr/share/fpdf/fpdf.php /usr/share/ldap-account-manager/lib/fpdf.php; fi
if [ ! -h /usr/share/ldap-account-manager/config ]; then\ if [ ! -h /usr/share/ldap-account-manager/config ]; then\
ln -s /var/lib/ldap-account-manager/config /usr/share/ldap-account-manager/config; fi ln -s /var/lib/ldap-account-manager/config /usr/share/ldap-account-manager/config; fi
if [ ! -h /usr/share/ldap-account-manager/sess ]; then\ if [ ! -h /usr/share/ldap-account-manager/sess ]; then\

1
lam-packaging/debian/postrm
View File

@ -6,7 +6,6 @@ if [ -f /usr/share/debconf/confmodule ]; then
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
db_version 2.0 || [ $? -lt 30 ] db_version 2.0 || [ $? -lt 30 ]
rm -f /usr/share/ldap-account-manager/lib/fpdf.php
rm -f /usr/share/ldap-account-manager/sess rm -f /usr/share/ldap-account-manager/sess
rm -f /usr/share/ldap-account-manager/tmp rm -f /usr/share/ldap-account-manager/tmp
rm -f /usr/share/ldap-account-manager/config rm -f /usr/share/ldap-account-manager/config

2
lam/copyright
View File

@ -178,7 +178,7 @@ D:
Programs and licenses with other licenses and/or authors than the Programs and licenses with other licenses and/or authors than the
main license and authors: main license and authors:
lib/fpdf.php A 2008 Olivier Plathey lib/fpdf-lam.inc A 2008 Olivier Plathey
lib/font/Vera* B 2003 Bitstream, Inc. lib/font/Vera* B 2003 Bitstream, Inc.
templates/lib/*wz_tooltip.js C Walter Zorn templates/lib/*wz_tooltip.js C Walter Zorn
lib/3rdParty/phpseclib D Jim Wigginton lib/3rdParty/phpseclib D Jim Wigginton

1
lam/lib/fpdf.php → lam/lib/fpdf-lam.inc
View File

@ -5,6 +5,7 @@
* Version: 1.7 * * Version: 1.7 *
* Date: 2011-06-18 * * Date: 2011-06-18 *
* Author: Olivier PLATHEY * * Author: Olivier PLATHEY *
* Patched for LAM: PHP 7 support, ufpdf compatibility *
*******************************************************************************/ *******************************************************************************/
define('FPDF_VERSION','1.7'); define('FPDF_VERSION','1.7');

2
lam/lib/pdf.inc
View File

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