Skip to content
Snippets Groups Projects
Commit 8a6b8c09 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Bad value in log

parent b96782c2
No related branches found
No related tags found
No related merge requests found
...@@ -313,7 +313,7 @@ if ($_POST["action"] == "set") ...@@ -313,7 +313,7 @@ if ($_POST["action"] == "set")
{ {
if ($db->connected) 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) if ($result > 0)
{ {
......
...@@ -840,13 +840,14 @@ class DoliDb ...@@ -840,13 +840,14 @@ class DoliDb
} }
/** /**
\brief Cre un utilisateur \brief Create a user
\param dolibarr_main_db_host Ip serveur \param dolibarr_main_db_host Ip serveur
\param dolibarr_main_db_user Nom user crer \param dolibarr_main_db_user Nom user crer
\param dolibarr_main_db_pass Mot de passe user crer \param dolibarr_main_db_pass Mot de passe user crer
\param dolibarr_main_db_name Database name where user must be granted
\return int <0 si KO, >=0 si OK \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 = "INSERT INTO user ";
$sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv)"; $sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv)";
......
...@@ -853,20 +853,21 @@ class DoliDb ...@@ -853,20 +853,21 @@ class DoliDb
} }
/** /**
\brief Cre un utilisateur \brief Create a user
\param dolibarr_main_db_host Ip serveur \param dolibarr_main_db_host Ip serveur
\param dolibarr_main_db_user Nom user crer \param dolibarr_main_db_user Nom user crer
\param dolibarr_main_db_pass Mot de passe user crer \param dolibarr_main_db_pass Mot de passe user crer
\param dolibarr_main_db_name Database name where user must be granted
\return int <0 si KO, >=0 si OK \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 = "INSERT INTO user ";
$sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv)"; $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.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_user',password('$dolibarr_main_db_pass')";
$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y');"; $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); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
...@@ -878,7 +879,7 @@ class DoliDb ...@@ -878,7 +879,7 @@ class DoliDb
$sql.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_name','$dolibarr_main_db_user'"; $sql.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_name','$dolibarr_main_db_user'";
$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y');"; $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); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
...@@ -887,7 +888,7 @@ class DoliDb ...@@ -887,7 +888,7 @@ class DoliDb
$sql="FLUSH Privileges"; $sql="FLUSH Privileges";
dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql); dolibarr_syslog("mysqli.lib::DDLCreateUser sql=".$sql);
$resql=$this->query($sql); $resql=$this->query($sql);
return 1; return 1;
......
...@@ -633,17 +633,18 @@ class DoliDb ...@@ -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_host Ip serveur
\param dolibarr_main_db_user Nom user à créer \param dolibarr_main_db_user Nom user à créer
\param dolibarr_main_db_pass Mot de passe 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 \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."'"; $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); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment