The branch, master has been updated via aaa8b69055e036c4dbf254be1214eda9f9b1bbb0 (commit) via ecfde7d878203975b5fb45f2b6f02aaa80ca36b0 (commit) from 8b9b538a6bb0ffa0f64e32824c6a3156799aa076 (commit)

- Log ----------------------------------------------------------------- commit aaa8b69055e036c4dbf254be1214eda9f9b1bbb0 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 11:35:34 2011 +0200

Whitespace fixup

commit ecfde7d878203975b5fb45f2b6f02aaa80ca36b0 Author: Michal Čihař mcihar@suse.cz Date: Thu Jul 21 11:34:45 2011 +0200

Function name to match coding standards

-----------------------------------------------------------------------

Summary of changes: server_privileges.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php index 5c74025..7433c46 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -161,7 +161,7 @@ function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) { * @param string the user's initial * @return string the generated condition */ -function PMA_RangeOfUsers($initial = '') +function PMA_rangeOfUsers($initial = '') { // strtolower() is used because the User field // might be BINARY, so LIKE would be case sensitive @@ -1358,7 +1358,7 @@ $link_export = '<a class="export_user_anchor ' . $conditional_class . '" href="s * If we are in an Ajax request for Create User/Edit User/Revoke User/Flush Privileges, * show $message and exit. */ -if( $GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) { +if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_REQUEST['adduser']) || $_add_user_error) && ! isset($_REQUEST['initial']) && ! isset($_REQUEST['showall']) && ! isset($_REQUEST['edit_user_dialog']) && ! isset($_REQUEST['db_specific'])) {

if(isset($sql_query)) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); @@ -1457,7 +1457,7 @@ if (isset($_REQUEST['export'])) { } echo '</textarea>'; unset($username, $hostname, $grants, $one_grant); - if( $GLOBALS['is_ajax_request']) { + if ($GLOBALS['is_ajax_request']) { exit; } } @@ -1475,7 +1475,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs " IF(`Password` = _latin1 '', 'N', 'Y') AS 'Password'" . ' FROM `mysql`.`user`';

- $sql_query .= (isset($initial) ? PMA_RangeOfUsers($initial) : ''); + $sql_query .= (isset($initial) ? PMA_rangeOfUsers($initial) : '');

$sql_query .= ' ORDER BY `User` ASC, `Host` ASC;'; $res = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_STORE); @@ -1516,7 +1516,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $db_rights_sqls = array(); foreach ($tables_to_search_for_users as $table_search_in) { if (in_array($table_search_in, $tables)) { - $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`' . $table_search_in . '` ' . (isset($initial) ? PMA_RangeOfUsers($initial) : ''); + $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`' . $table_search_in . '` ' . (isset($initial) ? PMA_rangeOfUsers($initial) : ''); } }

@@ -1552,7 +1552,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs * In an Ajax request, we don't need to show this. Also not necassary if there is less than 20 privileges */

- if( $GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) { + if ($GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) {

// initialize to false the letters A-Z for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) { @@ -1704,7 +1704,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' </fieldset>' . "\n"; } // end if (display overview)

- if( $GLOBALS['is_ajax_request'] ) { + if ($GLOBALS['is_ajax_request']) { exit; }

@@ -2119,7 +2119,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs '1' => __('Create database with same name and grant all privileges'), '2' => __('Grant all privileges on wildcard name (username\_%)'));

- if ( !empty($dbname) ) { + if (! empty($dbname) ) { $choices['3'] = sprintf( __('Grant all privileges on database &quot;%s&quot;'), htmlspecialchars($dbname)); $default_choice = 3; echo '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '" />' . "\n";

hooks/post-receive