diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 8ee858661960edf8ceb514ee79c3c35c8e5bf2bf..eef483ade167d915cb87afa501aaf9f0d894d1e5 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 30123e9b80f080c63aeea46472cc4481e8b26340..ad6c2258cc37b8d38eb1546063794aed230b7012 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 d36c3ff93ebacf17033853e6dbf272b9df111948..b41e94fb90ef74193fcb31e1d27c38c6945f318a 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 cecbc1d084502763898f6616021529d6a7b0725c..aa325b33436bc8b19fdf7481512cf9885367244d 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) {