From de1e127d489f9cdcf8bbf485e6ce91a87a164411 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 10 Aug 2011 23:31:05 +0000
Subject: [PATCH] Removed deprecated files FPDF.

---
 COPYRIGHT                              | 2 --
 scripts/invoices/rebuild_merge_pdf.php | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 05d6c08e753..8ee2343645a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -16,7 +16,6 @@ ArtiChow          1.07     Public Domain               Yes              Graphics
 CKEditor		  3.6.1	   GPL or LGPL 2.1 or MPL 1.1  Yes				Editor WYSIWYG
 EFC/XFSS		  1.0.1	   LGPL 3.0					   Yes				Enhanced File Crypt/Extended File Stealth System
 FCKEditor         2.6.6    LGPL 2.1 or Mozilla PL 1.0  Yes              Editor WYSIWYG
-FPDF              1.6      Public domain               Yes              PDF generation (original code is modified)
 FPDF_TPL          1.1.5    Apache Software License 2.0 No GPL3 only     PDF templates management
 FPDI              1.3.4    Apache Software License 2.0 No GPL3 only     PDF templates management
 FPDI_Protection   1.0.3    Apache Software License 2.0 No GPL3 only     PDF encryption (8 files)
@@ -38,7 +37,6 @@ Php-barcode       0.3pl1   GPL 2.0                     Yes              Bar code
 PHP_WriteExcel    0.3.0    LGPL 2.1                    Yes              Excel files generation (obsolete)
 PHP_ExcelReader   2.21     MIT License                 Yes              Parse and retrieve information from XLS files (obsolete)
 PHPExcel		  1.7.6    LGPL 2.1                    Yes              Read/Write XLS files, read ODS files
-Smarty            2.6.26   LGPL 2.1                    Yes              Templates engine used by some pages
 SMTPs             1.15     GPL                         Yes              SMTPS library
 TCPDF             5.9.098  LGPL 3.0                    Yes				PDF generation
 VCard             2.0      GPL 2.0                     Yes              VCard library
diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php
index 83a4df58e90..de043e7f08e 100644
--- a/scripts/invoices/rebuild_merge_pdf.php
+++ b/scripts/invoices/rebuild_merge_pdf.php
@@ -21,7 +21,7 @@
  *      \file       scripts/invoices/rebuild_merge_pdf.php
  *      \ingroup    facture
  *      \brief      Script to rebuild PDF and merge PDF files into one
- *		\version	$Id: rebuild_merge_pdf.php,v 1.21 2011/07/31 22:22:11 eldy Exp $
+ *		\version	$Id: rebuild_merge_pdf.php,v 1.22 2011/08/10 23:31:05 eldy Exp $
  */
 
 $sapi_type = php_sapi_name();
@@ -37,10 +37,10 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 // Include Dolibarr environment
 require_once($path."../../htdocs/master.inc.php");
 // After this $db is an opened handler to database. We close it at end of file.
+require_once(FPDFI_PATH.'fpdi_protection.php');
 require_once(DOL_DOCUMENT_ROOT."/cron/functions_cron.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
-require_once(DOL_DOCUMENT_ROOT."/includes/fpdf/fpdfi/fpdi.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 
 
@@ -48,7 +48,7 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 $langs->load("main");
 
 // Global variables
-$version='$Revision: 1.21 $';
+$version='$Revision: 1.22 $';
 $error=0;