diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 4834416ffbb..1522b0977ec 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; $langs->load("admin"); +$langs->load("boxes"); if (! $user->admin) accessforbidden(); @@ -344,7 +345,7 @@ foreach($boxtoadd as $box) print '
'; print ''; print ''; - print ''.img_object("",$logo).' '.$box->boxlabel.''; + print ''.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel).''; print ''; if ($box->note == '(WarningUsingThisBoxSlowDown)') { @@ -403,7 +404,7 @@ foreach($boxactivated as $key => $box) print "\n".''."\n"; print ''; - print ''.img_object("",$logo).' '.$box->boxlabel.''; + print ''.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel).''; print ''; if ($box->note == '(WarningUsingThisBoxSlowDown)') { diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 1a0709a6962..0a1cc56212c 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -32,7 +32,7 @@ class box_actions extends ModeleBoxes { var $boxcode="lastactions"; var $boximg="object_action"; - var $boxlabel; + var $boxlabel="BoxLastActions"; var $depends = array("agenda"); var $db; @@ -42,17 +42,6 @@ class box_actions extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastActions"); - } - /** * Load data for box to show them later * diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index 834799878d2..41c3f2b9caa 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -31,7 +31,7 @@ class box_activity extends ModeleBoxes { var $boxcode="activity"; var $boximg="object_bill"; - var $boxlabel; + var $boxlabel='BoxGlobalActivity'; var $depends = array("facture"); var $db; @@ -44,17 +44,10 @@ class box_activity extends ModeleBoxes /** * Constructor */ - function __construct() + function __construct($db) { - global $langs,$conf; - - $langs->load("boxes"); - $langs->load("bills"); - $langs->load("projects"); - $langs->load("orders"); - - $this->boxlabel = $langs->transnoentitiesnoconv("BoxGlobalActivity"); - + $this->db = $db; + $this->enabled = 1; // FIXME: Use a cache to save data because this slow down too much main home page. This box slow down too seriously software. // FIXME: Removed number_format (not compatible with all languages) diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php index a341b9d5b76..130bc8661c2 100644 --- a/htdocs/core/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -29,7 +29,7 @@ class box_bookmarks extends ModeleBoxes { var $boxcode="bookmarks"; var $boximg="object_bookmark"; - var $boxlabel; + var $boxlabel="BoxMyLastBookmarks"; var $depends = array("bookmark"); var $db; @@ -38,16 +38,6 @@ class box_bookmarks extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxMyLastBookmarks"); - } /** * Load data for box to show them later diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index e30523660f3..53ca9f9f8c5 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -33,7 +33,7 @@ class box_clients extends ModeleBoxes { var $boxcode="lastcustomers"; var $boximg="object_company"; - var $boxlabel; + var $boxlabel="BoxLastCustomers"; var $depends = array("societe"); var $db; @@ -42,16 +42,6 @@ class box_clients extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastCustomers"); - } /** * Load data for box to show them later diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index b0449bdb6b0..c180a8250fa 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -33,7 +33,7 @@ class box_commandes extends ModeleBoxes { var $boxcode="lastcustomerorders"; var $boximg="object_order"; - var $boxlabel; + var $boxlabel="BoxLastCustomerOrders"; var $depends = array("commande"); var $db; @@ -42,16 +42,6 @@ class box_commandes extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastCustomerOrders"); - } /** * Load data for box to show them later diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index f2d96ad1e51..fd3876872a8 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -33,7 +33,7 @@ class box_comptes extends ModeleBoxes { var $boxcode="currentaccounts"; var $boximg="object_bill"; - var $boxlabel; + var $boxlabel="BoxCurrentAccounts"; var $depends = array("banque"); // Box active if module banque active var $db; @@ -47,12 +47,11 @@ class box_comptes extends ModeleBoxes /** * Constructor */ - function __construct() + function __construct($db) { - global $conf, $langs, $user; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv('BoxCurrentAccounts'); + global $conf, $user; + + $this->db = $db; // disable module for such cases $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index 4d237051672..cee28d7211a 100755 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -34,7 +34,7 @@ class box_contacts extends ModeleBoxes { var $boxcode="lastcontacts"; var $boximg="object_contact"; - var $boxlabel; + var $boxlabel="BoxLastContacts"; var $depends = array("societe"); var $db; @@ -43,16 +43,6 @@ class box_contacts extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastContacts"); - } /** * Load data into info_box_contents array to show array later. diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index ec8f158dcc6..6eeb34ea17f 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -31,7 +31,7 @@ class box_contracts extends ModeleBoxes { var $boxcode="lastcontracts"; var $boximg="object_contract"; - var $boxlabel; + var $boxlabel="BoxLastContracts"; var $depends = array("contrat"); // conf->contrat->enabled var $db; @@ -41,18 +41,6 @@ class box_contracts extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastContracts"); - } - /** * Load data for box to show them later * diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php index cf10d6e1c5d..cc108d21206 100644 --- a/htdocs/core/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -35,7 +35,7 @@ class box_external_rss extends ModeleBoxes { var $boxcode="lastrssinfos"; var $boximg="object_rss"; - var $boxlabel; + var $boxlabel="BoxLastRssInfos"; var $depends = array("externalrss"); var $db; @@ -52,13 +52,8 @@ class box_external_rss extends ModeleBoxes */ function __construct($db,$param) { - global $langs; - $langs->load("boxes"); - $this->db=$db; $this->param=$param; - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastRssInfos"); } /** diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index 729d62ec571..e75f9137b11 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -32,7 +32,7 @@ class box_factures extends ModeleBoxes { var $boxcode="lastcustomerbills"; var $boximg="object_bill"; - var $boxlabel; + var $boxlabel="BoxLastCustomerBills"; var $depends = array("facture"); var $db; @@ -41,16 +41,6 @@ class box_factures extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastCustomerBills"); - } /** * Load data into info_box_contents array to show array later. diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 7d8d6e6add9..3e1298dc957 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -32,7 +32,7 @@ class box_factures_fourn extends ModeleBoxes { var $boxcode="lastsupplierbills"; var $boximg="object_bill"; - var $boxlabel; + var $boxlabel="BoxLastSupplierBills"; var $depends = array("facture","fournisseur"); var $db; @@ -41,16 +41,6 @@ class box_factures_fourn extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastSupplierBills"); - } /** * Load data into info_box_contents array to show array later. diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index cb6ffba0d3e..6ab1aa5b74a 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -31,7 +31,7 @@ class box_factures_fourn_imp extends ModeleBoxes { var $boxcode="oldestunpaidsupplierbills"; var $boximg="object_bill"; - var $boxlabel; + var $boxlabel="BoxOldestUnpaidSupplierBills"; var $depends = array("facture","fournisseur"); var $db; @@ -41,17 +41,6 @@ class box_factures_fourn_imp extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxOldestUnpaidSupplierBills"); - } - /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 52033df850a..d909936d71a 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -34,7 +34,7 @@ class box_factures_imp extends ModeleBoxes { var $boxcode="oldestunpaidcustomerbills"; var $boximg="object_bill"; - var $boxlabel; + var $boxlabel="BoxOldestUnpaidCustomerBills"; var $depends = array("facture"); var $db; @@ -44,17 +44,6 @@ class box_factures_imp extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxOldestUnpaidCustomerBills"); - } - /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index e54a0b5c214..3e12e08cfb0 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -32,7 +32,7 @@ class box_fournisseurs extends ModeleBoxes { var $boxcode="lastsuppliers"; var $boximg="object_company"; - var $boxlabel; + var $boxlabel="BoxLastSuppliers"; var $depends = array("fournisseur"); var $db; @@ -41,16 +41,6 @@ class box_fournisseurs extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastSuppliers"); - } /** * Load data into info_box_contents array to show array later. diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index 5c9e3a6f3ab..4495cd3cbb6 100755 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -33,7 +33,7 @@ class box_members extends ModeleBoxes { var $boxcode="lastmembers"; var $boximg="object_user"; - var $boxlabel; + var $boxlabel="BoxLastMembers"; var $depends = array("adherent"); var $db; @@ -47,12 +47,11 @@ class box_members extends ModeleBoxes /** * Constructor */ - function __construct() + function __construct($db) { - global $conf, $langs, $user; - $langs->load("boxes"); + global $conf, $user; - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastMembers"); + $this->db = $db; // disable module for such cases $listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL); diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php index aaaf232dfe9..b0eda584d22 100644 --- a/htdocs/core/boxes/box_osc_client.php +++ b/htdocs/core/boxes/box_osc_client.php @@ -32,7 +32,7 @@ class box_osc_clients extends ModeleBoxes { var $boxcode="nbofcustomers"; var $boximg="object_company"; - var $boxlabel; + var $boxlabel="BoxNbOfCustomers"; var $depends = array("boutique"); var $db; @@ -41,16 +41,6 @@ class box_osc_clients extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxNbOfCustomers"); - } /** * Load data into info_box_contents array to show array later. diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index dedca118098..fc4029e686b 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -34,7 +34,7 @@ class box_produits extends ModeleBoxes { var $boxcode="lastproducts"; var $boximg="object_product"; - var $boxlabel; + var $boxlabel="BoxLastProducts"; var $depends = array("produit"); var $db; @@ -44,17 +44,6 @@ class box_produits extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProducts"); - } - /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php index fe8e86b4df9..48b47d28c57 100644 --- a/htdocs/core/boxes/box_produits_alerte_stock.php +++ b/htdocs/core/boxes/box_produits_alerte_stock.php @@ -35,7 +35,7 @@ class box_produits_alerte_stock extends ModeleBoxes { var $boxcode="productsalertstock"; var $boximg="object_product"; - var $boxlabel; + var $boxlabel="BoxProductsAlertStock"; var $depends = array("produit"); var $db; @@ -45,17 +45,6 @@ class box_produits_alerte_stock extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxProductsAlertStock"); - } - /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index 47b9d6ff71a..752e46625c8 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -33,7 +33,7 @@ class box_propales extends ModeleBoxes { var $boxcode="lastpropals"; var $boximg="object_propal"; - var $boxlabel; + var $boxlabel="BoxLastProposals"; var $depends = array("propal"); // conf->propal->enabled var $db; @@ -43,17 +43,6 @@ class box_propales extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProposals"); - } - /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index 3b5356a7285..13a994c26dc 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -35,7 +35,7 @@ class box_prospect extends ModeleBoxes { var $boxcode="lastprospects"; var $boximg="object_company"; - var $boxlabel; + var $boxlabel="BoxLastProspects"; var $depends = array("societe"); var $db; @@ -44,21 +44,6 @@ class box_prospect extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - global $langs; - $langs->load("boxes"); - - $this->db=$db; - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProspects"); - } - /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index 81b8516bb09..94cf3e5f36b 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -33,7 +33,7 @@ class box_services_contracts extends ModeleBoxes { var $boxcode="lastproductsincontract"; var $boximg="object_product"; - var $boxlabel; + var $boxlabel="BoxLastProductsInContract"; var $depends = array("service","contrat"); var $db; @@ -42,17 +42,7 @@ class box_services_contracts extends ModeleBoxes var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxLastProductsInContract"); - } - + /** * Load data into info_box_contents array to show array later. * diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index 80c3a63c259..e6c6bb7f996 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -32,7 +32,7 @@ class box_services_expired extends ModeleBoxes var $boxcode="expiredservices"; // id of box var $boximg="object_contract"; - var $boxlabel; + var $boxlabel="BoxOldestExpiredServices"; var $depends = array("contrat"); // conf->propal->enabled var $db; @@ -42,18 +42,6 @@ class box_services_expired extends ModeleBoxes var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - - $langs->load("contracts"); - - $this->boxlabel=$langs->transnoentitiesnoconv("BoxOldestExpiredServices"); - } - /** * Load data for box to show them later * diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index ec7728de32f..c1f68c2ccf1 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -33,23 +33,14 @@ class box_supplier_orders extends ModeleBoxes var $boxcode = "latestsupplierorders"; var $boximg = "object_order"; - var $boxlabel; + var $boxlabel="BoxLatestSupplierOrders"; var $depends = array("fournisseur"); + var $db; var $param; var $info_box_head = array(); var $info_box_contents = array(); - /** - * Constructor - */ - function __construct() - { - global $langs; - $langs->load("boxes"); - - $this->boxlabel = $langs->transnoentitiesnoconv("BoxLatestSupplierOrders"); - } /** * Load data into info_box_contents array to show array later. diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 0c6bf08830d..f9a76860f2a 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -47,7 +47,7 @@ class ModeleBoxes // Can't be abtract as it is instanciated to build "empty" /** * Constructor * - * @param DoliDB $db Database hanlder + * @param DoliDB $db Database handler */ function __construct($db) { diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 2a409374f2c..8a2252d7596 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -822,10 +822,11 @@ class FormOther $arrayboxtoactivatelabel=array(); if (! empty($user->conf->$confuserzone)) { + $langs->load("boxes"); foreach($boxactivated as $box) { if (! empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user - $arrayboxtoactivatelabel[$box->id]=$box->boxlabel; // We keep only boxes not shown for user, to show into combo list + $arrayboxtoactivatelabel[$box->id]=$langs->transnoentitiesnoconv($box->boxlabel); // We keep only boxes not shown for user, to show into combo list } $form=new Form($db); diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 431e2f4461b..2b96fbbd639 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -169,7 +169,7 @@ class Translate } if ($this->defaultlang == 'none_NONE') return 0; // Special language code to not translate keys - //dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang); + dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang); $newdomain = $domain; $modulename = ''; diff --git a/htdocs/index.php b/htdocs/index.php index d9a1cab868f..0ee561d7127 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -569,6 +569,8 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) } } +//print 'mem='.memory_get_usage().' - '.memory_get_peak_usage(); + llxFooter(); $db->close();