From 31b6ec783fb5d2909c5ba418e63126da3b501e19 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 10 Jan 2008 17:35:45 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20On=20ne=20fait=20pas=20syst=E9matiqueme?= =?UTF-8?q?nt=20a=20chaque=20appel=20de=20page=20les=20inclusions=20de=20f?= =?UTF-8?q?pdi=20et=20fpdf=20car=20ces=20inclusions=20consomment=202.5Mo?= =?UTF-8?q?=20de=20m=E9moire=20=E0=20elles=20=E0=20chaque=20appel=20de=20p?= =?UTF-8?q?age=20!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/install/upgrade2.php | 2 -- htdocs/master.inc.php | 13 +++---------- htdocs/telephonie/facturation/emission.php | 1 + .../telephonie/pdf/pdfdetail_standard.modeles.php | 3 +++ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 33d0893a988..90d7a3cacff 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -110,14 +110,12 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade') * Pour utiliser d'autres versions des librairies externes que les * versions embarquees dans Dolibarr, definir les constantes adequates: * Pour FPDF: FPDF_PATH - * Pour Pear: PEAR_PATH * Pour PHP_WriteExcel: PHP_WRITEEXCEL_PATH * Pour MagpieRss: MAGPIERSS_PATH * Pour NuSOAP: NUSOAP_PATH * Pour TCPDF: TCPDF_PATH */ if (! defined('FPDF_PATH')) { define('FPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf/'); } - if (! defined('PEAR_PATH')) { define('PEAR_PATH', DOL_DOCUMENT_ROOT .'/includes/pear/'); } if (! defined('PHP_WRITEEXCEL_PATH')) { define('PHP_WRITEEXCEL_PATH',DOL_DOCUMENT_ROOT .'/includes/php_writeexcel/'); } if (! defined('MAGPIERSS_PATH')) { define('MAGPIERSS_PATH', DOL_DOCUMENT_ROOT .'/includes/magpierss/'); } if (! defined('NUSOAP_PATH')) { define('NUSOAP_PATH', DOL_DOCUMENT_ROOT .'/includes/nusoap/lib/'); } diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 77d56137a44..be546ea04f4 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -113,6 +113,7 @@ if (! file_exists(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php")) require_once(DOL_DOCUMENT_ROOT ."/lib/functions.inc.php"); if (! empty($dolibarr_main_db_encrypted_pass)) $dolibarr_main_db_pass = dolibarr_decode($dolibarr_main_db_encrypted_pass); + require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php"); $conf = new Conf(); @@ -147,7 +148,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"])) } // Chargement des includes principaux de librairies communes -if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user.class.php"); +if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user.class.php"); // Need 500ko memory if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/translate.class.php"); if (! defined('NOREQUIRESOC')) require_once(DOL_DOCUMENT_ROOT ."/societe.class.php"); if (! defined('NOREQUIREDB')) require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); @@ -204,7 +205,6 @@ if (! defined('NOREQUIRETRAN')) * Pour utiliser d'autres versions des librairies externes que les * versions embarquées dans Dolibarr, définir les constantes adequates: * Pour FPDF: FPDF_PATH - * Pour Pear: PEAR_PATH * Pour PHP_WriteExcel: PHP_WRITEEXCEL_PATH * Pour MagpieRss: MAGPIERSS_PATH * Pour PHPlot: PHPLOT_PATH @@ -215,7 +215,6 @@ if (! defined('NOREQUIRETRAN')) // Les path racines if (! defined('FPDF_PATH')) { define('FPDF_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdf/'); } if (! defined('FPDFI_PATH')) { define('FPDFI_PATH', DOL_DOCUMENT_ROOT .'/includes/fpdf/fpdfi/'); } -if (! defined('PEAR_PATH')) { define('PEAR_PATH', DOL_DOCUMENT_ROOT .'/includes/pear/'); } if (! defined('PHP_WRITEEXCEL_PATH')) { define('PHP_WRITEEXCEL_PATH',DOL_DOCUMENT_ROOT .'/includes/php_writeexcel/'); } if (! defined('MAGPIERSS_PATH')) { define('MAGPIERSS_PATH', DOL_DOCUMENT_ROOT .'/includes/magpierss/'); } if (! defined('JPGRAPH_PATH')) { define('JPGRAPH_PATH', DOL_DOCUMENT_ROOT .'/includes/jpgraph/'); } @@ -225,13 +224,7 @@ if (! defined('FPDF_FONTPATH')) { define('FPDF_FONTPATH', FPDF_PATH . if (! defined('MAGPIE_DIR')) { define('MAGPIE_DIR', MAGPIERSS_PATH); } if (! defined('MAGPIE_CACHE_DIR')) { define('MAGPIE_CACHE_DIR', $conf->externalrss->dir_temp); } -// \todo Ajouter la ligne -// require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); -// dans le fichier facturation-emission.php du module telephonie afin de pouvoir supprimer la ligne suivante -if (defined("MAIN_MODULE_TELEPHONIE") && MAIN_MODULE_TELEPHONIE) require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); -// require_once(FPDF_PATH . "fpdf.php"); -// dans le fichier pdfdetail_standard_modeles du module telephonie afin de pouvoir supprimer la ligne suivante -if (defined("MAIN_MODULE_TELEPHONIE") && MAIN_MODULE_TELEPHONIE) require_once(FPDFI_PATH . "fpdi_protection.php"); +//stopwithmem(); /* diff --git a/htdocs/telephonie/facturation/emission.php b/htdocs/telephonie/facturation/emission.php index 367b5435403..2a5b4769590 100644 --- a/htdocs/telephonie/facturation/emission.php +++ b/htdocs/telephonie/facturation/emission.php @@ -21,6 +21,7 @@ */ require("./pre.inc.php"); require_once DOL_DOCUMENT_ROOT.'/telephonie/facturation/FacturationEmission.class.php'; +require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php") if (!$user->rights->telephonie->facture->ecrire) accessforbidden(); diff --git a/htdocs/telephonie/pdf/pdfdetail_standard.modeles.php b/htdocs/telephonie/pdf/pdfdetail_standard.modeles.php index 0f17ff9b221..0068388e06c 100644 --- a/htdocs/telephonie/pdf/pdfdetail_standard.modeles.php +++ b/htdocs/telephonie/pdf/pdfdetail_standard.modeles.php @@ -28,6 +28,9 @@ \version $Revision$ */ +require_once(FPDF_PATH . "fpdf.php"); +require_once(FPDFI_PATH . "fpdi_protection.php"); + class pdfdetail_standard_modeles extends FPDF { var $client_nom;