kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bugfixing mysql class user deletion management.

This commit is contained in:
Steven Mondji-Lerider 2013-06-18 11:30:11 +00:00
parent d45c4c9d93
commit 6daa431482
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bureau/class/m_mysql.php
View File

@ -320,7 +320,7 @@ class m_mysql {
* an error occured, such as db does not exist. * an error occured, such as db does not exist.
*/ */
function del_db($dbn) { function del_db($dbn) {
global $db,$err,$mem,$cuid; global $db,$err,$mem,$cuid,$L_MYSQL_DATABASE;
$err->log("mysql","del_db",$dbn); $err->log("mysql","del_db",$dbn);
$dbname=addslashes($dbn); $dbname=addslashes($dbn);
$db->query("SELECT uid FROM db WHERE db='$dbname';"); $db->query("SELECT uid FROM db WHERE db='$dbname';");
@ -336,9 +336,12 @@ class m_mysql {
$this->dbus->query("DROP DATABASE `$dbname`;"); $this->dbus->query("DROP DATABASE `$dbname`;");
$db_esc=str_replace('_','\_',$dbname); $db_esc=str_replace('_','\_',$dbname);
$db->query("DELETE FROM mysql.db WHERE Db='$db_esc';"); $this->dbus->query("DELETE FROM mysql.db WHERE Db='$db_esc';");
$db->query("select User from mysql.db where User='".$dbname."' and Db='".$db_esc."' and (Select_priv='Y' or Insert_priv='Y' or Update_priv='Y' or Delete_priv='Y' or Create_priv='Y' or Drop_priv='Y' or References_priv='Y' or Index_priv='Y' or Alter_priv='Y' or Create_tmp_table_priv='Y' or Lock_tables_priv='Y');");
if(!$db->num_rows()){ #We test if the user created with the database is associated with more than 1 database.
$this->dbus->query("select User from mysql.db where User='".$dbname."' and (Select_priv='Y' or Insert_priv='Y' or Update_priv='Y' or Delete_priv='Y' or Create_priv='Y' or Drop_priv='Y' or References_priv='Y' or Index_priv='Y' or Alter_priv='Y' or Create_tmp_table_priv='Y' or Lock_tables_priv='Y');");
if(($this->dbus->num_rows()) == 0){
#If not we can delete it.
$this->del_user($dbname); $this->del_user($dbname);
} }
return true; return true;
@ -480,11 +483,8 @@ class m_mysql {
$err->raise("mysql",_("Database user not found")); $err->raise("mysql",_("Database user not found"));
return false; return false;
} }
if($rights == "FILE"){
$grant="grant ".$rights." on ".$base.".".$table." to '".$user."'@'".$this->dbus->Client."'" ;
}else{
$grant="grant ".$rights." on `".$base."`.".$table." to '".$user."'@'".$this->dbus->Client."'" ; $grant="grant ".$rights." on `".$base."`.".$table." to '".$user."'@'".$this->dbus->Client."'" ;
}
if($pass){ if($pass){
$grant .= " identified by '".$pass."';"; $grant .= " identified by '".$pass."';";
@ -795,7 +795,7 @@ class m_mysql {
if(!$all){ if(!$all){
$db->query("SELECT name FROM dbusers WHERE name='".$user."' and enable not in ('ADMIN','HIDDEN');"); $db->query("SELECT name FROM dbusers WHERE name='".$user."' and enable not in ('ADMIN','HIDDEN');");
}else{ }else{
$db->query("SELECT name FROM dbusers WHERE name='".$user."' ;"); $db->query("SELECT name FROM dbusers WHERE uid='".$cuid."' ;");
} }
if (!$db->num_rows()) { if (!$db->num_rows()) {