diff --git a/ChangeLog b/ChangeLog index 46e6eeba78..0b6ea0fc55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ phpMyAdmin - ChangeLog + rfe #1595 make professional code editor suggestion + rfe #1606 processlist filter + rfe Change tracking activation status from db level tracking page ++ rfe #1207 Export users associated with a specific schema/database 4.3.11.0 (not yet released) - bug #4774 SQL links are completely wrong diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index adb2d66eeb..d3c8c53399 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -1867,8 +1867,9 @@ function PMA_getHtmlForSpecificDbPrivileges($db) $html_output = ''; if ($GLOBALS['is_superuser']) { // check the privileges for a particular database. - $html_output = '
' - . '
' . "\n"; + $html_output = ''; + $html_output .= PMA_URL_getHiddenInputs($db); + $html_output .= '
'; $html_output .= '' . "\n" . PMA_Util::getIcon('b_usrcheck.png') . ' ' @@ -1886,9 +1887,19 @@ function PMA_getHtmlForSpecificDbPrivileges($db) $html_output .= PMA_getHtmlForPrivsTableHead(); $privMap = PMA_getPrivMap($db); $html_output .= PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db); - $html_output .= '' - . '
' - . '' . "\n"; + $html_output .= ''; + + $html_output .= '
'; + $html_output .= PMA_Util::getWithSelected( + $GLOBALS['pmaThemeImage'], $GLOBALS['text_dir'], "usersForm" + ); + $html_output .= PMA_Util::getButtonOrImage( + 'submit_mult', 'mult_submit', 'submit_mult_export', + __('Export'), 'b_tblexport.png', 'export' + ); + + $html_output .= '
'; + $html_output .= ''; } else { $html_output .= PMA_getHtmlForViewUsersError(); } @@ -1922,6 +1933,7 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table) if ($GLOBALS['is_superuser']) { // check the privileges for a particular table. $html_output = '
'; + $html_output .= PMA_URL_getHiddenInputs($db, $table); $html_output .= '
'; $html_output .= '' . PMA_Util::getIcon('b_usrcheck.png') @@ -1953,6 +1965,16 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table) PMA_mergePrivMapFromResult($privMap, $res); $html_output .= PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db); $html_output .= ''; + + $html_output .= '
'; + $html_output .= PMA_Util::getWithSelected( + $GLOBALS['pmaThemeImage'], $GLOBALS['text_dir'], "usersForm" + ); + $html_output .= PMA_Util::getButtonOrImage( + 'submit_mult', 'mult_submit', 'submit_mult_export', + __('Export'), 'b_tblexport.png', 'export' + ); + $html_output .= '
'; $html_output .= '
'; } else { @@ -2025,7 +2047,9 @@ function PMA_mergePrivMapFromResult(&$privMap, $result) function PMA_getHtmlForPrivsTableHead() { return '' - . '' . __('User') . '' + . '' + . '' + . '' . __('User') . '' . '' . __('Host') . '' . '' . __('Type') . '' . '' . __('Privileges') . '' @@ -2059,6 +2083,7 @@ function PMA_getHtmlForViewUsersError() function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db) { $html_output = ''; + $index_checkbox = 0; $odd_row = true; if (empty($privMap)) { $html_output .= '' @@ -2076,6 +2101,12 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db) $html_output .= ''; + $value = htmlspecialchars($current_user . '' . $current_host); + $html_output .= '' + . '' . "\n"; + // user $html_output .= ' 1) {