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

DHCPv4 leases status: Fix sorting (#4524)

Browse Source
This commit is contained in:
vnxme 2021-05-28 15:23:48 +03:00 committed by GitHub
parent 9e7e8a59ce
commit 576d69f8a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/www/status_dhcp_leases.php
View File

@ -244,13 +244,18 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
$order = ( $_GET['order'] ) ? $_GET['order'] : 'ip';
if (isset($_GET['order']) &&
in_array($_GET['order'], ['int', 'ip', 'mac', 'hostname', 'descr', 'start', 'end', 'online', 'act'])) {
$order = $_GET['order'];
} else {
$order = 'ip';
}
usort($leases,
function ($a, $b) use ($order) {
$cmp = strnatcasecmp($a[$order], $b[$order]);
$cmp = ($order === 'ip') ? 0 : strnatcasecmp($a[$order], $b[$order]);
if ($cmp === 0) {
$cmp = strnatcasecmp($a['ip'], $b['ip']);
$cmp = ipcmp($a['ip'], $b['ip']);
}
return $cmp;
}
@ -372,7 +377,7 @@ legacy_html_escape_form_data($leases);
<table class="table table-striped">
<thead>
<tr>
<td><?=gettext("Interface"); ?></td>
<td class="act_sort" data-field="int"><?=gettext("Interface"); ?></td>
<td class="act_sort" data-field="ip"><?=gettext("IP address"); ?></td>
<td class="act_sort" data-field="mac"><?=gettext("MAC address"); ?></td>
<td class="act_sort" data-field="hostname"><?=gettext("Hostname"); ?></td>