From a38d7c05d0e69e85bab39d4075e0b46eed6c2d1a Mon Sep 17 00:00:00 2001 From: Sebastian Mendel Date: Sun, 5 Feb 2006 10:22:48 +0000 Subject: [PATCH] array to string conversion (sorry to late :-( ), use of $_REQUEST --- ChangeLog | 4 ++++ libraries/mult_submits.inc.php | 12 +++++----- server_databases.php | 40 +++++++++++++++++++--------------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0964e356d..150fc7d8d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2006-02-05 Sebastian Mendel + * libraries/mult_submits.inc.php, server_databases.php: array to string + conversion (sorry to late :-( ), use of $_REQUEST + 2006-02-04 Marc Delisle * libraries/Config.class.php: bug #1409770 auto-detection and dirname on Windows, thanks to Alex - nixniemand diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 4184bd3da..d9d6a5325 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -8,16 +8,16 @@ */ if (!empty($submit_mult) && ($submit_mult != $strWithChecked) - && ( ( isset($selected_db) && (is_array($selected_db) || strlen($selected_db))) - || ( isset($selected_tbl) && (is_array($selected_tbl) || strlen($selected_tbl))) - || ( isset($selected_fld) && (is_array($selected_fld) || strlen($selected_fld))) + && ( ( isset($selected_db) && !empty($selected_db) ) + || ( isset($selected_tbl) && !empty($selected_tbl) ) + || ( isset($selected_fld) && !empty($selected_fld) ) || !empty($rows_to_delete) )) { - if (isset($selected_db) && (is_array($selected_db) || strlen($selected_db))) { + if (isset($selected_db) && !empty($selected_db)) { $selected = $selected_db; $what = 'drop_db'; - } elseif (isset($selected_tbl) && (is_array($selected_tbl) || strlen($selected_tbl))) { + } elseif (isset($selected_tbl) && !empty($selected_tbl)) { if ($submit_mult == $strPrintView) { require('./tbl_printview.php'); } else { @@ -54,7 +54,7 @@ if (!empty($submit_mult) break; } // end switch } - } elseif (isset($selected_fld) && (is_array($selected_fld) || strlen($selected_fld))) { + } elseif (isset($selected_fld) && !empty($selected_fld)) { $selected = $selected_fld; switch ($submit_mult) { case $strDrop: diff --git a/server_databases.php b/server_databases.php index 90924e28f..8305490ae 100644 --- a/server_databases.php +++ b/server_databases.php @@ -5,11 +5,11 @@ /** * Does the common work */ -require_once('./libraries/common.lib.php'); +require_once './libraries/common.lib.php'; $js_to_run = 'functions.js'; -require('./libraries/server_common.inc.php'); +require './libraries/server_common.inc.php'; /** * Sorts the databases array according to the user's choice @@ -45,22 +45,22 @@ function PMA_dbCmp($a, $b) { /** * avoids 'undefined index' errors */ -if (empty($sort_by)) { +if (empty($_REQUEST['sort_by'])) { $sort_by = 'SCHEMA_NAME'; } else { - $sort_by = PMA_sanitize($sort_by); + $sort_by = PMA_sanitize($_REQUEST['sort_by']); } -if (empty($sort_order)) { +if (empty($_REQUEST['sort_order'])) { if ($sort_by == 'SCHEMA_NAME') { $sort_order = 'asc'; } else { $sort_order = 'desc'; } } else { - $sort_order = PMA_sanitize($sort_order); + $sort_order = PMA_sanitize($_REQUEST['sort_order']); } -$dbstats = empty( $dbstats ) ? 0 : 1; +$dbstats = empty($dbstats) ? 0 : 1; /** @@ -69,19 +69,23 @@ $dbstats = empty( $dbstats ) ? 0 : 1; // workaround for IE behavior (it returns some coordinates based on where // the mouse was on the Drop image): - -if (isset($drop_selected_dbs_x)) { - $drop_selected_dbs = 'Drop'; +if (isset($_REQUEST['drop_selected_dbs_x'])) { + $_REQUEST['drop_selected_dbs'] = true; } -if ((!empty($drop_selected_dbs) || isset($query_type)) && ($is_superuser || $cfg['AllowUserDropDatabase'])) { - if (! isset($selected_db) && ! isset($query_type)) { +if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type'])) + && ($is_superuser || $cfg['AllowUserDropDatabase'])) { + if (! isset($_REQUEST['selected_dbs']) && ! isset($_REQUEST['query_type'])) { $message = $strNoDatabasesSelected; } else { $action = 'server_databases.php'; $submit_mult = 'drop_db' ; $err_url = 'server_databases.php?' . PMA_generate_common_url(); - require('./libraries/mult_submits.inc.php'); + if (isset($_REQUEST['selected_dbs'])) { + $selected_db = $_REQUEST['selected_dbs']; + } + require './libraries/mult_submits.inc.php'; + unset($action, $submit_mult, $err_url, $selected_db); if ($mult_btn == $strYes) { $message = sprintf($strDatabasesDropped, count($selected)); } else { @@ -93,7 +97,7 @@ if ((!empty($drop_selected_dbs) || isset($query_type)) && ($is_superuser || $cfg /** * Displays the links */ -require('./libraries/server_links.inc.php'); +require './libraries/server_links.inc.php'; /** @@ -212,9 +216,9 @@ if (count($databases) > 0) { if ( $is_superuser || $cfg['AllowUserDropDatabase'] ) { echo ' ' . "\n"; if ($current['SCHEMA_NAME'] != 'mysql' && (PMA_MYSQL_INT_VERSION < 50002 || $current['SCHEMA_NAME'] != 'information_schema')) { - echo ' ' . "\n"; + echo ' ' . "\n"; } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } echo ' ' . "\n"; } @@ -333,13 +337,13 @@ if (count($databases) > 0) { * Create new database. */ echo '
  • ' . "\n"; -require('./libraries/display_create_database.lib.php'); +require './libraries/display_create_database.lib.php'; echo '
    • ' . "\n"; echo '
' . "\n"; /** * Sends the footer */ -require_once('./libraries/footer.inc.php'); +require_once './libraries/footer.inc.php'; ?>