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

Merge pull request #1889 from ljm42/patch-1

Browse Source 
improve sorting of DHCP leases
This commit is contained in:
Ad Schellevis 2017-10-24 19:02:07 +02:00 committed by GitHub
commit 591a089d2c
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/www/status_dhcp_leases.php
View File

@ -33,11 +33,6 @@ require_once("config.inc");
require_once("services.inc");
require_once("interfaces.inc");
function leasecmp($a, $b)
{
return strcmp($a[$_GET['order']], $b[$_GET['order']]);
}
function adjust_gmt($dt)
{
global $config;
@ -242,9 +237,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
}
if ($_GET['order']) {
usort($leases, "leasecmp");
}
$order = ( $_GET['order'] ) ? $_GET['order'] : 'ip';
usort($leases,
function ($a, $b) use ($order) {
$cmp = strnatcasecmp($a[$order], $b[$order]);
if ($cmp === 0) {
$cmp = strnatcasecmp($a['ip'], $b['ip']);
}
return $cmp;
}
);
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!empty($_POST['deleteip']) && is_ipaddr($_POST['deleteip'])) {
// delete dhcp lease
@ -353,15 +356,15 @@ include("head.inc");?>
<table class="table table-striped">
<thead>
<tr>
<td class="act_sort" data-field="if"><?=gettext("Interface"); ?></td>
<td><?=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>
<td class="act_sort" data-field="desc"><?=gettext("Description"); ?></td>
<td class="act_sort" data-field="descr"><?=gettext("Description"); ?></td>
<td class="act_sort" data-field="start"><?=gettext("Start"); ?></td>
<td class="act_sort" data-field="end"><?=gettext("End"); ?></td>
<td class="act_sort" data-field="status"><?=gettext("Status"); ?></td>
<td class="act_sort" data-field="type"><?=gettext("Lease type"); ?></td>
<td class="act_sort" data-field="online"><?=gettext("Status"); ?></td>
<td class="act_sort" data-field="act"><?=gettext("Lease type"); ?></td>
<td>&nbsp;</td>
</tr>
</thead>