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

A valid MySQL administration system may lead to have the db creation form displayed with an existing table. Bug fixed thanks to Rob Mangiafico

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-12-07 20:20:24 +00:00
parent 0f0d9cac9c
commit 69f3059fc5
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main.php3
View File

@@ -57,11 +57,10 @@ if ($server > 0) {
// } // }
$local_query = 'SELECT VERSION() as version, USER() as user'; $local_query = 'SELECT VERSION() as version, USER() as user';
$res = mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, ''); $res = mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, '');
$mysql_cur_user = mysql_result($res, 0, 'user');
$full_string = str_replace('%pma_s1%', mysql_result($res, 0, 'version'), $strMySQLServerProcess); $full_string = str_replace('%pma_s1%', mysql_result($res, 0, 'version'), $strMySQLServerProcess);
$full_string = str_replace('%pma_s2%', $server_info, $full_string); $full_string = str_replace('%pma_s2%', $server_info, $full_string);
$full_string = str_replace('%pma_s3%', $mysql_cur_user, $full_string); $full_string = str_replace('%pma_s3%', mysql_result($res, 0, 'user'), $full_string);
echo '<p><b>' . $full_string . '</b></p><br />' . "\n"; echo '<p><b>' . $full_string . '</b></p><br />' . "\n";
} // end if } // end if
@@ -158,26 +157,18 @@ $is_superuser = FALSE;
if ($server > 0) { if ($server > 0) {
// Get user's global privileges ($dbh and $userlink are links to MySQL // Get user's global privileges ($dbh and $userlink are links to MySQL
// defined in the "common.lib.php3" library) // defined in the "common.lib.php3" library)
$mysql_cur_user = substr($mysql_cur_user, 0, strpos($mysql_cur_user, '@'));
$is_create_priv = FALSE; $is_create_priv = FALSE;
$is_process_priv = FALSE; $is_process_priv = FALSE;
$is_reload_priv = FALSE; $is_reload_priv = FALSE;
$is_superuser = @mysql_query('USE mysql', $userlink); $is_superuser = @mysql_query('USE mysql', $userlink);
if ($dbh) { if ($dbh) {
$local_query = 'SELECT Create_priv, Process_priv, Reload_priv FROM mysql.user WHERE User = \'' . PMA_sqlAddslashes($mysql_cur_user) . '\''; $local_query = 'SELECT Create_priv, Process_priv, Reload_priv FROM mysql.user WHERE User = \'' . PMA_sqlAddslashes($cfgServer['user']) . '\' OR 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) {
while ($result_usr = mysql_fetch_array($rs_usr)) { $result_usr = mysql_fetch_array($rs_usr);
if (!$is_create_priv) { $is_create_priv = ($result_usr['Create_priv'] == 'Y');
$is_create_priv = ($result_usr['Create_priv'] == 'Y'); $is_process_priv = ($result_usr['Process_priv'] == 'Y');
} $is_reload_priv = ($result_usr['Reload_priv'] == 'Y');
if (!$is_process_priv) {
$is_process_priv = ($result_usr['Process_priv'] == 'Y');
}
if (!$is_reload_priv) {
$is_reload_priv = ($result_usr['Reload_priv'] == 'Y');
}
} // end while
mysql_free_result($rs_usr); mysql_free_result($rs_usr);
} // end if } // end if
} // end if } // end if
@@ -187,11 +178,11 @@ if ($server > 0) {
// the one he just dropped :) // the one he just dropped :)
// (Note: we only get here after a browser reload, I don't know why) // (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($cfgServer['user']) . '\' OR User = \'\')';
$rs_usr = mysql_query($local_query, $userlink); // 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 (@mysql_numrows($rs_usr) > 0) {
while ($row = mysql_fetch_array($rs_usr)) { while ($row = mysql_fetch_array($rs_usr)) {
if (!mysql_select_db($row['Db'], $userlink) && @mysql_errno() != 1044) { if (!mysql_select_db($row['Db'], $userlink)) {
$re = '(^|(\\\\\\\\)+|[^\])'; $re = '(^|(\\\\\\\\)+|[^\])';
$row['Db'] = ereg_replace($re . '%', '\\1...', ereg_replace($re . '_', '\\1?', $row['Db'])); $row['Db'] = ereg_replace($re . '%', '\\1...', ereg_replace($re . '_', '\\1?', $row['Db']));
$db_to_create = $row['Db']; $db_to_create = $row['Db'];