Reorganize code to reduce memory usage

htdocs/adherents/info.php

@@ -15,19 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
         \file       htdocs/adherents/info.php
         \ingroup    member
 		\brief      Page des informations d'un adherent
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
 

htdocs/adherents/info_subscription.php

@@ -25,6 +25,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/cotisation.class.php");
@@ -55,7 +56,7 @@ $result=$subscription->fetch($rowid);
 
 $h = 0;
 $head = array();
- 
+
 $head[$h][0] = DOL_URL_ROOT.'/adherents/fiche_subscription.php?rowid='.$subscription->id;
 $head[$h][1] = $langs->trans("SubscriptionCard");
 $head[$h][2] = 'general';

htdocs/comm/action/info.php

@@ -25,6 +25,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
@@ -32,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
 $langs->load("commercial");
 
 // Security check
-if ($user->societe_id > 0) 
+if ($user->societe_id > 0)
 {
   $action = '';
   $socid = $user->societe_id;

htdocs/comm/propal/info.php

@@ -26,6 +26,7 @@
 */
 
 require('./pre.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 
@@ -62,7 +63,7 @@ dol_print_object_info($propal);
 print '</td></tr></table>';
 
 print '</div>';
- 
+
 // Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
 print '<div class="tabsAction">';
 print '</div>';

htdocs/commande/info.php

@@ -15,19 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
         \file       htdocs/commande/info.php
         \ingroup    commande
 		\brief      Page des informations d'une commande
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 
@@ -61,7 +59,7 @@ print '</td></tr></table>';
 
 print '</div>';
 
-// Juste pour <EFBFBD>viter bug IE qui r<EFBFBD>organise mal div pr<EFBFBD>c<EFBFBD>dents si celui-ci absent
+// Juste pour eviter bug IE qui reorganise mal div precedents si celui-ci absent
 print '<div class="tabsAction">';
 print '</div>';
 

htdocs/compta/bank/info.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
 
 $langs->load("banks");
@@ -46,12 +47,12 @@ $h=0;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$_GET["rowid"];
 $head[$h][1] = $langs->trans("Card");
-$h++;      
+$h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$_GET["rowid"];
 $head[$h][1] = $langs->trans("Info");
 $hselected = $h;
-$h++;      
+$h++;
 
 
 dolibarr_fiche_head($head, $hselected, $langs->trans("LineRecord"));

htdocs/compta/facture/info.php

@@ -15,19 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
         \file       htdocs/compta/facture/info.php
         \ingroup    facture
 		\brief      Page des informations d'une facture
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
 
 $langs->load("bills");

htdocs/compta/paiement/info.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/paiement.class.php");
 
 $langs->load("bills");
@@ -32,8 +33,7 @@ $langs->load("companies");
 
 
 /*
- * Visualisation de la fiche
+ * View
- *
  */
 
 llxHeader();
@@ -47,12 +47,12 @@ $h=0;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Card");
-$h++;      
+$h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Info");
 $hselected = $h;
-$h++;      
+$h++;
 
 
 dolibarr_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice"));

htdocs/contact/info.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
 
@@ -64,12 +65,12 @@ dolibarr_fiche_head($head, 'info', $langs->trans("Contact"));
 print '<table width="100%"><tr><td>';
 $contact->info($_GET["id"]);
 print '</td></tr></table>';
-  
+
 if ($contact->socid > 0)
 {
   $societe = new Societe($db);
   $societe->fetch($contact->socid);
-  
+
   print $langs->trans("Company").' : '.$societe->getNomUrl(0).'<br>';
 }
 

htdocs/contrat/info.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
 

htdocs/fichinter/info.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2005-2007  Regis Houssin  <regis@dolibarr.fr>
+/* Copyright (C) 2005-2007  Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2009       Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
 */
 
 require('./pre.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
 
@@ -58,7 +60,7 @@ dol_print_object_info($fichinter);
 print '</td></tr></table>';
 
 print '</div>';
- 
+
 // Juste pour <20>viter bug IE qui r<>organise mal div pr<70>c<EFBFBD>dents si celui-ci absent
 print '<div class="tabsAction">';
 print '</div>';

htdocs/fourn/facture/info.php

@@ -15,19 +15,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
         \file       htdocs/fourn/facture/info.php
         \ingroup    facture, fournisseur
 		\brief      Page des informations d'une facture fournisseur
-		\version    $Revision$
+		\version    $Id$
 */
 
 require('./pre.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
 
 $langs->load("bills");

htdocs/fourn/paiement/info.php

@@ -15,20 +15,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
  */
 
 /**
     	\file       htdocs/fourn/paiement/info.php
 		\ingroup    facture
 		\brief      Onglet info d'un paiement fournisseur
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
-require(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/fourn/facture/paiementfourn.class.php");
 
 $langs->load("bills");
 $langs->load("suppliers");
@@ -39,12 +37,12 @@ $h=0;
 
 $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Card");
-$h++;      
+$h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$_GET["id"];
 $head[$h][1] = $langs->trans("Info");
 $hselected = $h;
-$h++;      
+$h++;
 
 dolibarr_fiche_head($head, $hselected, $langs->trans("SupplierPayment"));
 

htdocs/lib/functions.lib.php

@@ -609,47 +609,6 @@ function dol_date($fmt, $timestamp, $gm=0)
 }
 
 
-/**
- *	\brief  Affiche les informations d'un objet
- *	\param	object			objet a afficher
- */
-function dol_print_object_info($object)
-{
-	global $langs;
-	$langs->load("other");
-
-	if (isset($object->user_creation) && $object->user_creation->fullname)
-	print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '<br>';
-
-	if (isset($object->date_creation))
-	print $langs->trans("DateCreation")." : " . dolibarr_print_date($object->date_creation,"dayhourtext") . '<br>';
-
-	if (isset($object->user_modification) && $object->user_modification->fullname)
-	print $langs->trans("ModifiedBy")." : " . $object->user_modification->fullname . '<br>';
-
-	if (isset($object->date_modification))
-	print $langs->trans("DateLastModification")." : " . dolibarr_print_date($object->date_modification,"dayhourtext") . '<br>';
-
-	if (isset($object->user_validation) && $object->user_validation->fullname)
-	print $langs->trans("ValidatedBy")." : " . $object->user_validation->fullname . '<br>';
-
-	if (isset($object->date_validation))
-	print $langs->trans("DateValidation")." : " . dolibarr_print_date($object->date_validation,"dayhourtext") . '<br>';
-
-	if (isset($object->user_cloture) && $object->user_cloture->fullname )
-	print $langs->trans("ClosedBy")." : " . $object->user_cloture->fullname . '<br>';
-
-	if (isset($object->date_cloture))
-	print $langs->trans("DateClosing")." : " . dolibarr_print_date($object->date_cloture,"dayhourtext") . '<br>';
-
-	if (isset($object->user_rappro) && $object->user_rappro->fullname )
-	print $langs->trans("ConciliatedBy")." : " . $object->user_rappro->fullname . '<br>';
-
-	if (isset($object->date_rappro))
-	print $langs->trans("DateConciliating")." : " . dolibarr_print_date($object->date_rappro,"dayhourtext") . '<br>';
-}
-
-
 /**
  * \brief		Return string with formated size
  * \param		size		Size to print

htdocs/lib/functions2.lib.php

@@ -26,6 +26,47 @@
  */
 
 
+/**
+ *	\brief  Show informations on an object
+ *	\param	object			Objet to show
+ */
+function dol_print_object_info($object)
+{
+	global $langs;
+	$langs->load("other");
+
+	if (isset($object->user_creation) && $object->user_creation->fullname)
+	print $langs->trans("CreatedBy")." : " . $object->user_creation->fullname . '<br>';
+
+	if (isset($object->date_creation))
+	print $langs->trans("DateCreation")." : " . dolibarr_print_date($object->date_creation,"dayhourtext") . '<br>';
+
+	if (isset($object->user_modification) && $object->user_modification->fullname)
+	print $langs->trans("ModifiedBy")." : " . $object->user_modification->fullname . '<br>';
+
+	if (isset($object->date_modification))
+	print $langs->trans("DateLastModification")." : " . dolibarr_print_date($object->date_modification,"dayhourtext") . '<br>';
+
+	if (isset($object->user_validation) && $object->user_validation->fullname)
+	print $langs->trans("ValidatedBy")." : " . $object->user_validation->fullname . '<br>';
+
+	if (isset($object->date_validation))
+	print $langs->trans("DateValidation")." : " . dolibarr_print_date($object->date_validation,"dayhourtext") . '<br>';
+
+	if (isset($object->user_cloture) && $object->user_cloture->fullname )
+	print $langs->trans("ClosedBy")." : " . $object->user_cloture->fullname . '<br>';
+
+	if (isset($object->date_cloture))
+	print $langs->trans("DateClosing")." : " . dolibarr_print_date($object->date_cloture,"dayhourtext") . '<br>';
+
+	if (isset($object->user_rappro) && $object->user_rappro->fullname )
+	print $langs->trans("ConciliatedBy")." : " . $object->user_rappro->fullname . '<br>';
+
+	if (isset($object->date_rappro))
+	print $langs->trans("DateConciliating")." : " . dolibarr_print_date($object->date_rappro,"dayhourtext") . '<br>';
+}
+
+
 /**
  *	\brief      Return true if email syntax is ok
  *	\param	    address     email (Ex: "toto@titi.com", "John Do <johndo@titi.com>")

htdocs/product/stock/info.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,25 +24,20 @@
  */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 
 $langs->load("stocks");
 
-llxHeader();
-
-
 /*
- * Visualisation de la fiche
+ * View
- *
  */
 
+llxHeader();
+
 $entrepot = new Entrepot($db);
 $entrepot->fetch($_GET["id"]);
 $entrepot->info($_GET["id"]);
 
-
-/*
- * Affichage onglets
- */
 $h = 0;
 
 $head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche.php?id='.$entrepot->id;

htdocs/societe/info.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
 

htdocs/user/info.php

@@ -14,39 +14,35 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
         \file       htdocs/user/info.php
         \ingroup    core
 		\brief      Page des informations d'un utilisateur
-		\version    $Revision$
+		\version    $Id$
 */
 
 require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/usergroups.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/user.class.php");
 
 $langs->load("users");
 
-// S<EFBFBD>curit<EFBFBD> acc<63>s client et commerciaux
+// Security check
 $id = isset($_GET["id"])?$_GET["id"]:'';
-
 $fuser = new User($db);
 $fuser->id = $id;
 $fuser->fetch();
-
 // If user is not user read and no permission to read other users, we stop
 if (($fuser->id != $user->id) && (! $user->rights->user->user->lire))
   accessforbidden();
 
-  
+
 
 /*
- * Visualisation de la fiche
+ * View
- *
  */
 
 llxHeader();