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

Fix: Correction inclusion inutile

Browse Source
This commit is contained in:
Laurent Destailleur 2007-07-13 12:57:07 +00:00
parent 7e6894734d
commit 7cdbc4af0b
4 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/lib/databases/mysql.lib.php
View File

@ -118,15 +118,25 @@ class DoliDb
*/ */
function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0) function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0)
{ {
global $conf,$langs; global $conf,$langs;
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php";
if (file_exists($conffile)) { /* Ce test est inutile. En effet, si DOL_DOCUMENT_ROOT est défini, cela signifie */
include($conffile); /* obligatoirement que le fichier conf a deja été chargée puisque cette constante est */
$this->forcecharset=$character_set_database; /* definie a partir du contenu du fichier conf.php */
$this->forcecollate=$collation_connection; /* Et toutes les infos sont chargés dans l'objet conf */
$this->db_user=$dolibarr_main_db_user; /*
} if (file_exists($conffile)) {
$this->transaction_opened=0; include($conffile);
$this->forcecharset=$character_set_database;
$this->forcecollate=$collation_connection;
$this->db_user=$dolibarr_main_db_user;
}
*/
$this->forcecharset=$conf->character_set_client;
$this->forcecollate=$conf->collation_connection;
$this->db_user=$conf->db->user;
$this->transaction_opened=0;
if (! function_exists("mysql_connect")) if (! function_exists("mysql_connect"))
{ {

11
htdocs/lib/databases/mysqli.lib.php
View File

@ -119,13 +119,22 @@ class DoliDb
{ {
global $conf,$langs; global $conf,$langs;
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php"; /* Ce test est inutile. En effet, si DOL_DOCUMENT_ROOT est défini, cela signifie */
/* obligatoirement que le fichier conf a deja été chargée puisque cette constante est */
/* definie a partir du contenu du fichier conf.php */
/* Et toutes les infos sont chargés dans l'objet conf */
/*
if (file_exists($conffile)) { if (file_exists($conffile)) {
include($conffile); include($conffile);
$this->forcecharset=$character_set_database; $this->forcecharset=$character_set_database;
$this->forcecollate=$collation_connection; $this->forcecollate=$collation_connection;
$this->db_user=$dolibarr_main_db_user; $this->db_user=$dolibarr_main_db_user;
} }
*/
$this->forcecharset=$conf->character_set_client;
$this->forcecollate=$conf->collation_connection;
$this->db_user=$conf->db->user;
$this->transaction_opened=0; $this->transaction_opened=0;
//print "Name DB: $host,$user,$pass,$name<br>"; //print "Name DB: $host,$user,$pass,$name<br>";

15
htdocs/lib/databases/pgsql.lib.php
View File

@ -75,12 +75,23 @@ class DoliDb
function DoliDb($type='pgsql', $host, $user, $pass, $name='') function DoliDb($type='pgsql', $host, $user, $pass, $name='')
{ {
global $conf,$langs; global $conf,$langs;
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php";
if (file_exists($conffile)) { /* Ce test est inutile. En effet, si DOL_DOCUMENT_ROOT est défini, cela signifie */
/* obligatoirement que le fichier conf a deja été chargée puisque cette constante est */
/* definie a partir du contenu du fichier conf.php */
/* Et toutes les infos sont chargés dans l'objet conf */
/*
if (file_exists($conffile)) {
include($conffile); include($conffile);
$this->forcecharset=$character_set_database; $this->forcecharset=$character_set_database;
$this->forcecollate=$collation_connection;
$this->db_user=$dolibarr_main_db_user; $this->db_user=$dolibarr_main_db_user;
} }
*/
$this->forcecharset=$conf->character_set_client;
$this->forcecollate=$conf->collation_connection;
$this->db_user=$conf->db->user;
$this->transaction_opened=0; $this->transaction_opened=0;
//print "Name DB: $host,$user,$pass,$name<br>"; //print "Name DB: $host,$user,$pass,$name<br>";

10
htdocs/master.inc.php
View File

@ -105,7 +105,7 @@ if ($dolibarr_main_db_encrypted_pass) $dolibarr_main_db_pass = dolibarr_decode($
require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php"); require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php");
$conf = new Conf(); $conf = new Conf();
// On defini tous les parametres de conf // Identifiant propres au serveur base de donnee
$conf->db->host = $dolibarr_main_db_host; $conf->db->host = $dolibarr_main_db_host;
$conf->db->name = $dolibarr_main_db_name; $conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user; $conf->db->user = $dolibarr_main_db_user;
@ -114,10 +114,14 @@ if (! isset($dolibarr_main_db_type) && ! $dolibarr_main_db_type) $dolibarr_main_
$conf->db->type = $dolibarr_main_db_type; $conf->db->type = $dolibarr_main_db_type;
if (! isset($dolibarr_main_db_charset) && ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='ISO-8859-1'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql' if (! isset($dolibarr_main_db_charset) && ! $dolibarr_main_db_charset) $dolibarr_main_db_charset='ISO-8859-1'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
$conf->db->character_set=$dolibarr_main_db_charset; $conf->db->character_set=$dolibarr_main_db_charset;
if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1';
$conf->character_set_client=$character_set_client;
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
$conf->db->prefix = $dolibarr_main_db_prefix; $conf->db->prefix = $dolibarr_main_db_prefix;
// Identifiant propre au client
if (! isset($character_set_client) || ! $character_set_client) $character_set_client='ISO-8859-1';
$conf->character_set_client=$character_set_client;
if (! isset($collation_connection) || ! $collation_connection) $collation_connection='latin1_swedish_ci';
$conf->collation_connection=$collation_connection;
// Identifiant autres
$conf->main_authentication = $dolibarr_main_authentication; $conf->main_authentication = $dolibarr_main_authentication;
// Defini prefix // Defini prefix