Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Les variables d'tat de la fonction connect (this->connected,this->database_selected et this->ok n'tait pas toujours toutes les 3 positionnes).

Browse Source
This commit is contained in:
Laurent Destailleur
2004-02-23 22:40:27 +00:00
parent f2560aa0d7
commit f9411c30ed
1 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
htdocs/lib/mysql.lib.php
View File

@@ -26,55 +26,68 @@ class DoliDb {
var $db, $results, $ok, $connected, $database_selected;
Function DoliDb($type = 'mysql', $host = '', $user = '', $pass = '', $name = '')
// Se connecte au serveur et <20>ventuellement <20> une base (si sp<73>cifi<66>)
// Renvoie 1 en cas de succ<63>s, 0 sinon
{
global $conf;
// print "Name DB : $host, $user, $pass, $name<br>";
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<br>";
if ($host == '')
{
$host = $conf->db->host;
}
if ($user == '')
{
$user = $conf->db->user;
}
if ($pass == '')
{
$pass = $conf->db->pass;
}
if ($name == '')
{
$name = $conf->db->name;
}
// Essai connexion serveur
$this->db = $this->connect($host, $user, $pass);
if ($this->db)
{
$this->connected = 1;
$this->ok = 1;
}
else
{
$this->connected = 0;
$this->ok = 0;
}
$this->db = $this->connect($host, $user, $pass);
if ($this->db)
{
$this->connected = 1;
}
else
{
$this->connected = 0;
return 0;
}
$ret = $this->select_db($name);
if ($ret == 1)
{
$this->database_selected = 1;
$this->ok = 1;
}
else
{
$this->database_selected = 0;
$this->ok = 0;
}
return $ret;
// Si connexion serveur ok et si connexion base demand<6E>e, on essaie connexion base
if ($this->connected && $name) {
if ($this->select_db($name) == 1)
{
$this->database_selected = 1;
$this->ok = 1;
}
else
{
$this->database_selected = 0;
$this->ok = 0;
}
}
else {
// Pas de selection de base demand<6E>e, mais tout est ok
$this->database_selected = 0;
$this->ok = 1;
}
return $this->ok;
}
/*
*
@@ -89,6 +102,7 @@ class DoliDb {
Function connect($host, $login, $passwd)
{
$this->db = @mysql_connect($host, $login, $passwd);
//print "Resultat fonction connect: ".$this->db;
return $this->db;
}
/*