dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Users - List: Fix sort by column heading.

This commit is contained in:
Nate 2020-04-13 14:00:57 -06:00
parent e86ee77d5c
commit 1528f61b87
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/users/users.php
View File

@ -122,7 +122,7 @@
//prepare to page the results //prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
$param = $search ? "&search=".$search : null; $param = $search ? "&search=".$search : null;
$param = ($_GET['show'] == 'all' && permission_exists('user_all')) ? "&show=all" : null; $param .= ($_GET['show'] == 'all' && permission_exists('user_all')) ? "&show=all" : null;
$page = is_numeric($_GET['page']) ? $_GET['page'] : 0; $page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page); list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true); list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
@ -228,16 +228,16 @@
echo " </th>\n"; echo " </th>\n";
} }
if ($_GET['show'] == 'all' && permission_exists('user_all')) { if ($_GET['show'] == 'all' && permission_exists('user_all')) {
echo th_order_by('domain_name', $text['label-domain'], $order_by, $order); echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param);
} }
echo th_order_by('username', $text['label-username'], $order_by, $order); echo th_order_by('username', $text['label-username'], $order_by, $order, null, null, $param);
echo th_order_by('groups', $text['label-groups'], $order_by, $order); echo th_order_by('groups', $text['label-groups'], $order_by, $order, null, null, $param);
echo th_order_by('contact_organization', $text['label-organization'], $order_by, $order); echo th_order_by('contact_organization', $text['label-organization'], $order_by, $order, null, null, $param);
echo th_order_by('contact_name', $text['label-name'], $order_by, $order); echo th_order_by('contact_name', $text['label-name'], $order_by, $order, null, null, $param);
//echo th_order_by('contact_name_family', $text['label-contact_name_family'], $order_by, $order); //echo th_order_by('contact_name_family', $text['label-contact_name_family'], $order_by, $order);
//echo th_order_by('user_status', $text['label-user_status'], $order_by, $order); //echo th_order_by('user_status', $text['label-user_status'], $order_by, $order);
//echo th_order_by('add_date', $text['label-add_date'], $order_by, $order); //echo th_order_by('add_date', $text['label-add_date'], $order_by, $order);
echo th_order_by('user_enabled', $text['label-user_enabled'], $order_by, $order, null, "class='center'"); echo th_order_by('user_enabled', $text['label-user_enabled'], $order_by, $order, null, "class='center'", $param);
if (permission_exists('user_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') { if (permission_exists('user_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
echo " <td class='action-button'>&nbsp;</td>\n"; echo " <td class='action-button'>&nbsp;</td>\n";
} }
@ -303,4 +303,4 @@
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>

46
resources/functions.php
View File

@ -384,29 +384,31 @@
$parameters = explode('&', $http_get_params); $parameters = explode('&', $http_get_params);
if (is_array($parameters)) { if (is_array($parameters)) {
foreach ($parameters as $parameter) { foreach ($parameters as $parameter) {
$array = explode('=', $parameter); if (substr_count($parameter, '=') != 0) {
$key = preg_replace('#[^a-zA-Z0-9_\-]#', '', $array['0']); $array = explode('=', $parameter);
$value = urldecode($array['1']); $key = preg_replace('#[^a-zA-Z0-9_\-]#', '', $array['0']);
if ($key == 'order_by' && strlen($value) > 0) { $value = urldecode($array['1']);
//validate order by if ($key == 'order_by' && strlen($value) > 0) {
$sanitized_parameters .= "&order_by=". preg_replace('#[^a-zA-Z0-9_\-]#', '', $value); //validate order by
} $sanitized_parameters .= "&order_by=". preg_replace('#[^a-zA-Z0-9_\-]#', '', $value);
else if ($key == 'order' && strlen($value) > 0) { }
//validate order else if ($key == 'order' && strlen($value) > 0) {
switch ($value) { //validate order
case 'asc': switch ($value) {
$sanitized_parameters .= "&order=asc"; case 'asc':
break; $sanitized_parameters .= "&order=asc";
case 'desc': break;
$sanitized_parameters .= "&order=desc"; case 'desc':
break; $sanitized_parameters .= "&order=desc";
break;
}
}
else if (strlen($value) > 0 && is_numeric($value)) {
$sanitized_parameters .= "&".$key."=".$value;
}
else {
$sanitized_parameters .= "&".$key."=".urlencode($value);
} }
}
else if (strlen($value) > 0 && is_numeric($value)) {
$sanitized_parameters .= "&".$key."=".$value;
}
else {
$sanitized_parameters .= "&".$key."=".urlencode($value);
} }
} }
} }