lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-30 21:44:21 +02:00
commit a996e8f98a
264 changed files with 489 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/skeletons/modMyModule.class.php
View File

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

6
htdocs/accountancy/class/accountancyaccount.class.php
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;
}

6
htdocs/accountancy/class/accountancysystem.class.php
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;
}

2
htdocs/adherents/class/adherent.class.php
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;

6
htdocs/adherents/class/adherent_type.class.php
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;
}

2
htdocs/adherents/class/adherentstats.class.php
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;

2
htdocs/adherents/class/cotisation.class.php
View File

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

3
htdocs/admin/commande.php
View File

@ -36,6 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
$langs->load("admin");
$langs->load("errors");
$langs->load("orders");
$langs->load('other');
if (! $user->admin) accessforbidden();
@ -289,7 +290,7 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td nowrap="nowrap">';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
print '</td>'."\n";

1
htdocs/admin/dons.php
View File

@ -27,6 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
$langs->load("admin");
$langs->load("donations");
$langs->load('other');
if (!$user->admin) accessforbidden();

1
htdocs/admin/expedition.php
View File

@ -35,6 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php');
$langs->load("admin");
$langs->load("sendings");
$langs->load("deliveries");
$langs->load('other');
if (!$user->admin) accessforbidden();

3
htdocs/admin/facture.php
View File

@ -32,6 +32,7 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
$langs->load("admin");
$langs->load("errors");
$langs->load('other');
if (! $user->admin) accessforbidden();
@ -368,7 +369,7 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td nowrap="nowrap">';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
print '</td>'."\n";

3
htdocs/admin/fichinter.php
View File

@ -35,6 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
$langs->load("admin");
$langs->load("errors");
$langs->load("interventions");
$langs->load('other');
if (! $user->admin) accessforbidden();
@ -251,7 +252,7 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td nowrap="nowrap">';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
print '</td>'."\n";

1
htdocs/admin/fournisseur.php
View File

@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php');
require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
$langs->load("admin");
$langs->load('other');
if (!$user->admin)
accessforbidden();

1
htdocs/admin/livraison.php
View File

@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/livraison/class/livraison.class.php");
$langs->load("admin");
$langs->load("sendings");
$langs->load("deliveries");
$langs->load('other');
if (!$user->admin) accessforbidden();

2
htdocs/admin/project.php
View File

@ -216,7 +216,7 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td nowrap="nowrap">';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
print '</td>'."\n";

3
htdocs/admin/propal.php
View File

@ -34,6 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
$langs->load("admin");
$langs->load("errors");
$langs->load('other');
if (! $user->admin) accessforbidden();
@ -274,7 +275,7 @@ foreach ($dirmodels as $reldir)
// Show example of numbering module
print '<td nowrap="nowrap">';
$tmp=$module->getExample();
if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; }
if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
else print $tmp;
print '</td>'."\n";

2
htdocs/admin/syslog.php
View File

@ -187,7 +187,7 @@ $var=!$var;
print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_SYSLOG_ON" '.$option.' value="1" '.($syslog_syslog_on?' checked="checked"':'').'> '.$langs->trans("SyslogSyslog").'</td>';
print '<td nowrap="nowrap">'.$langs->trans("SyslogFacility").': <input type="text" class="flat" name="facility" '.$option.' value="'.$defaultsyslogfacility.'">';
print '</td>';
print "<td align=\"left\">".$form->textwithpicto('','Only LOG_USER supported on Windows');
print "<td align=\"left\">".$form->textwithpicto('', $langs->trans('OnlyWindowsLOG_USER'));
print '</td></tr>';
try

42
htdocs/admin/system/phpinfo.php
View File

