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

do not display password No if this is not a real user definition

Browse Source
This commit is contained in:
Marc Delisle
2005-10-31 13:39:33 +00:00
parent e5d60f74e3
commit 0a7036cfa1
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-10-31 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: do not display No under the Password column
if this is not a "real user" definition
2005-10-31 Michal Čihař <michal@cihar.com>
* libraries/select_lang.lib.php: Simplify code.
* libraries/common.lib.php: Allow collation change for ENUM and SET

17
server_privileges.php
View File

@@ -1322,7 +1322,7 @@ if (empty($adduser) && empty($checkprivs)) {
$user_defaults = array(
'User' => '',
'Host' => '%',
'Password' => 'N',
'Password' => '?',
'Grant_priv' => 'N',
'privs' => array( 'USAGE' ),
);
@@ -1427,7 +1427,20 @@ if (empty($adduser) && empty($checkprivs)) {
. ' <td><input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_' . $i . '" value="' . str_replace( chr(27), '&#27;', htmlentities($host['User'] . $user_host_separator . $host['Host'] ) ) . '"' . (empty($GLOBALS['checkall']) ? '' : ' checked="checked"') . ' /></td>' . "\n"
. ' <td><label for="checkbox_sel_users_' . $i . '">' . (empty($host['User']) ? '<span style="color: #FF0000">' . $GLOBALS['strAny'] . '</span>' : htmlspecialchars($host['User'])) . '</label></td>' . "\n"
. ' <td>' . htmlspecialchars($host['Host']) . '</td>' . "\n";
echo ' <td>' . ($host['Password'] == 'Y' ? $GLOBALS['strYes'] : '<span style="color: #FF0000">' . $GLOBALS['strNo'] . '</span>') . '</td>' . "\n"
echo ' <td>';
switch ($host['Password']) {
case 'Y':
echo $GLOBALS['strYes'];
break;
case 'N':
echo '<span style="color: #FF0000">' . $GLOBALS['strNo'] . '</span>';
break;
// this happens if this is a definition not coming from mysql.user
default:
echo '--'; // in future version, replace by "not present"
break;
} // end switch
echo '</td>' . "\n"
. ' <td><tt>' . "\n"
. ' ' . implode( ',' . "\n" . ' ', $host['privs'] ) . "\n"
. ' </tt></td>' . "\n"