Migrated ClassName to __construct() function

Changed $DB to $db
lower-cased "Class"
This commit is contained in:
Marcos García 2012-07-30 17:17:33 +02:00
parent 914087b92e
commit 5a73c32f46
221 changed files with 267 additions and 267 deletions

View File

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

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;

View File

@ -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;
}

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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);
}

View File

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

View File

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

View File

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

View File

@ -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;
}

View File

@ -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;

View File

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

View File

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

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;

View File

@ -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");

View File

@ -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;
}
/**

View File

@ -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;
}

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;

View File

@ -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;
}
/**

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

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

View File

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

View File

@ -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;
}

View File

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

View File

@ -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;
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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");

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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");

View File

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

View File

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

View File

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

View File

@ -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;
}

View File

@ -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='')
{

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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;
}

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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;

View File

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

View File

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

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More