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

Merge pull request #1354 from Tithugues/b4524_q42

Browse Source 
Fix #4524: Add missing 0 initial on the "Users overview".
This commit is contained in:
Hugues Peccatte 2014-09-07 17:06:16 +02:00
commit 87b1cd1a2d
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.2.9.0 (not yet released)
- bug ajax.js responseHandler: cannot read property of null
- bug sql.js: str is undefined
- bug #4524 Allow for direct selection of "0" on the "user overview" page
4.2.8.0 (2014-08-31)
- bug #4516 Odd export behavior

48
libraries/server_privileges.lib.php
View File

@ -78,14 +78,15 @@ function PMA_rangeOfUsers($initial = '')
{
// strtolower() is used because the User field
// might be BINARY, so LIKE would be case sensitive
if (! empty($initial)) {
$ret = " WHERE `User` LIKE '"
. PMA_Util::sqlAddSlashes($initial, true) . "%'"
. " OR `User` LIKE '"
. PMA_Util::sqlAddSlashes(strtolower($initial), true) . "%'";
} else {
$ret = '';
if ($initial === null || $initial === '') {
return '';
}
$ret = " WHERE `User` LIKE '"
. PMA_Util::sqlAddSlashes($initial, true) . "%'"
. " OR `User` LIKE '"
. PMA_Util::sqlAddSlashes(strtolower($initial), true) . "%'";
return $ret;
} // end function
@ -3200,22 +3201,25 @@ function PMA_getHtmlForInitials($array_initials)
$html_output = '<table id="initials_table" cellspacing="5">'
. '<tr>';
foreach ($array_initials as $tmp_initial => $initial_was_found) {
if (! empty($tmp_initial)) {
if ($initial_was_found) {
$html_output .= '<td>'
. '<a class="ajax'
. ((isset($_REQUEST['initial'])
&& $_REQUEST['initial'] === $tmp_initial
) ? ' active' : '')
. '" href="server_privileges.php'
. PMA_URL_getCommon(array('initial' => $tmp_initial))
. '">' . $tmp_initial
. '</a>'
. '</td>' . "\n";
} else {
$html_output .= '<td>' . $tmp_initial . '</td>';
}
if ($tmp_initial === null) {
continue;
}
if (!$initial_was_found) {
$html_output .= '<td>' . $tmp_initial . '</td>';
continue;
}
$html_output .= '<td>'
. '<a class="ajax'
. ((isset($_REQUEST['initial'])
&& $_REQUEST['initial'] === $tmp_initial
) ? ' active' : '')
. '" href="server_privileges.php'
. PMA_URL_getCommon(array('initial' => $tmp_initial))
. '">' . $tmp_initial
. '</a>'
. '</td>' . "\n";
}
$html_output .= '<td>'
. '<a href="server_privileges.php'

4
server_privileges.php
View File

@ -262,7 +262,9 @@ if ($GLOBALS['is_ajax_request']
&& ! isset($_REQUEST['export'])
&& (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export')
&& (! isset($_REQUEST['adduser']) || $_add_user_error)
&& (! isset($_REQUEST['initial']) || empty($_REQUEST['initial']))
&& (! isset($_REQUEST['initial'])
|| $_REQUEST['initial'] === null
|| $_REQUEST['initial'] === '')
&& ! isset($_REQUEST['showall'])
&& ! isset($_REQUEST['edit_user_dialog'])
&& ! isset($_REQUEST['edit_user_group_dialog'])