gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #643 from xmujay/refactor_database

Browse Source 
refactor server_databases: add function PMA_getListForSortDatabase
This commit is contained in:
Marc Delisle 2013-08-26 09:15:48 -07:00
commit 7517dd58f0
2 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libraries/server_databases.lib.php
View File

@ -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);
}
?>

31
server_databases.php
View File

@ -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'];