diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php index 3e6fb50588a..3abd249779f 100644 --- a/htdocs/lib/mysql.lib.php +++ b/htdocs/lib/mysql.lib.php @@ -71,33 +71,19 @@ class DoliDb ); /** - \brief Ouverture d'une connection vers le serveur et éventuellement une database. - \param type type de base de données (mysql ou pgsql) + \brief Ouverture d'une connection vers le serveur et éventuellement une database. + \param type type de base de données (mysql ou pgsql) \param host addresse de la base de données \param user nom de l'utilisateur autorisé \param pass mot de passe \param name nom de la database - \return int 1 en cas de succès, 0 sinon + \return int 1 en cas de succès, 0 sinon */ - function DoliDb($type = 'mysql', $host = '', $user = '', $pass = '', $name = '', $newlink=0) + function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0) { global $conf; $this->transaction_opened=0; - if (! $host) $host = $conf->db->host; - if (! $user) $user = $conf->db->user; - if (! $pass) $pass = $conf->db->pass; - if (! $name) $name = $conf->db->name; - - //print "Name DB: $host,$user,$pass,$name
"; - if (! $host) - { - $this->connected = 0; - $this->ok = 0; - dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters"); - return $this->ok; - } - // Essai connexion serveur $this->db = $this->connect($host, $user, $pass, $newlink); diff --git a/htdocs/lib/pgsql.lib.php b/htdocs/lib/pgsql.lib.php index 753756b53df..28fe4315722 100644 --- a/htdocs/lib/pgsql.lib.php +++ b/htdocs/lib/pgsql.lib.php @@ -63,16 +63,11 @@ class DoliDb \param name nom de la database \return int 1 en cas de succès, 0 sinon */ - function DoliDb($type = 'pgsql', $host = '', $user = '', $pass = '', $name = '') + function DoliDb($type='pgsql', $host, $user, $pass, $name='') { global $conf; $this->transaction_opened=0; - if (! $host) $host = $conf->db->host; - if (! $user) $user = $conf->db->user; - if (! $pass) $pass = $conf->db->pass; - if (! $name) $name = $conf->db->name; - //print "Name DB: $host,$user,$pass,$name
"; if (! $host) { diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 4717600ba6c..db8bd9570d6 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -107,7 +107,7 @@ require_once(DOL_DOCUMENT_ROOT ."/notify.class.php"); require_once(DOL_DOCUMENT_ROOT ."/address.class.php"); -$db = new DoliDb(); +$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); $user = new User($db); diff --git a/htdocs/public/dons/bplc.php b/htdocs/public/dons/bplc.php index 0230779c49e..00dee8ce525 100644 --- a/htdocs/public/dons/bplc.php +++ b/htdocs/public/dons/bplc.php @@ -32,8 +32,11 @@ require("../../retourbplc.class.php"); require("../../don.class.php"); $conf = new Conf(); - -conf->db->type = $dolibarr_main_db_type; +$conf->db->type = $dolibarr_main_db_type; +$conf->db->host = $dolibarr_main_db_host; +$conf->db->name = $dolibarr_main_db_name; +$conf->db->user = $dolibarr_main_db_user; +$conf->db->pass = $dolibarr_main_db_pass; // Si type non défini (pour compatibilité avec ancienne install), on // travail avec mysql @@ -41,7 +44,7 @@ if (! $conf->db->type) { $conf->db->type = 'mysql'; } require (DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php"); -$db = new DoliDb(); +$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); $retbplc = new Retourbplc($db); diff --git a/htdocs/public/dons/depenses_code.php b/htdocs/public/dons/depenses_code.php index 00a2e1fff1c..946baa79340 100644 --- a/htdocs/public/dons/depenses_code.php +++ b/htdocs/public/dons/depenses_code.php @@ -24,7 +24,13 @@ $conf = new Conf(); -$db = new DoliDb(); +$conf->db->type = $dolibarr_main_db_type; +$conf->db->host = $dolibarr_main_db_host; +$conf->db->name = $dolibarr_main_db_name; +$conf->db->user = $dolibarr_main_db_user; +$conf->db->pass = $dolibarr_main_db_pass; + +$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); $a = setlocale(LC_TIME, "fr_FR"); $sql = "SELECT ".$db->pdate("f.datef")." as datef, s.nom, f.total, f.note, f.paye"; $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s"; diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php index 47c9298c512..7740368f485 100644 --- a/htdocs/public/dons/donateurs_code.php +++ b/htdocs/public/dons/donateurs_code.php @@ -22,7 +22,14 @@ $conf = new Conf(); -$db = new DoliDb(); +$conf->db->type = $dolibarr_main_db_type; +$conf->db->host = $dolibarr_main_db_host; +$conf->db->name = $dolibarr_main_db_name; +$conf->db->user = $dolibarr_main_db_user; +$conf->db->pass = $dolibarr_main_db_pass; + +$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); + $a = setlocale(LC_TIME, "fr_FR"); $sql = "SELECT ".$db->pdate("d.datedon")." as datedon, d.nom, d.prenom, d.amount, d.public, d.societe"; $sql .= " FROM ".MAIN_DB_PREFIX."don as d"; diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php index 084b051252d..2a4a1aa7431 100644 --- a/htdocs/public/dons/index.php +++ b/htdocs/public/dons/index.php @@ -24,8 +24,11 @@ require("../../don.class.php"); require("../../conf/conf.class.php"); $conf = new Conf(); - -conf->db->type = $dolibarr_main_db_type; +$conf->db->type = $dolibarr_main_db_type; +$conf->db->host = $dolibarr_main_db_host; +$conf->db->name = $dolibarr_main_db_name; +$conf->db->user = $dolibarr_main_db_user; +$conf->db->pass = $dolibarr_main_db_pass; // Si type non défini (pour compatibilité avec ancienne install), on // travail avec mysql @@ -36,7 +39,8 @@ require("../../lib/.$dolibarr_main_db_type.lib.php"); if ($conf->don->enabled) { - $db = new DoliDb(); + $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); + $don = new Don($db); $don->projetid = $_POST["projetid"]; diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php index 36ed995960b..e8fd35f08a7 100644 --- a/htdocs/public/dons/therm.php +++ b/htdocs/public/dons/therm.php @@ -62,7 +62,14 @@ if (file_exists ($thermlib)) */ $conf = new Conf(); - $dbt = new DoliDb(); + $conf->db->type = $dolibarr_main_db_type; + $conf->db->host = $dolibarr_main_db_host; + $conf->db->name = $dolibarr_main_db_name; + $conf->db->user = $dolibarr_main_db_user; + $conf->db->pass = $dolibarr_main_db_pass; + + $dbt = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name); + $dontherm = new Don($dbt); $actualValue = $dontherm->sum_actual(); diff --git a/htdocs/telephonie/stats/ProcessGraphClients.class.php b/htdocs/telephonie/stats/ProcessGraphClients.class.php index f61f46c72f2..21e9770ca8d 100644 --- a/htdocs/telephonie/stats/ProcessGraphClients.class.php +++ b/htdocs/telephonie/stats/ProcessGraphClients.class.php @@ -51,9 +51,11 @@ class ProcessGraphClients function ProcessGraphClients( $ident , $cpc) { + global $conf; + $this->ident = $ident; $this->cpc = $cpc; - $this->db = new DoliDb('','','','','',1); + $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,1); } function go() diff --git a/htdocs/telephonie/stats/ProcessGraphContrats.class.php b/htdocs/telephonie/stats/ProcessGraphContrats.class.php index 36c8f398f5d..173f2323d2e 100644 --- a/htdocs/telephonie/stats/ProcessGraphContrats.class.php +++ b/htdocs/telephonie/stats/ProcessGraphContrats.class.php @@ -50,9 +50,11 @@ class ProcessGraphContrats function ProcessGraphContrats( $ident , $cpc) { + global $conf; + $this->ident = $ident; $this->cpc = $cpc; - $this->db = new DoliDb('','','','','',1); + $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,1); } function go($contrat_id = 0) diff --git a/htdocs/telephonie/stats/ProcessGraphLignes.class.php b/htdocs/telephonie/stats/ProcessGraphLignes.class.php index bf7a2468d94..d5870ce7d2b 100644 --- a/htdocs/telephonie/stats/ProcessGraphLignes.class.php +++ b/htdocs/telephonie/stats/ProcessGraphLignes.class.php @@ -50,9 +50,11 @@ class ProcessGraphLignes function ProcessGraphLignes( $ident , $cpc) { + global $conf; + $this->ident = $ident; $this->cpc = $cpc; - $this->db = new DoliDb('','','','','',1); + $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,1); } function go()