lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 17:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall: Diagnostics: Aliases - simplify sort and add natural sorting. closes https://github.com/opnsense/core/pull/5716

Browse Source
This commit is contained in:
Ad Schellevis 2022-04-16 00:58:28 +02:00
parent 6814f32755
commit fcef2d65d2
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasUtilController.php
View File

@ -111,17 +111,6 @@ class AliasUtilController extends ApiControllerBase
});
}
if (
$this->request->hasPost('sort') &&
is_array($this->request->getPost('sort')) &&
array_key_exists('ip', $this->request->getPost('sort')) &&
$this->request->getPost('sort')['ip'] === 'desc'
) {
rsort($entry_keys);
} else {
sort($entry_keys);
}
$formatted_full = array_map(function ($value) use (&$entries) {
$item = ['ip' => $value];
foreach ($entries[$value] as $ekey => $evalue) {
@ -130,15 +119,16 @@ class AliasUtilController extends ApiControllerBase
return $item;
}, $entry_keys);
if (
$this->request->hasPost('sort') &&
is_array($this->request->getPost('sort')) &&
!array_key_exists('ip', $this->request->getPost('sort'))
) {
if ($this->request->hasPost('sort') && is_array($this->request->getPost('sort'))) {
$sortcolumn = array_key_first($this->request->getPost('sort'));
$sort_order = $this->request->getPost('sort')[$sortcolumn];
if (!empty(array_column($formatted_full, $sortcolumn))) {
array_multisort(array_column($formatted_full, $sortcolumn), $sort_order == 'asc' ? SORT_ASC : SORT_DESC, $formatted_full);
array_multisort(
array_column($formatted_full, $sortcolumn),
$sort_order == 'asc' ? SORT_ASC : SORT_DESC,
SORT_NATURAL,
$formatted_full
);
}
}