diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php index 6cfdf4bd5ad..a7e17d58b62 100644 --- a/htdocs/lib/mysql.lib.php +++ b/htdocs/lib/mysql.lib.php @@ -469,9 +469,11 @@ class DoliDb { } -function getdsn() +function getdsn($db_type,$db_user,$db_pass,$db_host,$dbname) { - $pear = $dolibarr_main_db_type.'://'.$dolibarr_main_db_user.':'.$dolibarr_main_db_pass.'@'.$dolibarr_main_db_host.'/'.$dolibarr_main_db_name; + $pear = $db_type.'://'.$db_user.':'.$db_pass.'@'. + $db_host.'/'.$db_name; + return $pear; } } diff --git a/htdocs/lib/pgsql.lib.php b/htdocs/lib/pgsql.lib.php index 68cb483df4e..1b53536bf8a 100644 --- a/htdocs/lib/pgsql.lib.php +++ b/htdocs/lib/pgsql.lib.php @@ -488,11 +488,13 @@ class DoliDb { return pg_affected_rows($this->db); } - function getdsn() - { - $pear = $dolibarr_main_db_type.'://'.$dolibarr_main_db_user.':'.$dolibarr_main_db_pass.'@'.$dolibarr_main_db_host.'/'.$dolibarr_main_db_name; - return $pear; - } - + function getdsn($db_type,$db_user,$db_pass,$db_host,$dbname) + { + $pear = $db_type.'://'.$db_user.':'.$db_pass.'@'. + $db_host.'/'.$db_name; + + return $pear; + } + } ?> diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 5029db29998..18a48f8965f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -129,19 +129,21 @@ else require_once DOL_DOCUMENT_ROOT."/includes/pear/Auth/Auth.php"; $params = array( - "dsn" => $conf->db->getdsn(), +// "dsn" => $conf->db->getdsn(), + "dsn" => $db->getdsn($dolibarr_main_db_type,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_host,$dolibarr_main_db_name), "table" => MAIN_DB_PREFIX."user", "usernamecol" => "login", "passwordcol" => "pass", "cryptType" => "none", ); - + $aDol = new DOLIAuth("DB", $params, "loginfunction"); $aDol->start(); $result = $aDol->getAuth(); if ($result) { // Authentification Auth OK, on va chercher les infos du user + dolibarr_syslog ("auth demarre va chercher les infos du user"); $user->fetch($aDol->getUsername()); } else