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

bug 1003238 cannot manipulate usernames containing @

Browse Source
This commit is contained in:
Marc Delisle
2004-09-11 20:46:25 +00:00
parent 4b039560d3
commit efb633ff1a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2004-09-11 Marc Delisle <lem9@users.sourceforge.net> 2004-09-11 Marc Delisle <lem9@users.sourceforge.net>
* lang/dutch: small update * lang/dutch: small update
* lang/chinese_simplified: updated, thanks to Simon - simon2san * lang/chinese_simplified: updated, thanks to Simon - simon2san
* server_privileges.php: bug #1003238, cannot manipulate a username
like "example@nothost" where the "@" is part of the username
2004-09-10 Alexander M. Turek <me@derrabus.de> 2004-09-10 Alexander M. Turek <me@derrabus.de>
* lang/german-*.inc.php: grammar. * lang/german-*.inc.php: grammar.

8
server_privileges.php
View File

@@ -802,14 +802,16 @@ if (!empty($change_pw)) {
* Deletes users * Deletes users
* (Changes / copies a user, part IV) * (Changes / copies a user, part IV)
*/ */
$user_host_separator = chr(27);
if (!empty($delete) || (!empty($change_copy) && $mode < 4)) { if (!empty($delete) || (!empty($change_copy) && $mode < 4)) {
if (!empty($change_copy)) { if (!empty($change_copy)) {
$selected_usr = array($old_username . '@' . $old_hostname); $selected_usr = array($old_username . $user_host_separator . $old_hostname);
} else { } else {
$queries = array(); $queries = array();
} }
for ($i = 0; isset($selected_usr[$i]); $i++) { for ($i = 0; isset($selected_usr[$i]); $i++) {
list($this_user, $this_host) = explode('@', $selected_usr[$i]); list($this_user, $this_host) = explode($user_host_separator, $selected_usr[$i]);
$queries[] = '# ' . sprintf($strDeleting, '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...'; $queries[] = '# ' . sprintf($strDeleting, '\'' . $this_user . '\'@\'' . $this_host . '\'') . ' ...';
if ($mode == 2) { if ($mode == 2) {
// The SHOW GRANTS query may fail if the user has not been loaded // The SHOW GRANTS query may fail if the user has not been loaded
@@ -960,7 +962,7 @@ if (empty($adduser) && empty($checkprivs)) {
$useBgcolorOne = TRUE; $useBgcolorOne = TRUE;
for ($i = 0; $row = PMA_DBI_fetch_assoc($res); $i++) { for ($i = 0; $row = PMA_DBI_fetch_assoc($res); $i++) {
echo ' <tr>' . "\n" echo ' <tr>' . "\n"
. ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_' . $i . '" value="' . htmlspecialchars($row['User'] . '@' . $row['Host']) . '"' . (empty($checkall) ? '' : ' checked="checked"') . ' /></td>' . "\n" . ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_' . $i . '" value="' . htmlspecialchars($row['User'] . $user_host_separator . $row['Host']) . '"' . (empty($checkall) ? '' : ' checked="checked"') . ' /></td>' . "\n"
. ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><label for="checkbox_sel_users_' . $i . '">' . (empty($row['User']) ? '<span style="color: #FF0000">' . $strAny . '</span>' : htmlspecialchars($row['User'])) . '</label></td>' . "\n" . ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><label for="checkbox_sel_users_' . $i . '">' . (empty($row['User']) ? '<span style="color: #FF0000">' . $strAny . '</span>' : htmlspecialchars($row['User'])) . '</label></td>' . "\n"
. ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . htmlspecialchars($row['Host']) . '</td>' . "\n"; . ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . htmlspecialchars($row['Host']) . '</td>' . "\n";
$privs = PMA_extractPrivInfo($row, TRUE); $privs = PMA_extractPrivInfo($row, TRUE);