diff --git a/ChangeLog b/ChangeLog index 82197fdcd..6b768e443 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,15 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-10-12 Loïc Chapeaux + * Most of the scripts have been modified to fix bug #468749 (Left Frame not + expanding in iCab). This means the splitter between variables in urls is + now "&" rather than "&" according to the xhtml1.0 specifications. + * main.php3: fixed some warnings and some bugs in the way servers are + displayed in the servers choice combo. + * libraries/common.lib.php3, lines 340-343: fixed erroneous variable name. + * libraries/bookmarks.lib.php3, line 29: removed unnecessary line of code. + 2001-10-09 Loïc Chapeaux * user_details.php3, lines 1232-1245 & 1254: fixed some bugs with modifying user privileges. diff --git a/db_create.php3 b/db_create.php3 index 6d07306bc..5da92d55f 100755 --- a/db_create.php3 +++ b/db_create.php3 @@ -15,7 +15,7 @@ require('./header.inc.php3'); */ $err_url = 'main.php3' . '?lang=' . $lang - . '&server=' . $server; + . '&server=' . $server; /** diff --git a/db_details.php3 b/db_details.php3 index c9e662cfb..441518b8d 100755 --- a/db_details.php3 +++ b/db_details.php3 @@ -15,11 +15,11 @@ require('./libraries/bookmark.lib.php3'); */ $err_url_0 = 'main.php3' . '?lang=' . $lang - . '&server=' . $server; + . '&server=' . $server; $err_url = 'db_details.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db); + . '&server=' . $server + . '&db=' . urlencode($db); /** @@ -169,10 +169,10 @@ else if (MYSQL_INT_VERSION >= 32300) { $table = $sts_data['Name']; // Sets parameters for links $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&goto=db_details.php3'; + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&goto=db_details.php3'; $bgcolor = ($i++ % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; echo "\n"; ?> @@ -184,7 +184,7 @@ else if (MYSQL_INT_VERSION >= 32300) {     - + @@ -200,12 +200,12 @@ else if (MYSQL_INT_VERSION >= 32300) { - - @@ -352,10 +352,10 @@ else { while ($i < $num_tables) { // Sets parameters for links $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($tables[$i]) - . '&goto=db_details.php3'; + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($tables[$i]) + . '&goto=db_details.php3'; $bgcolor = ($i % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo; echo "\n"; ?> @@ -367,7 +367,7 @@ else {    - + @@ -379,10 +379,10 @@ else { - + - + @@ -419,9 +419,9 @@ echo "\n"; * Database work */ $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&goto=db_details.php3'; + . '&server=' . $server + . '&db=' . urlencode($db) + . '&goto=db_details.php3'; if (isset($show_query) && $show_query == 'y') { // This script has been called by read_dump.php3 if (isset($sql_query_cpy)) { @@ -670,7 +670,7 @@ if ($cfgAllowUserDropDatabase || $is_superuser) { ?>
  • - diff --git a/db_printview.php3 b/db_printview.php3 index 6cec04323..4b1dccd73 100755 --- a/db_printview.php3 +++ b/db_printview.php3 @@ -14,8 +14,8 @@ require('./header.inc.php3'); */ $err_url = 'db_details.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db); + . '&server=' . $server + . '&db=' . urlencode($db); /** diff --git a/db_stats.php3 b/db_stats.php3 index ed3703cea..965f445e2 100644 --- a/db_stats.php3 +++ b/db_stats.php3 @@ -15,7 +15,7 @@ if ((!empty($submit_mult) && isset($selected_db)) || isset($mult_btnDrop)) { $err_url = 'db_stats.php3' . '?lang=' . $lang - . '&server=' . $server; + . '&server=' . $server; $action = 'db_stats.php3'; $show_query = 'y'; include('./mult_submits.inc.php3'); @@ -69,7 +69,7 @@ function pmaDbCmp($a, $b) if ($server > 0) { // Get the valid databases list $num_dbs = count($dblist); - $dbs = @mysql_list_dbs() or mysql_die('', 'mysql_list_dbs()', '', 'main.php3?lang' . $lang . '&server=' . $server); + $dbs = @mysql_list_dbs() or mysql_die('', 'mysql_list_dbs()', '', 'main.php3?lang' . $lang . '&server=' . $server); while ($a_db = mysql_fetch_object($dbs)) { if (!$num_dbs) { $dblist[] = $a_db->Database; @@ -128,7 +128,7 @@ if ($server > 0) { */ if ($num_dbs > 0) { // Defines the urls used to sort the table - $common_url = 'db_stats.php3?lang=' . $lang . '&server=' . $server; + $common_url = 'db_stats.php3?lang=' . $lang . '&server=' . $server; if (empty($sort_by)) { $sort_by = 'db_name'; $sort_order = 'asc'; @@ -176,27 +176,27 @@ if ($num_dbs > 0) {     - +     - +     - +     - +     - +   @@ -258,7 +258,7 @@ if ($num_dbs > 0) { echo ' ' . "\n"; echo '   ' . "\n"; echo ' ' . "\n"; - echo '  ' . htmlentities($db_name) . ' ' . "\n"; + echo '  ' . htmlentities($db_name) . ' ' . "\n"; echo '  ' . $dbs_array[$db_name][0] . ' ' . "\n"; echo '  ' . $data_size . ' ' . $data_unit . ' ' . "\n"; echo '  ' . $idx_size . ' ' . $idx_unit . ' ' . "\n"; diff --git a/index.php3 b/index.php3 index f1e60fd64..da408992f 100755 --- a/index.php3 +++ b/index.php3 @@ -29,8 +29,8 @@ if (empty($HTTP_HOST)) { * Defines the frameset */ $url_query = 'lang=' . $lang - . '&server=' . $server - . (empty($db) ? '' : '&db=' . urlencode($db)); + . '&server=' . $server + . (empty($db) ? '' : '&db=' . urlencode($db)); echo '' . "\n"; ?> diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3 index 4362ec8a7..da6f6bae9 100644 --- a/libraries/display_tbl.lib.php3 +++ b/libraries/display_tbl.lib.php3 @@ -373,15 +373,15 @@ if (!defined('__LIB_DISPLAY_TBL__')){ : ''; $text_url = 'sql.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&sql_query=' . $encoded_query - . '&pos=' . $pos - . '&sessionMaxRows=' . $sessionMaxRows - . '&pos=' . $pos - . '&goto=' . $goto - . '&dontlimitchars=' . (($dontlimitchars) ? 0 : 1); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&sql_query=' . $encoded_query + . '&pos=' . $pos + . '&sessionMaxRows=' . $sessionMaxRows + . '&pos=' . $pos + . '&goto=' . $goto + . '&dontlimitchars=' . (($dontlimitchars) ? 0 : 1); // ... before the result table if (($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn') @@ -486,13 +486,13 @@ if (!defined('__LIB_DISPLAY_TBL__')){ $sorted_sql_query = $unsorted_sql_query . $sort_order; } $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&pos=' . $pos - . '&sessionMaxRows=' . $sessionMaxRows - . '&dontlimitchars' . $dontlimitchars - . '&sql_query=' . urlencode($sorted_sql_query); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&pos=' . $pos + . '&sessionMaxRows=' . $sessionMaxRows + . '&dontlimitchars' . $dontlimitchars + . '&sql_query=' . urlencode($sorted_sql_query); // 2.1.5 Displays the sorting url ?> @@ -643,12 +643,12 @@ if (!defined('__LIB_DISPLAY_TBL__')){ // 1.2 Defines the urls for the modify/delete link(s) $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&pos=' . $pos - . '&sessionMaxRow=' . $sessionMaxRow - . '&dontlimitchars=' . $dontlimitchars; + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&pos=' . $pos + . '&sessionMaxRow=' . $sessionMaxRow + . '&dontlimitchars=' . $dontlimitchars; // 1.2.1 Modify link(s) if ($is_display['edit_lnk'] == 'ur') { // update row case @@ -661,34 +661,34 @@ if (!defined('__LIB_DISPLAY_TBL__')){ } $edit_url = 'tbl_change.php3' . '?' . $url_query - . '&primary_key=' . $uva_condition - . '&sql_query=' . urlencode($sql_query) - . '&goto=' . urlencode($goto); + . '&primary_key=' . $uva_condition + . '&sql_query=' . urlencode($sql_query) + . '&goto=' . urlencode($goto); $edit_str = $GLOBALS['strEdit']; } // end if (1.2.1) // 1.2.2 Delete/Kill link(s) if ($is_display['del_lnk'] == 'dr') { // delete row case $goto = 'sql.php3' - . '?' . $url_query + . '?' . str_replace('&', '&', $url_query) . '&sql_query=' . urlencode($sql_query) . '&zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted'])) . '&goto=tbl_properties.php3'; $del_url = 'sql.php3' . '?' . $url_query - . '&sql_query=' . urlencode('DELETE FROM ' . backquote($table) . ' WHERE') . $uva_condition . urlencode(' LIMIT 1') - . '&zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted'])) - . '&goto=' . urlencode($goto); + . '&sql_query=' . urlencode('DELETE FROM ' . backquote($table) . ' WHERE') . $uva_condition . urlencode(' LIMIT 1') + . '&zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted'])) + . '&goto=' . urlencode($goto); $js_conf = 'DELETE FROM ' . js_format($table) . ' WHERE ' . trim(js_format(urldecode($uva_condition), FALSE)) . ' LIMIT 1'; $del_str = $GLOBALS['strDelete']; } else if ($is_display['del_lnk'] == 'kp') { // kill process case $del_url = 'sql.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=mysql' - . '&sql_query=' . urlencode('KILL ' . $row['Id']) - . '&goto=main.php3'; + . '&server=' . $server + . '&db=mysql' + . '&sql_query=' . urlencode('KILL ' . $row['Id']) + . '&goto=main.php3'; $js_conf = 'KILL ' . $row['Id']; $del_str = $GLOBALS['strKill']; } // end if (1.2.2) diff --git a/libraries/functions.js b/libraries/functions.js index 174ab0388..2be56be64 100644 --- a/libraries/functions.js +++ b/libraries/functions.js @@ -98,7 +98,7 @@ function confirmQuery(theForm1, sqlQuery1) /** * Displays an error message if the user submitted the sql query form with no - * sql query else checks for "DROP/DELETE/ALTER" statements + * sql query, else checks for "DROP/DELETE/ALTER" statements * * @param object the form * diff --git a/phpinfo.php3 b/phpinfo.php3 index 2fd884c8f..bd019b9f3 100644 --- a/phpinfo.php3 +++ b/phpinfo.php3 @@ -1,12 +1,14 @@ ' . "\n"; @@ -352,12 +352,12 @@ else { $goto = 'sql.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&pos=' . $pos - . '&sql_query=' . urlencode($sql_query) - . '&id_bookmark=1'; + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&pos=' . $pos + . '&sql_query=' . urlencode($sql_query) + . '&id_bookmark=1'; ?>
    diff --git a/tbl_addfield.php3 b/tbl_addfield.php3 index 1328bb167..5e44ee8e3 100755 --- a/tbl_addfield.php3 +++ b/tbl_addfield.php3 @@ -17,9 +17,9 @@ require('./header.inc.php3'); */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/tbl_alter.php3 b/tbl_alter.php3 index 75da9f54a..8932f25c8 100755 --- a/tbl_alter.php3 +++ b/tbl_alter.php3 @@ -19,9 +19,9 @@ if (!isset($submit_mult)) { */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/tbl_change.php3 b/tbl_change.php3 index 4de5e8884..9d8a09262 100755 --- a/tbl_change.php3 +++ b/tbl_change.php3 @@ -28,9 +28,9 @@ if ($goto != 'db_details.php3' && $goto != 'tbl_properties.php3') { } else { $err_url = $goto . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . (($goto == 'tbl_properties.php3') ? '&table=' . urlencode($table) : ''); + . '&server=' . $server + . '&db=' . urlencode($db) + . (($goto == 'tbl_properties.php3') ? '&table=' . urlencode($table) : ''); } diff --git a/tbl_create.php3 b/tbl_create.php3 index fe1f73fe2..3731f901e 100755 --- a/tbl_create.php3 +++ b/tbl_create.php3 @@ -17,9 +17,9 @@ require('./header.inc.php3'); */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/tbl_dump.php3 b/tbl_dump.php3 index 81bf91b45..b0f0097ee 100755 --- a/tbl_dump.php3 +++ b/tbl_dump.php3 @@ -71,9 +71,9 @@ require('./libraries/zip.lib.php3'); */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . (isset($table) ? '&table=' . urlencode($table) : ''); + . '&server=' . $server + . '&db=' . urlencode($db) + . (isset($table) ? '&table=' . urlencode($table) : ''); /** diff --git a/tbl_move_copy.php3 b/tbl_move_copy.php3 index 7eea811e3..d46bb095a 100644 --- a/tbl_move_copy.php3 +++ b/tbl_move_copy.php3 @@ -36,9 +36,9 @@ require('./libraries/common.lib.php3'); */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/tbl_printview.php3 b/tbl_printview.php3 index a7b6265ad..59fbb2ddf 100755 --- a/tbl_printview.php3 +++ b/tbl_printview.php3 @@ -14,9 +14,9 @@ require('./header.inc.php3'); */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/tbl_properties.php3 b/tbl_properties.php3 index 94d615f20..41a5fbbad 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -15,13 +15,13 @@ require('./libraries/bookmark.lib.php3'); */ $err_url_0 = 'db_details.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db); + . '&server=' . $server + . '&db=' . urlencode($db); $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** @@ -90,10 +90,10 @@ unset($sql_query); * Set parameters for links */ $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&goto=tbl_properties.php3'; + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&goto=tbl_properties.php3'; /** @@ -147,16 +147,16 @@ if ($num_rows > 0) { ?>

    - [ + [ ]    [ ]    [ ]    - [ ]       - [ ]

    @@ -171,7 +171,7 @@ if ($num_rows > 0) { [ ]    [ ]       - [ ]

    @@ -314,7 +314,7 @@ while ($row = mysql_fetch_array($result)) {     - + @@ -323,7 +323,7 @@ while ($row = mysql_fetch_array($result)) { if ($fields_cnt > 1) { echo "\n"; ?> - - - + - + - + 20) { ?>

    - [ + [ ]    [ ]    [ ]    - [ ]       - [ ]

    @@ -422,7 +422,7 @@ if ($fields_cnt > 20) { [ ]    [ ]       - [ ]

    @@ -521,7 +521,7 @@ if ($index_count > 0) { echo "\n"; ?> - @@ -629,7 +629,7 @@ if ($cfgShowStats) { ?> - [] + [] ' . htmlspecialchars($dblist[$i]) . ''; @@ -1083,7 +1083,7 @@ if (MYSQL_INT_VERSION >= 32322) { if ($tbl_type == 'MYISAM') { ?> - +   @@ -1094,7 +1094,7 @@ if (MYSQL_INT_VERSION >= 32322) { if ($tbl_type == 'MYISAM' || $tbl_type == 'BDB') { ?> - +   @@ -1110,7 +1110,7 @@ if (MYSQL_INT_VERSION >= 32322) { if ($tbl_type == 'MYISAM') { ?> - +   @@ -1121,7 +1121,7 @@ if (MYSQL_INT_VERSION >= 32322) { if ($tbl_type == 'MYISAM' || $tbl_type == 'BDB') { ?> - +   @@ -1221,7 +1221,7 @@ else { // MySQL < 3.23.22
  •  :  - +  
    @@ -1233,7 +1233,7 @@ else { // MySQL < 3.23.22
  • -
    • diff --git a/tbl_rename.php3 b/tbl_rename.php3 index 21ff25b35..d22366d68 100755 --- a/tbl_rename.php3 +++ b/tbl_rename.php3 @@ -15,9 +15,9 @@ require('./libraries/common.lib.php3'); */ $err_url = 'tbl_properties.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/tbl_replace.php3 b/tbl_replace.php3 index e09943d47..61b94e14d 100755 --- a/tbl_replace.php3 +++ b/tbl_replace.php3 @@ -29,7 +29,7 @@ if ($goto == 'sql.php3') { if (isset($url_err)) { $url_err = urldecode($url_err); } else { - $url_err = $goto; + $url_err = str_replace('&', '&', $goto); } // Resets tables defined in the configuration file reset($fields); diff --git a/tbl_select.php3 b/tbl_select.php3 index 8dfceccf7..69d7ea0e3 100755 --- a/tbl_select.php3 +++ b/tbl_select.php3 @@ -14,9 +14,9 @@ require('./libraries/common.lib.php3'); */ $err_url = $goto . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table); + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table); /** diff --git a/user_details.php3 b/user_details.php3 index 68c0e7937..535a6bd62 100644 --- a/user_details.php3 +++ b/user_details.php3 @@ -14,9 +14,9 @@ require('./libraries/common.lib.php3'); */ $err_url = 'user_details.php3' . '?lang=' . $lang - . '&server=' . $server - . '&db=mysql' - . '&table=user'; + . '&server=' . $server + . '&db=mysql' + . '&table=user'; /** @@ -64,7 +64,7 @@ function table_grants(&$host_db_result, $dbcheck = FALSE) { echo "\n"; // 2. Table body - $url_query = 'lang=' . $lang . '&server=' . $server . '&db=mysql&table=user'; + $url_query = 'lang=' . $lang . '&server=' . $server . '&db=mysql&table=user'; while ($row = mysql_fetch_array($host_db_result)) { $local_query = 'SHOW GRANTS FOR \'' . $row['user'] . '\'@\'' . $row['host'] . '\''; @@ -102,15 +102,15 @@ function table_grants(&$host_db_result, $dbcheck = FALSE) { $bgcolor = ($i % 2) ? $GLOBALS['cfgBgcolorOne'] : $GLOBALS['cfgBgcolorTwo']; $revoke_url = 'sql.php3' . '?' . $url_query - . '&sql_query=' . urlencode('REVOKE ' . $priv . ' ON ' . backquote($db) . '.' . backquote($table) . ' FROM \'' . $row['user'] . '\'@\'' . $row['host'] . '\'') - . '&zero_rows=' . urlencode($GLOBALS['strRevokeMessage'] . ' ' . $row['user'] . '@' . $row['host'] . '') - . '&goto=user_details.php3'; + . '&sql_query=' . urlencode('REVOKE ' . $priv . ' ON ' . backquote($db) . '.' . backquote($table) . ' FROM \'' . $row['user'] . '\'@\'' . $row['host'] . '\'') + . '&zero_rows=' . urlencode($GLOBALS['strRevokeMessage'] . ' ' . $row['user'] . '@' . $row['host'] . '') + . '&goto=user_details.php3'; if ($grantopt) { $revoke_grant_url = 'sql.php3' . '?' . $url_query - . '&sql_query=' . urlencode('REVOKE GRANT OPTION ON ' . backquote($db) . '.' . backquote($table) . ' FROM \'' . $row['user'] . '\'@\'' . $row['host'] . '\'') - . '&zero_rows=' . urlencode($GLOBALS['strRevokeGrantMessage'] . ' ' . $row['user'] . '@' . $row['host'] . '') - . '&goto=user_details.php3'; + . '&sql_query=' . urlencode('REVOKE GRANT OPTION ON ' . backquote($db) . '.' . backquote($table) . ' FROM \'' . $row['user'] . '\'@\'' . $row['host'] . '\'') + . '&zero_rows=' . urlencode($GLOBALS['strRevokeGrantMessage'] . ' ' . $row['user'] . '@' . $row['host'] . '') + . '&goto=user_details.php3'; } ?> @@ -294,7 +294,7 @@ function normal_operations()
  • - +  
    @@ -430,7 +430,7 @@ function grant_operations($grants)
    • @@ -609,7 +609,7 @@ function edit_operations($host, $user)
    • @@ -818,18 +818,18 @@ function table_users($host = FALSE, $user = FALSE) $strPriv = '' . $GLOBALS['strNoPrivileges'] . ''; } - $query = 'lang=' . $lang . '&server=' . $server . '&db=mysql&table=user'; + $query = 'lang=' . $lang . '&server=' . $server . '&db=mysql&table=user'; if (!$user) { $edit_url = 'user_details.php3' - . '?lang=' . $lang . '&server=' . $server - . '&edit=1&host=' . urlencode($row['Host']) . '&pma_user=' . urlencode($row['User']); + . '?lang=' . $lang . '&server=' . $server + . '&edit=1&host=' . urlencode($row['Host']) . '&pma_user=' . urlencode($row['User']); } $delete_url = 'user_details.php3' . '?' . $query - . '&delete=1&confirm=1&delete_host=' . urlencode($row['Host']) . '&delete_user=' . urlencode($row['User']); + . '&delete=1&confirm=1&delete_host=' . urlencode($row['Host']) . '&delete_user=' . urlencode($row['User']); $check_url = 'user_details.php3' - . '?lang=' . $lang . '&server=' . $server - . '&grants=1&host=' . urlencode($row['Host']) . '&pma_user=' . urlencode($row['User']); + . '?lang=' . $lang . '&server=' . $server + . '&grants=1&host=' . urlencode($row['Host']) . '&pma_user=' . urlencode($row['User']); // $check_result = mysql_query('SHOW GRANTS FOR \'' . $row['User'] . '\'@\'' . $row['Host'] . '\''); // if (@mysql_num_rows($check_result) == 0) { @@ -1136,7 +1136,7 @@ else if (isset($submit_updProfile)) { // Updates profile $sql_query = 'UPDATE user SET ' . $sql_query . $common_where; $sql_query_cpy = $sql_query; - $result = @mysql_query($sql_query) or mysql_die('', '', FALSE, $err_url . '&host=' . urlencode($host) . '&pma_user=' . urlencode($pma_user) . '&edit=1'); + $result = @mysql_query($sql_query) or mysql_die('', '', FALSE, $err_url . '&host=' . urlencode($host) . '&pma_user=' . urlencode($pma_user) . '&edit=1'); // Updates grants if (isset($new_server) || isset($new_user)) { @@ -1199,7 +1199,7 @@ else if (isset($submit_chgPriv)) { $sql_query = 'UPDATE user SET ' . $sql_query . ' WHERE host = \'' . sql_addslashes($host) . '\' AND user = \'' . sql_addslashes($pma_user) . '\''; - $result = @mysql_query($sql_query) or mysql_die('', '', FALSE, $err_url . '&host=' . urlencode($host) . '&pma_user=' . urlencode($pma_user) . '&edit=1'); + $result = @mysql_query($sql_query) or mysql_die('', '', FALSE, $err_url . '&host=' . urlencode($host) . '&pma_user=' . urlencode($pma_user) . '&edit=1'); show_message(sprintf($strUpdatePrivMessage, '' . $pma_user . '@' . $host . '') . '
    ' . $strRememberReload); } @@ -1252,7 +1252,7 @@ else if (isset($grants) && $grants) { $sql_query .= ' TO ' . '\'' . sql_addslashes($pma_user) . '\'' . '@' . '\'' . sql_addslashes($host) . '\''; $sql_query = 'GRANT ' . $sql_query . $priv_grant; - $result = @mysql_query($sql_query) or mysql_die('', '', FALSE, $err_url . '&host=' . urlencode($host) . '&pma_user=' . urlencode($pma_user) . '&grants=1'); + $result = @mysql_query($sql_query) or mysql_die('', '', FALSE, $err_url . '&host=' . urlencode($host) . '&pma_user=' . urlencode($pma_user) . '&grants=1'); show_message($strAddPrivMessage); } // end if } @@ -1280,7 +1280,7 @@ else if (isset($check) && $check) { ?>