Merge pull request #279 from marcosgdf/migrate-to-construct

Coding style improvements

dev/skeletons/modMyModule.class.php

@@ -38,7 +38,7 @@ class modMyModule extends DolibarrModules
 	 *
 	 *   @param      DoliDB		$db      Database handler
 	 */
-	function modMyModule($db)
+	function __construct($db)
 	{
         global $langs,$conf;
 

htdocs/accountancy/class/accountancyaccount.class.php

@@ -43,11 +43,11 @@ class AccountancyAccount
     /**
      *  Constructor
      *
-     *  @param		DoliDB		$DB		Database handler
+     *  @param		DoliDB		$db		Database handler
      */
-    function AccountancyAccount($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 

htdocs/accountancy/class/accountancysystem.class.php

@@ -42,11 +42,11 @@ class AccountancySystem
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
 	 */
-	function AccountancySystem($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 	}
 
 

htdocs/adherents/class/adherent.class.php

@@ -117,7 +117,7 @@ class Adherent extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
      */
-    function Adherent($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->statut = -1;

htdocs/adherents/class/adherent_type.class.php

@@ -48,11 +48,11 @@ class AdherentType extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *	@param 		DoliDB		$DB		Database handler
+	 *	@param 		DoliDB		$db		Database handler
      */
-    function AdherentType($DB)
+    function __construct($db)
     {
-        $this->db = $DB ;
+        $this->db = $db;
         $this->statut = 1;
     }
 

htdocs/adherents/class/adherentstats.class.php

@@ -51,7 +51,7 @@ class AdherentStats extends Stats
      * 	@param   	int			$userid    	Id user for filter
 	 * 	@return 	AdherentStats
 	 */
-	function AdherentStats($db, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $user, $conf;
 

htdocs/adherents/class/cotisation.class.php

@@ -50,7 +50,7 @@ class Cotisation extends CommonObject
 	 *
 	 *	@param 		DoliDB		$db		Database handler
 	 */
-	function Cotisation($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}

htdocs/bookmarks/class/bookmark.class.php

@@ -45,7 +45,7 @@ class Bookmark
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function Bookmark($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/boutique/client/class/boutiqueclient.class.php

@@ -39,7 +39,7 @@ class BoutiqueClient
 	 *
 	 * 	@param		DoliDB	$db		Database handler
 	 */
-    function BoutiqueClient($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/boutique/commande/class/boutiquecommande.class.php

@@ -43,7 +43,7 @@ class BoutiqueCommande
      *
      * @param	DoliDB	$db		Database handler
      */
-    function BoutiqueCommande($db)
+    function __construct($db)
     {
         $this->db = $db;
 

htdocs/boutique/critiques/class/critique.class.php

@@ -37,7 +37,7 @@ class Critique
 	 *
 	 * @param	DoliDB		$db		Database handler
 	 */
-	function Critique($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}

htdocs/boutique/promotion/class/promotion.class.php

@@ -43,7 +43,7 @@ class Promotion
 	 *
 	 * 	@param		DoliDB		$db		Database handler
 	 */
-	function Promotion($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}

htdocs/cashdesk/class/Auth.class.php

@@ -34,12 +34,12 @@ class Auth
 	/**
 	 * Enter description here ...
 	 *
-	 * @param	DoliDB	$DB			Database handler
+	 * @param	DoliDB	$db			Database handler
 	 * @return	void
 	 */
-	function Auth($DB)
+	function __construct($db)
 	{
-		$this->db = $DB;
+		$this->db = $db;
 		$this->reponse(null);
 	}
 

htdocs/cashdesk/class/Facturation.class.php

@@ -72,7 +72,7 @@ class Facturation
     /**
      *	Constructor
      */
-    public function Facturation()
+    public function __construct()
     {
         $this->raz();
         $this->razPers();

htdocs/comm/action/class/actioncomm.class.php

@@ -84,7 +84,7 @@ class ActionComm extends CommonObject
      *
      *      @param		DoliDB		$db      Database handler
      */
-    function ActionComm($db)
+    function __construct($db)
     {
         $this->db = $db;
 

htdocs/comm/action/class/cactioncomm.class.php

@@ -47,7 +47,7 @@ class CActionComm
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function CActionComm($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/comm/propal/class/propal.class.php

@@ -122,7 +122,7 @@ class Propal extends CommonObject
      *	@param      int		$socid		Id third party
      *	@param      int		$propalid   Id proposal
      */
-    function Propal($db, $socid="", $propalid=0)
+    function __construct($db, $socid="", $propalid=0)
     {
         global $conf,$langs;
 
@@ -2510,7 +2510,7 @@ class PropaleLigne
      *
      * 	@param	DoliDB	$DB	Database handler
      */
-    function PropaleLigne($DB)
+    function __construct($DB)
     {
         $this->db= $DB;
     }

htdocs/comm/propal/class/propalestats.class.php

@@ -47,15 +47,15 @@ class PropaleStats extends Stats
 	/**
 	 * Constructor
 	 *
-	 * @param 	DoliDB	$DB		   Database handler
+	 * @param 	DoliDB	$db		   Database handler
 	 * @param 	int		$socid	   Id third party
      * @param   int		$userid    Id user for filter
 	 */
-	function PropaleStats($DB, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $user, $conf;
 
-		$this->db = $DB;
+		$this->db = $db;
         $this->socid = $socid;
         $this->userid = $userid;
 

htdocs/comm/prospect/class/prospect.class.php

@@ -39,7 +39,7 @@ class Prospect extends Societe
      *
      *	@param	DoliDB	$db		Databas handler
      */
-    function Prospect($db)
+    function __construct($db)
     {
         global $config;
 

htdocs/commande/class/commande.class.php

@@ -2869,7 +2869,7 @@ class OrderLine
      *
      *      @param     DoliDB	$DB      handler d'acces base de donnee
      */
-    function OrderLine($DB)
+    function __construct($DB)
     {
         $this->db= $DB;
     }

htdocs/commande/class/commandestats.class.php

@@ -50,7 +50,7 @@ class CommandeStats extends Stats
 	 * @param 	string	$mode	   Option
 	 * @param   int		$userid    Id user for filter
 	 */
-	function CommandeStats($db, $socid, $mode, $userid=0)
+	function __construct($db, $socid, $mode, $userid=0)
 	{
 		global $user, $conf;
 

htdocs/compta/bank/class/account.class.php

@@ -990,13 +990,13 @@ class Account extends CommonObject
         return 0;
     }
 
-    /**
+    /**
      *	Load miscellaneous information for tab "Info"
      *
      *	@param  int		$id		Id of object to load
      *	@return	void
-     */
+     */
-    function info($id)
+    function info($id)
     {
 
     }
@@ -1068,7 +1068,7 @@ class AccountLine extends CommonObject
      *
      *  @param	DoliDB	$db		Database handler
      */
-    function AccountLine($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/compta/bank/class/bankcateg.class.php

@@ -46,11 +46,11 @@ class BankCateg // extends CommonObject
     /**
      *	Constructor
      *
-     *  @param		DoliDB		$DB      Database handler
+     *  @param		DoliDB		$db      Database handler
      */
-    function BankCateg($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 

htdocs/compta/deplacement/class/deplacementstats.class.php

@@ -48,7 +48,7 @@ class DeplacementStats extends Stats
      * @param   int			$userid    Id user for filter
 	 * @return 	void
 	 */
-	function DeplacementStats($db, $socid=0, $userid=0)
+	function __construct($db, $socid=0, $userid=0)
 	{
 		global $conf;
 

htdocs/compta/dons/class/don.class.php

@@ -58,13 +58,13 @@ class Don extends CommonObject
     /**
      *  Constructor
      *
-     *  @param	DoliDB	$DB		Database handler
+     *  @param	DoliDB	$db 	Database handler
      */
-    function Don($DB)
+    function __construct($db)
     {
         global $langs;
 
-        $this->db = $DB ;
+        $this->db = $db;
         $this->modepaiementid = 0;
 
         $langs->load("donations");

htdocs/compta/facture/class/facture-rec.class.php

@@ -68,11 +68,11 @@ class FactureRec extends Facture
 	/**
 	 *	Constructor
 	 *
-	 * 	@param		DoliDB		$DB		Database handler
+	 * 	@param		DoliDB		$db		Database handler
 	 */
-	function FactureRec($DB)
+	function __construct($db)
 	{
-		$this->db = $DB ;
+		$this->db = $db;
 	}
 
 	/**

htdocs/compta/facture/class/facture.class.php

@@ -115,7 +115,7 @@ class Facture extends CommonInvoice
      *
 	 * 	@param	DoliDB		$db			Database handler
      */
-    function Facture($db)
+    function __construct($db)
     {
         $this->db = $db;
     }
@@ -3160,7 +3160,7 @@ class FactureLigne
      *
      *  @param	DoliDB		$db		Database handler
      */
-    function FactureLigne($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/compta/facture/class/facturestats.class.php

@@ -51,7 +51,7 @@ class FactureStats extends Stats
      * 	@param	int			$userid    	Id user for filter
 	 * 	@return FactureStats
 	 */
-	function FactureStats($db, $socid, $mode, $userid=0)
+	function __construct($db, $socid, $mode, $userid=0)
 	{
 		global $conf;
 

htdocs/compta/facture/class/paymentterm.class.php

@@ -53,11 +53,11 @@ class PaymentTerm // extends CommonObject
     /**
      * 	Constructor
      *
-	 * 	@param	DoliDB		$DB			Database handler
+	 * 	@param	DoliDB		$db			Database handler
      */
-    function PaymentTerm($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 

htdocs/compta/localtax/class/localtax.class.php

@@ -45,11 +45,11 @@ class localtax extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
      */
-    function __construct($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 

htdocs/compta/paiement/cheque/class/remisecheque.class.php

@@ -45,7 +45,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function RemiseCheque($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->next_id = 0;

htdocs/compta/paiement/class/paiement.class.php

@@ -58,9 +58,9 @@ class Paiement extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Paiement($db)
+	function __construct($db)
 	{
-		$this->db = $db ;
+		$this->db = $db;
 	}
 
 	/**

htdocs/compta/prelevement/class/bon-prelevement.class.php

@@ -56,7 +56,7 @@ class BonPrelevement extends CommonObject
      *  @param		DoliDB		$db      	Database handler
      *  @param		string		$filename	Filename of withdraw receipt
      */
-    function BonPrelevement($db, $filename='')
+    function __construct($db, $filename='')
     {
         global $conf,$langs;
 

htdocs/compta/prelevement/class/ligne-prelevement.class.php

@@ -44,7 +44,7 @@ class LignePrelevement
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
 	 */
-	function LignePrelevement($db, $user)
+	function __construct($db, $user)
 	{
 		global $conf,$langs;
 

htdocs/compta/prelevement/class/rejet-prelevement.class.php

@@ -41,7 +41,7 @@ class RejetPrelevement
 	 *  @param	DoliDb	$db			Database handler
 	 *  @param 	User	$user       Objet user
 	 */
-	function RejetPrelevement($db, $user)
+	function __construct($db, $user)
 	{
 		global $langs;
 

htdocs/compta/sociales/class/chargesociales.class.php

@@ -52,7 +52,7 @@ class ChargeSociales extends CommonObject
      *
      * @param	DoliDB		$db		Database handler
      */
-    function ChargeSociales($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;

htdocs/compta/sociales/class/paymentsocialcontribution.class.php

@@ -54,7 +54,7 @@ class PaymentSocialContribution extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function PaymentSocialContribution($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}

htdocs/compta/tva/class/tva.class.php

@@ -55,11 +55,11 @@ class Tva extends CommonObject
     /**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$DB      Database handler
+	 *  @param		DoliDB		$db      Database handler
      */
-    function Tva($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
         return 1;
     }
 

htdocs/contact/class/contact.class.php

@@ -90,7 +90,7 @@ class Contact extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Contact($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}

htdocs/contrat/class/contrat.class.php

@@ -72,7 +72,7 @@ class Contrat extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Contrat($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}
@@ -1621,7 +1621,7 @@ class ContratLigne
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function ContratLigne($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 	}

htdocs/core/boxes/box_actions.php

@@ -45,7 +45,7 @@ class box_actions extends ModeleBoxes
 	/**
 	 *  Constructor
 	 */
-	function box_actions()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_activity.php

@@ -41,7 +41,7 @@ class box_activity extends ModeleBoxes
 	/**
 	 *	Constructor
 	 */
-	function box_activity()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_bookmarks.php

@@ -41,7 +41,7 @@ class box_bookmarks extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_bookmarks()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_clients.php

@@ -45,7 +45,7 @@ class box_clients extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_clients()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_commandes.php

@@ -45,7 +45,7 @@ class box_commandes extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_commandes()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");

htdocs/core/boxes/box_comptes.php

@@ -46,7 +46,7 @@ class box_comptes extends ModeleBoxes
 	/**
 	 *  Constructor
 	 */
-	function box_comptes()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_contacts.php

@@ -46,7 +46,7 @@ class box_contacts extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_contacts()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_contracts.php

@@ -44,7 +44,7 @@ class box_contracts extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_contracts()
+    function __construct()
     {
     	global $langs;
 

htdocs/core/boxes/box_external_rss.php

@@ -50,7 +50,7 @@ class box_external_rss extends ModeleBoxes
      * 	@param	DoliDB	$db			Database handler
      *  @param	string	$param		More parameters
      */
-    function box_external_rss($db,$param)
+    function __construct($db,$param)
     {
         global $langs;
         $langs->load("boxes");

htdocs/core/boxes/box_factures.php

@@ -44,7 +44,7 @@ class box_factures extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_factures_fourn.php

@@ -44,7 +44,7 @@ class box_factures_fourn extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_fourn()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_factures_fourn_imp.php

@@ -44,7 +44,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_fourn_imp()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_factures_imp.php

@@ -47,7 +47,7 @@ class box_factures_imp extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_factures_imp()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_fournisseurs.php

@@ -44,7 +44,7 @@ class box_fournisseurs extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_fournisseurs()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");

htdocs/core/boxes/box_members.php

@@ -45,7 +45,7 @@ class box_members extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_members()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_osc_client.php

@@ -44,7 +44,7 @@ class box_osc_clients extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_osc_clients()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");

htdocs/core/boxes/box_produits.php

@@ -47,7 +47,7 @@ class box_produits extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_produits()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_propales.php

@@ -46,7 +46,7 @@ class box_propales extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_propales()
+    function __construct()
     {
     	global $langs;
       $langs->load("boxes");

htdocs/core/boxes/box_prospect.php

@@ -49,7 +49,7 @@ class box_prospect extends ModeleBoxes
      *
      *  @param	DoliDB	$db		Database handler
 	 */
-	function box_prospect($db)
+	function __construct($db)
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_services_contracts.php

@@ -45,7 +45,7 @@ class box_services_contracts extends ModeleBoxes
 	/**
      *  Constructor
 	 */
-	function box_services_contracts()
+	function __construct()
 	{
 		global $langs;
 		$langs->load("boxes");

htdocs/core/boxes/box_services_expired.php

@@ -45,7 +45,7 @@ class box_services_expired extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_services_expired()
+    function __construct()
     {
     	global $langs;
 

htdocs/core/boxes/box_supplier_orders.php

@@ -43,7 +43,7 @@ class box_supplier_orders extends ModeleBoxes
     /**
      *  Constructor
      */
-    function box_supplier_orders()
+    function __construct()
     {
         global $langs;
         $langs->load("boxes");

htdocs/core/boxes/modules_boxes.php

@@ -48,7 +48,7 @@ class ModeleBoxes    // Can't be abtract as it is instanciated to build "empty"
 	 *
 	 *	@param	DoliDB		$db		Database hanlder
 	 */
-	function ModeleBoxes($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}

htdocs/core/class/CMailFile.class.php

@@ -98,7 +98,7 @@ class CMailFile
 	 *	@param 	string	$errors_to      		Email errors
 	 *	@param	string	$css			        Css option
 	 */
-	function CMailFile($subject,$to,$from,$msg,
+	function __construct($subject,$to,$from,$msg,
 	$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),
 	$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='')
 	{

htdocs/core/class/CSMSFile.class.php

@@ -58,7 +58,7 @@ class CSMSFile
 	 *	@param 	int		$class				Class
 	 *	@return	int
 	 */
-	function CSMSFile($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
+	function __construct($to,$from,$msg,$deliveryreceipt=0,$deferred=0,$priority=3,$class=1)
 	{
 		global $conf;
 

htdocs/core/class/antivir.class.php

@@ -42,7 +42,7 @@ class AntiVir
 	 *  @param      DoliDB		$db      Database handler
 	 *	@return AntiVir
 	 */
-	function AntiVir($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}

htdocs/core/class/conf.class.php

@@ -75,7 +75,7 @@ class Conf
 	 *
 	 * @return Conf
 	 */
-	function Conf()
+	function __construct()
 	{
 		// Avoid warnings when filling this->xxx
 		$this->file				= (object) array();

htdocs/core/class/cookie.class.php

@@ -43,7 +43,7 @@ class DolCookie
 	 *
 	 *  @param      string		$key      Personnal key
 	 */
-	function DolCookie($key = '')
+	function __construct($key = '')
 	{
 		$this->myKey = $key;
 		$this->cookiearray = array();

htdocs/core/class/cpays.class.php

@@ -54,7 +54,7 @@ class Cpays // extends CommonObject
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function Cpays($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;

htdocs/core/class/ctypent.class.php

@@ -49,7 +49,7 @@ class Ctypent // extends CommonObject
      *
      *  @param      DoliDb		$db      Database handler
      */
-    function Ctypent($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;

htdocs/core/class/discount.class.php

@@ -49,11 +49,11 @@ class DiscountAbsolute
     /**
      *	Constructor
      *
-     *  @param  	DoliDB		$DB		Database handler
+     *  @param  	DoliDB		$db		Database handler
      */
-    function DiscountAbsolute($DB)
+    function __construct($db)
     {
-        $this->db = $DB;
+        $this->db = $db;
     }
 
 

htdocs/core/class/doleditor.class.php

@@ -61,7 +61,7 @@ class DolEditor
      *      @param  int		$rows                   Size of rows for textarea tool
 	 *      @param  int		$cols                   Size of cols for textarea tool
 	 */
-    function DolEditor($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0)
+    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0)
     {
     	global $conf,$langs;
 

htdocs/core/class/dolexception.class.php

@@ -30,7 +30,7 @@ class DolException extends Exception
     /**
      * Constructor
      */
-    function DolException()
+    function __construct()
     {
     }
 }

htdocs/core/class/dolgeoip.class.php

@@ -42,7 +42,7 @@ class DolGeoIP
 	 * @param	string	$datfile	Data file
 	 * @return 	GeoIP
 	 */
-	function DolGeoIP($type,$datfile)
+	function __construct($type,$datfile)
 	{
 		if ($type == 'country')
 		{

htdocs/core/class/dolgraph.class.php

@@ -82,7 +82,7 @@ class DolGraph
     /**
      * Constructor
      */
-    function DolGraph()
+    function __construct()
     {
         global $conf;
         global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;

htdocs/core/class/events.class.php

@@ -90,7 +90,7 @@ class Events // extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function Events($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;

htdocs/core/class/extrafields.class.php

@@ -48,7 +48,7 @@ class ExtraFields
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function ExtraFields($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		$this->error = array();

htdocs/core/class/google.class.php

@@ -38,7 +38,7 @@ class GoogleAPI
 	 * @param	string		$key		Google key
 	 * @return 	GoogleAPI
 	 */
-	function GoogleAPI($db,$key)
+	function __construct($db,$key)
 	{
 		$this->db=$db;
 		$this->key=$key;

htdocs/core/class/html.formactions.class.php

@@ -38,7 +38,7 @@ class FormActions
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FormActions($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;

htdocs/core/class/html.formadmin.class.php

@@ -38,7 +38,7 @@ class FormAdmin
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	function FormAdmin($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;

htdocs/core/class/html.formbarcode.class.php

@@ -37,7 +37,7 @@ class FormBarCode
      *
      *	@param	DoliDB		$db		Database handler
      */
-    function FormBarCode($db)
+    function __construct($db)
     {
         $this->db = $db;
         return 1;

htdocs/core/class/html.formcompany.class.php

@@ -39,7 +39,7 @@ class FormCompany
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormCompany($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 

htdocs/core/class/html.formfile.class.php

@@ -40,7 +40,7 @@ class FormFile
 	 *
 	 *  @param		DoliDB		$db      Database handler
      */
-    function FormFile($db)
+    function __construct($db)
     {
         $this->db = $db;
         $this->numoffiles=0;

htdocs/core/class/html.formmail.class.php

@@ -74,7 +74,7 @@ class FormMail
      *
      *  @param	DoliDB	$db      Database handler
      */
-    function FormMail($db)
+    function __construct($db)
     {
         $this->db = $db;
 

htdocs/core/class/html.formorder.class.php

@@ -38,7 +38,7 @@ class FormOrder
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	function FormOrder($db)
+	function __construct($db)
 	{
 		$this->db = $db;
 		return 1;

htdocs/core/class/html.formother.class.php

@@ -46,7 +46,7 @@ class FormOther
      *
      *	@param	DoliDB		$db      Database handler
      */
-    function FormOther($db)
+    function __construct($db)
     {
         $this->db = $db;
 

htdocs/core/class/html.formsms.class.php

@@ -64,7 +64,7 @@ class FormSms
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function FormSms($db)
+    function __construct($db)
     {
         $this->db = $db;
 

htdocs/core/class/interfaces.class.php

@@ -38,7 +38,7 @@ class Interfaces
      *
      *  @param		DoliDB		$db      Database handler
      */
-    function Interfaces($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/core/class/menu.class.php

@@ -33,7 +33,7 @@ class Menu
     /**
 	 *	Constructor
      */
-    function Menu()
+    function __construct()
     {
       	$this->liste = array();
     }

htdocs/core/class/menubase.class.php

@@ -61,7 +61,7 @@ class Menubase
      *  @param     	string		$menu_handler	Menu handler
      *  @param     	string		$type			Type
      */
-    function Menubase($db,$menu_handler='',$type='')
+    function __construct($db,$menu_handler='',$type='')
     {
         $this->db = $db;
         $this->menu_handler = $menu_handler;

htdocs/core/class/notify.class.php

@@ -47,7 +47,7 @@ class Notify
 	 *
 	 *	@param 		DoliDB		$db		Database handler
      */
-    function Notify($db)
+    function __construct($db)
     {
         $this->db = $db;
     }

htdocs/core/class/rssparser.class.php

@@ -146,7 +146,7 @@ class RssParser
      *
      *  @param		DoliDB		$db      Database handler
      */
-    public function RssParser($db)
+    public function __construct($db)
     {
         $this->db=$db;
     }

htdocs/core/class/translate.class.php

@@ -49,7 +49,7 @@ class Translate
 	 *  @param	string	$dir            Force directory that contains /langs subdirectory (value is sometine '..' like into install/* pages or support/* pages).
 	 *  @param  Conf	$conf			Object with Dolibarr configuration
 	 */
-	function Translate($dir,$conf)
+	function __construct($dir,$conf)
 	{
 		if (! empty($conf->file->character_set_client)) $this->charset_output=$conf->file->character_set_client;	// If charset output is forced
 		if ($dir) $this->dir=array($dir);

htdocs/core/db/mssql.class.php

@@ -80,7 +80,7 @@ class DoliDBMssql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-	function DoliDBMssql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 

htdocs/core/db/mysql.class.php

@@ -80,7 +80,7 @@ class DoliDBMysql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
 	 */
-	function DoliDBMysql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 

htdocs/core/db/mysqli.class.php

@@ -80,7 +80,7 @@ class DoliDBMysqli
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-    function DoliDBMysqli($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
         global $conf,$langs;
 

htdocs/core/db/pgsql.class.php

@@ -77,7 +77,7 @@ class DoliDBPgsql
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
 	 */
-	function DoliDBPgsql($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $conf,$langs;
 

htdocs/core/db/sqlite.class.php

@@ -80,7 +80,7 @@ class DoliDBSqlite
 	 *	@param	    int		$port		Port of database server
 	 *	@return	    int					1 if OK, 0 if not
      */
-    function DoliDBSqlite($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
         global $conf,$langs;
 

htdocs/core/login/functions_myopenid.php

@@ -129,7 +129,7 @@ class SimpleOpenID
     /**
      * Constructor
      */
-    function SimpleOpenID()
+    function __construct()
     {
         if (!function_exists('curl_exec'))
         {

htdocs/core/menus/smartphone/smartphone_backoffice.php

@@ -38,7 +38,7 @@ class MenuSmart
      *
      *  @param      DoliDb		$db      Database handler
 	 */
-	function MenuSmart($db)
+	function __construct($db)
 	{
 		$this->db=$db;
 	}