diff options
-rw-r--r-- | libraries/server_databases.lib.php | 44 | ||||
-rw-r--r-- | server_databases.php | 31 |
2 files changed, 45 insertions, 30 deletions
diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php index 03d26ed776..44be0e717f 100644 --- a/libraries/server_databases.lib.php +++ b/libraries/server_databases.lib.php @@ -406,4 +406,48 @@ function PMA_getHtmlForReplicationType( } return $html; } + +/** + * Returns the array about $sort_order and $sort_by + * + * @return Array + */ +function PMA_getListForSortDatabase() +{ + /** + * avoids 'undefined index' errors + */ + $sort_by = ''; + $sort_order = ''; + if (empty($_REQUEST['sort_by'])) { + $sort_by = 'SCHEMA_NAME'; + } else { + $sort_by_whitelist = array( + 'SCHEMA_NAME', + 'DEFAULT_COLLATION_NAME', + 'SCHEMA_TABLES', + 'SCHEMA_TABLE_ROWS', + 'SCHEMA_DATA_LENGTH', + 'SCHEMA_INDEX_LENGTH', + 'SCHEMA_LENGTH', + 'SCHEMA_DATA_FREE' + ); + if (in_array($_REQUEST['sort_by'], $sort_by_whitelist)) { + $sort_by = $_REQUEST['sort_by']; + } else { + $sort_by = 'SCHEMA_NAME'; + } + } + + if (isset($_REQUEST['sort_order']) + && strtolower($_REQUEST['sort_order']) == 'desc' + ) { + $sort_order = 'desc'; + } else { + $sort_order = 'asc'; + } + + return array($sort_by, $sort_order); +} + ?> diff --git a/server_databases.php b/server_databases.php index 94eb52b54f..30d9f94e6b 100644 --- a/server_databases.php +++ b/server_databases.php @@ -40,36 +40,7 @@ foreach ($post_params as $one_post_param) { } } -/** - * avoids 'undefined index' errors - */ -if (empty($_REQUEST['sort_by'])) { - $sort_by = 'SCHEMA_NAME'; -} else { - $sort_by_whitelist = array( - 'SCHEMA_NAME', - 'DEFAULT_COLLATION_NAME', - 'SCHEMA_TABLES', - 'SCHEMA_TABLE_ROWS', - 'SCHEMA_DATA_LENGTH', - 'SCHEMA_INDEX_LENGTH', - 'SCHEMA_LENGTH', - 'SCHEMA_DATA_FREE' - ); - if (in_array($_REQUEST['sort_by'], $sort_by_whitelist)) { - $sort_by = $_REQUEST['sort_by']; - } else { - $sort_by = 'SCHEMA_NAME'; - } -} - -if (isset($_REQUEST['sort_order']) - && strtolower($_REQUEST['sort_order']) == 'desc' -) { - $sort_order = 'desc'; -} else { - $sort_order = 'asc'; -} +list($sort_by, $sort_order) = PMA_getListForSortDatabase(); $dbstats = empty($_REQUEST['dbstats']) ? 0 : 1; $pos = empty($_REQUEST['pos']) ? 0 : (int) $_REQUEST['pos']; |