@ -63,17 +63,17 @@ ob_start();
if ($_GET["what"] == 'conf')
{
$title=$langs->trans("Setup");
$title = 'Setup';
phpinfo(INFO_CONFIGURATION);
}
elseif ($_GET["what"] == 'env')
{
$title=$langs->trans("OSEnv");
$title = 'OSEnv';
phpinfo(INFO_ENVIRONMENT);
}
elseif ($_GET["what"] == 'modules')
{
$title=$langs->trans("Modules");
$title = 'Modules';
phpinfo(INFO_MODULES);
}
else
@ -85,37 +85,29 @@ $chaine = ob_get_contents();
ob_end_clean();
// Nettoie la sortie php pour inclusion dans une page deja existante
$chaine = preg_replace('/background-color: #ffffff;/i','',$chaine);
$chaine = preg_replace('/(.*)<style/i','<style',$chaine);
$chaine = preg_replace('/<title>(.*)<body>/i','',$chaine);
$chaine = preg_replace('/a:link \{([^\}]*)\}/i','',$chaine);
$chaine = preg_replace('/a:hover \{([^\}]*)\}/i','',$chaine);
$chaine = preg_replace('/td, th \{([^\}]*)\}/i','',$chaine);
$chaine = preg_replace('/img \{([^\}]*)\}/i','',$chaine);
$chaine = preg_replace('/^<!DOCTYPE(.*)<div class="center">/ims', '', $chaine);
$chaine = preg_replace('/<\/div><\/body><\/html>$/im', '', $chaine);
$chaine = preg_replace('/table(.*)important; \}/i','',$chaine);
$chaine = preg_replace('/<hr \/>/i','',$chaine);
$chaine = preg_replace('/<\/body><\/html>/i','',$chaine);
$chaine = preg_replace('/body, td, th, h1, h2 \{font-family: sans-serif;\}/i','',$chaine);
$chaine = preg_replace('/cellpadding="3" /i','cellpadding="1" cellspacing="1" ',$chaine);
$chaine = preg_replace('/class="h"/i','class="liste_titre"',$chaine);
$chaine = preg_replace('/<th colspan="2">/i','<td>',$chaine);
$chaine = preg_replace('/th>/i','td>',$chaine);
$chaine = str_replace('<hr />', '', $chaine);
$chaine = str_replace('cellpadding="3" ', 'cellpadding="1" cellspacing="1" ', $chaine);
$chaine = str_replace('class="h"','class="liste_titre"', $chaine);
$chaine = str_replace('<th colspan="2">', '<td>', $chaine);
$chaine = str_replace('th>', 'td>', $chaine);
// Titles
$chaine = preg_replace('/<h1([^>]*)>/i','<div class="titre">',$chaine);
$chaine = preg_replace('/<h2>/i','<div class="titre">',$chaine);
$chaine = preg_replace('/<\/h1>/i','</div><br>',$chaine);
$chaine = preg_replace('/<\/h2>/i','</div>',$chaine);
$chaine = str_replace('<h2>', '<div class="titre">', $chaine);
$chaine = str_replace('</h1>', '</div><br>', $chaine);
$chaine = str_replace('</h2>', '</div>', $chaine);
$chaine = preg_replace('/<td class="e">/i','<td class="impair">',$chaine);
$chaine = preg_replace('/<td class="v">/i','<td class="pair">',$chaine);
$chaine = preg_replace('/<div class="titre">Configuration<\/div><br>/i','',$chaine);
$chaine = str_replace('<td class="e">', '<td class="impair">', $chaine);
$chaine = str_replace('<td class="v">', '<td class="pair">', $chaine);
$chaine = str_replace('<div class="titre">Configuration</div><br>', '', $chaine);
// Add LF
$chaine = preg_replace('/(pcntl_[a-z]+),/','$1, ',$chaine);
if (isset($title))
{
print_fiche_titre($title,'','setup');
print_fiche_titre($langs->trans($title), '', 'setup');
print '<br>';
}

2
htdocs/bookmarks/class/bookmark.class.php
View File

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

2
htdocs/boutique/client/class/boutiqueclient.class.php
View File

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

2
htdocs/boutique/commande/class/boutiquecommande.class.php
View File

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

2
htdocs/boutique/critiques/class/critique.class.php
View File

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

2
htdocs/boutique/promotion/class/promotion.class.php
View File

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

6
htdocs/cashdesk/class/Auth.class.php
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);
}

2
htdocs/cashdesk/class/Facturation.class.php
View File

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

2
htdocs/comm/action/class/actioncomm.class.php
View File

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

2
htdocs/comm/action/class/cactioncomm.class.php
View File

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

8
htdocs/comm/propal/class/propal.class.php
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;
@ -2508,11 +2508,11 @@ class PropaleLigne
/**
* Class line Contructor
*
* @param DoliDB $DB Database handler
* @param DoliDB $db Database handler
*/
function PropaleLigne($DB)
function __construct($db)
{
$this->db= $DB;
$this->db= $db;
}
/**

6
htdocs/comm/propal/class/propalestats.class.php
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;

2
htdocs/comm/prospect/class/prospect.class.php
View File

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

6
htdocs/commande/class/commande.class.php
View File

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

2
htdocs/commande/class/commandestats.class.php
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;

4
htdocs/commissions/index.php
View File

@ -77,7 +77,7 @@ if ($agentid > 0) {
print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>';
print '<td colspan="4">';
print $form->select_dolusers($selected=$agentid,$htmlname='agentid',$show_empty=1,$exclude='',$disabled=0,$include='',$enableonly='');
print $form->select_dolusers($agentid,'agentid',1,'',0,'','');
print '</td></tr>';
if (! $sortorder) $sortorder="ASC";
@ -86,7 +86,7 @@ if ($agentid > 0) {
else {
print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>';
print '<td colspan="4">';
print $form->select_dolusers($selected='',$htmlname='agentid',$show_empty=1,$exclude='',$disabled=0,$include='',$enableonly='');
print $form->select_dolusers('','agentid',1,'',0,'','');
print '</td></tr>';
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="u.login";

8
htdocs/compta/bank/class/account.class.php
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;
}

6
htdocs/compta/bank/class/bankcateg.class.php
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;
}

2
htdocs/compta/deplacement/class/deplacementstats.class.php
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;

2
htdocs/compta/deplacement/index.php
View File

@ -54,7 +54,7 @@ $limit = $conf->liste_limit;
$tripandexpense_static=new Deplacement($db);
//$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones';
//$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
$help_url='';
llxHeader('',$langs->trans("ListOfFees"),$help_url);

6
htdocs/compta/dons/class/don.class.php
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");

2
htdocs/compta/dons/fiche.php
View File

@ -249,7 +249,7 @@ if ($action == 'builddoc')
* View
*/
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones');
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
$form=new Form($db);
$formfile = new FormFile($db);

