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

bug #568174

Browse Source
This commit is contained in:
Alexander M. Turek
2002-07-12 21:56:01 +00:00
parent b4728b63df
commit d938e6fe95
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -4,13 +4,19 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-07-12 Alexander M. Turek <rabus@users.sourceforge.net>
* main.php3: Fixed a bug of the SHOW GRANTS patch (bug #568174: Wildcards
escaped in db name), thanks to Bj<42>rn T. Hallberg (bth).
2002-07-12 Mike Beck <mikebeck@users.sourceforge.net>
* sql.php3: only run query if we didn't ask for phpcode of sql
* sql.php3: only run query if we didn't ask for phpcode of sql.
2002-07-12 Marc Delisle <lem9@users.sourceforge.net>
* libraries/select_lang.lib.php3: add -utf-8 choices
* lang/indonesian updates, thanks to Rachim Tamsjadi
* libraries/select_lang.lib.php3: add -utf-8 choices.
* lang/indonesian updates, thanks to Rachim Tamsjadi.
* libraries/relation.lib.php3: better initialization for a variable,
thanks to Jurgen Schwietering (jurgen at schwietering.com)
thanks to Jurgen Schwietering <jurgen at schwietering.com>.
2002-07-11 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* pdf_schema.php3; tbl_printview.php3; tbl_properties_links.php3;

7
main.php3
View File

@@ -219,7 +219,8 @@ if ($server > 0) {
$rs_usr = PMA_mysql_query($local_query, $dbh);
}
if ($rs_usr) {
$re = '(^|(\\\\\\\\)+|[^\])';
$re0 = '(^|(\\\\\\\\)+|[^\])'; // non-escaped wildcards
$re1 = '(^|[^\])(\\\)+'; // escaped wildcards
while ($row = PMA_mysql_fetch_row($rs_usr)) {
$show_grants_dbname = substr($row[0], strpos($row[0], ' ON ') + 4,(strpos($row[0], '.', strpos($row[0], ' ON ')) - strpos($row[0], ' ON ') - 4));
$show_grants_str = substr($row[0],6,(strpos($row[0],' ON ')-6));
@@ -230,8 +231,8 @@ if ($server > 0) {
break;
} // end if
else if (ereg($re . '%|_', $show_grants_dbname) || !PMA_mysql_select_db($show_grants_dbname, $userlink) && @mysql_errno() != 1044) {
$show_grants_dbname = ereg_replace($re . '%', '\\1...', ereg_replace($re . '_', '\\1?', $show_grants_dbname));
$db_to_create = $show_grants_dbname;
$db_to_create = ereg_replace($re0 . '%', '\\1...', ereg_replace($re0 . '_', '\\1?', $show_grants_dbname));
$db_to_create = ereg_replace($re1 . '(%|_)', '\\1\\3', $db_to_create);
$is_create_priv = TRUE;
break;
} // end elseif