From 8a6b8c09f150e9318de2e717dca9ff5f56ac25ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 16 May 2008 18:56:19 +0000
Subject: [PATCH] Fix: Bad value in log
---
htdocs/install/etape1.php | 2 +-
htdocs/lib/databases/mysql.lib.php | 5 +++--
htdocs/lib/databases/mysqli.lib.php | 11 ++++++-----
htdocs/lib/databases/pgsql.lib.php | 7 ++++---
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 8ee85866196..eef483ade16 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -313,7 +313,7 @@ if ($_POST["action"] == "set")
{
if ($db->connected)
{
- $result=$db->DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass);
+ $result=$db->DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name);
if ($result > 0)
{
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 30123e9b80f..ad6c2258cc3 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -840,13 +840,14 @@ class DoliDb
}
/**
- \brief Cr�e un utilisateur
+ \brief Create a user
\param dolibarr_main_db_host Ip serveur
\param dolibarr_main_db_user Nom user � cr�er
\param dolibarr_main_db_pass Mot de passe user � cr�er
+ \param dolibarr_main_db_name Database name where user must be granted
\return int <0 si KO, >=0 si OK
*/
- function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass)
+ function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
{
$sql = "INSERT INTO user ";
$sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv)";
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index d36c3ff93eb..b41e94fb90e 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -853,20 +853,21 @@ class DoliDb
}
/**
- \brief Cr�e un utilisateur
+ \brief Create a user
\param dolibarr_main_db_host Ip serveur
\param dolibarr_main_db_user Nom user � cr�er
\param dolibarr_main_db_pass Mot de passe user � cr�er
+ \param dolibarr_main_db_name Database name where user must be granted
\return int <0 si KO, >=0 si OK
*/
- function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass)
+ function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
{
$sql = "INSERT INTO user ";
$sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv)";
$sql.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_user',password('$dolibarr_main_db_pass')";
$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y');";
- dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql);
+ dolibarr_syslog("mysqli.lib::DDLCreateUser sql=".$sql);
$resql=$this->query($sql);
if (! $resql)
{
@@ -878,7 +879,7 @@ class DoliDb
$sql.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_name','$dolibarr_main_db_user'";
$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y');";
- dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql);
+ dolibarr_syslog("mysqli.lib::DDLCreateUser sql=".$sql);
$resql=$this->query($sql);
if (! $resql)
{
@@ -887,7 +888,7 @@ class DoliDb
$sql="FLUSH Privileges";
- dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql);
+ dolibarr_syslog("mysqli.lib::DDLCreateUser sql=".$sql);
$resql=$this->query($sql);
return 1;
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index cecbc1d0845..aa325b33436 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -633,17 +633,18 @@ class DoliDb
/**
- \brief Cr�e un utilisateur
+ \brief Create a user
\param dolibarr_main_db_host Ip serveur
\param dolibarr_main_db_user Nom user � cr�er
\param dolibarr_main_db_pass Mot de passe user � cr�er
+ \param dolibarr_main_db_name Database name where user must be granted
\return int <0 si KO, >=0 si OK
*/
- function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass)
+ function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
{
$sql = "create user \"".$dolibarr_main_db_user."\" with password '".$dolibarr_main_db_pass."'";
- dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql);
+ dolibarr_syslog("pgsql.lib::DDLCreateUser sql=".$sql);
$resql=$this->query($sql);
if (! $resql)
{
--
GitLab