2
htdocs/compta/dons/index.php
View File

@ -47,7 +47,7 @@ $donation_static=new Don($db);
$donstatic=new Don($db);
$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones';
$help_url='EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones';
llxHeader('',$langs->trans("Donations"),$help_url);
$nb=array();

2
htdocs/compta/dons/liste.php
View File

@ -55,7 +55,7 @@ if (!$user->rights->don->lire) accessforbidden();
if ($conf->projet->enabled) $projectstatic=new Project($db);
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones');
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
$donationstatic=new Don($db);

2
htdocs/compta/dons/stats.php
View File

@ -33,7 +33,7 @@ if (!$user->rights->don->lire) accessforbidden();
* View
*/
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Subvenciones');
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
print_fiche_titre($langs->trans("Statistics"));

6
htdocs/compta/facture/class/facture-rec.class.php
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;
}
/**

4
htdocs/compta/facture/class/facture.class.php
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;
}

2
htdocs/compta/facture/class/facturestats.class.php
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;

6
htdocs/compta/facture/class/paymentterm.class.php
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;
}

6
htdocs/compta/localtax/class/localtax.class.php
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;
}

4
htdocs/compta/paiement/cheque/class/remisecheque.class.php
View File

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

4
htdocs/compta/paiement/class/paiement.class.php
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;
}
/**

2
htdocs/compta/prelevement/class/bon-prelevement.class.php
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;

2
htdocs/compta/prelevement/class/ligne-prelevement.class.php
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;

2
htdocs/compta/prelevement/class/rejet-prelevement.class.php
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;

2
htdocs/compta/sociales/class/chargesociales.class.php
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;

2
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
View File

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

6
htdocs/compta/tva/class/tva.class.php
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;
}

2
htdocs/contact/class/contact.class.php
View File

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

4
htdocs/contrat/class/contrat.class.php
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;
}

2
htdocs/core/boxes/box_actions.php
View File

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

2
htdocs/core/boxes/box_activity.php
View File

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

2
htdocs/core/boxes/box_bookmarks.php
View File

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

2
htdocs/core/boxes/box_clients.php
View File

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

2
htdocs/core/boxes/box_commandes.php
View File

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

2
htdocs/core/boxes/box_comptes.php
View File

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

2
htdocs/core/boxes/box_contacts.php
View File

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

2
htdocs/core/boxes/box_contracts.php
View File

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

2
htdocs/core/boxes/box_external_rss.php
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");

2
htdocs/core/boxes/box_factures.php
View File

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

2
htdocs/core/boxes/box_factures_fourn.php
View File

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

2
htdocs/core/boxes/box_factures_fourn_imp.php
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");

2
htdocs/core/boxes/box_factures_imp.php
View File

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

2
htdocs/core/boxes/box_fournisseurs.php
View File

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

2
htdocs/core/boxes/box_members.php
View File

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

2
htdocs/core/boxes/box_osc_client.php
View File

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

2
htdocs/core/boxes/box_produits.php
View File

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

2
htdocs/core/boxes/box_propales.php
View File

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

2
htdocs/core/boxes/box_prospect.php
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");

2
htdocs/core/boxes/box_services_contracts.php
View File

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

2
htdocs/core/boxes/box_services_expired.php
View File

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

2
htdocs/core/boxes/box_supplier_orders.php
View File

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

2
htdocs/core/boxes/modules_boxes.php
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;
}

2
htdocs/core/class/CMailFile.class.php
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='')
{

2
htdocs/core/class/CSMSFile.class.php
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;

2
htdocs/core/class/antivir.class.php
View File

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

2
htdocs/core/class/conf.class.php
View File

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

2
htdocs/core/class/cookie.class.php
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();

2
htdocs/core/class/cpays.class.php
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;

2
htdocs/core/class/ctypent.class.php
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;

6
htdocs/core/class/discount.class.php
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;
}

2
htdocs/core/class/doleditor.class.php
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;

2
htdocs/core/class/dolexception.class.php
View File

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

2
htdocs/core/class/dolgeoip.class.php
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')
{

2
htdocs/core/class/dolgraph.class.php
View File

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

2
htdocs/core/class/events.class.php
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;

2
htdocs/core/class/extrafields.class.php
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();

2
htdocs/core/class/google.class.php
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;

2
htdocs/core/class/html.formactions.class.php
View File

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

2
htdocs/core/class/html.formadmin.class.php
View File

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

2
htdocs/core/class/html.formbarcode.class.php
View File

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

2
htdocs/core/class/html.formcompany.class.php
View File

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

2
htdocs/core/class/html.formfile.class.php
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;

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