nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved fix against bug with privileges containing escaped wilcards in database names

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-04-13 07:36:03 +00:00
parent 1a4817fb85
commit cb97b5c43e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.php3
View File

@@ -188,17 +188,17 @@ if ($server > 0) {
// If the user has Create priv on a inexistant db, show him in the dialog // If the user has Create priv on a inexistant db, show him in the dialog
// the first inexistant db name that we find, in most cases it's probably // the first inexistant db name that we find, in most cases it's probably
// the one he just dropped :) // the one he just dropped :)
// (Note: we only get here after a browser reload, I don't know why)
if (!$is_create_priv) { if (!$is_create_priv) {
$local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE Create_priv = \'Y\' AND User = \'' . PMA_sqlAddslashes($mysql_cur_user) . '\''; $local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE Create_priv = \'Y\' AND User = \'' . PMA_sqlAddslashes($mysql_cur_user) . '\'';
$rs_usr = mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE); $rs_usr = mysql_query($local_query, $dbh); // Debug: or PMA_mysqlDie('', $local_query, FALSE);
if ($rs_usr) { if ($rs_usr) {
$re = '(^|(\\\\\\\\)+|[^\])'; $re0 = '(^|(\\\\\\\\)+|[^\])';
$re1 = '(^|[^\])(\\\)+';
while ($row = mysql_fetch_array($rs_usr)) { while ($row = mysql_fetch_array($rs_usr)) {
if (ereg($re . '%|_', $row['Db']) if (ereg($re0 . '(%|_)', $row['Db'])
|| !mysql_select_db($row['Db'], $userlink) && @mysql_errno() != 1044) { || (!mysql_select_db(ereg_replace($re1 . '(%|_)', '\\1\\3', $row['Db']), $userlink) && @mysql_errno() != 1044)) {
$db_to_create = ereg_replace($re . '%', '\\1...', ereg_replace($re . '_', '\\1?', $row['Db'])); $db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $row['Db']));
$db_to_create = ereg_replace('\\\(%|_)', '\\1', $db_to_create); $db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
$is_create_priv = TRUE; $is_create_priv = TRUE;
break; break;
} // end if } // end if