From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 2/2] Improve DHCP dynamic leases list usability. Active and expired leases are now grouped and the list is divided by a horizontal line. Sorting and creating static leases remains unchanged. Date: Wed, 21 Oct 2020 12:48:33 +0100 Message-ID: <2d983761-437b-4b08-9638-06f57f560fb5@Leo-Laptop.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1372061557455818240==" List-Id: --===============1372061557455818240== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Leo-Andres Hofmann --- config/cfgroot/header.pl | 66 +++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 6322cfebe..e2e6fd689 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -418,6 +418,8 @@ END $ip =3D $temp[1]; #All field are not necessarily read. Clear everything $endtime =3D 0; + $endtime_print =3D ""; + $expired =3D 0; $ether =3D ""; $hostname =3D ""; } @@ -425,6 +427,9 @@ END if ($line =3D~ /^\s*ends/) { $line =3D~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/; $endtime =3D timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); + ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) =3D localtime= ($endtime); + $endtime_print =3D sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$y= ear+1900,$hour,$min,$sec); + $expired =3D $endtime < time(); } =20 if ($line =3D~ /^\s*hardware ethernet/) { @@ -434,12 +439,11 @@ END =20 if ($line =3D~ /^\s*client-hostname/) { $hostname =3D "$temp[1] $temp[2] $temp[3]"; - $hostname =3D~ s/;//g; - $hostname =3D~ s/\"//g; + $hostname =3D~ s/\"|[;\s]+?$//g; # remove quotes, trim semicolon and whit= e space } =20 if ($line eq "}") { - @record =3D ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',$h= ostname); + @record =3D ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',$h= ostname,'endtime_print',$endtime_print,'expired',$expired); $record =3D {}; # create a reference to empty hash %{$record} =3D @record; # populate that hash with @record $entries{$record->{'IPADDR'}} =3D $record; # add this to a hash of hashes @@ -449,37 +453,53 @@ END =20 my $id =3D 0; my $col =3D ""; + my $divider_printed =3D 0; foreach my $key (sort leasesort keys %entries) { - print "
\n"; my $hostname =3D &cleanhtml($entries{$key}->{HOSTNAME},"y"); - + my $hostname_print =3D $hostname; + if($hostname_print eq "") { #print blank space if no hostname is found + $hostname_print =3D "   "; + } + =09 + # separate active and expired leases with a horizontal line + if(($entries{$key}->{expired}) && ($divider_printed =3D=3D 0)) { + $divider_printed =3D 1; + if ($id % 2) { + print "
\n"; + } else { + print "
\n"; + } + $id++; + } + =09 + print "\n"; if ($id % 2) { - print ""; $col=3D"bgcolor=3D'$table1colour'"; } else { - print ""; $col=3D"bgcolor=3D'$table2colour'"; } - - print <{expired}) { + print <{IPADDR}' />$entries{$key}->{IPADDR}<= /td> +{ETHER}' />$entries{$key}->{ETHER} +$hostname_print +$entries{$key}->{endtime_print} +END +; + } else { + print <{IPADDR}' />$entries{$key}->{IPADDR} {ETHER}' />$entries{$key}->{ETHER} - $hostname - +$hostname_print +$entries{$key}->{endtime_print} END ; - - ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) =3D localtime = ($entries{$key}->{ENDTIME}); - $enddate =3D sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+190= 0,$hour,$min,$sec); - - if ($entries{$key}->{ENDTIME} < time() ){ - print "$enddate"; - } else { - print "$enddate"; } + print < - + + END ; $id++; @@ -498,11 +518,13 @@ sub leasesort { if ($qs eq 'IPADDR') { @a =3D split(/\./,$entries{$a}->{$qs}); @b =3D split(/\./,$entries{$b}->{$qs}); + $entries{$a}->{'expired'} <=3D> $entries{$b}->{'expired'} || # always sor= t by expiration first ($b[0]<=3D>$a[0]) || ($b[1]<=3D>$a[1]) || ($b[2]<=3D>$a[2]) || ($b[3]<=3D>$a[3]); } else { + $entries{$a}->{'expired'} <=3D> $entries{$b}->{'expired'} || $entries{$b}->{$qs} cmp $entries{$a}->{$qs}; } } @@ -512,11 +534,13 @@ sub leasesort { if ($qs eq 'IPADDR') { @a =3D split(/\./,$entries{$a}->{$qs}); @b =3D split(/\./,$entries{$b}->{$qs}); + $entries{$a}->{'expired'} <=3D> $entries{$b}->{'expired'} || ($a[0]<=3D>$b[0]) || ($a[1]<=3D>$b[1]) || ($a[2]<=3D>$b[2]) || ($a[3]<=3D>$b[3]); } else { + $entries{$a}->{'expired'} <=3D> $entries{$b}->{'expired'} || $entries{$a}->{$qs} cmp $entries{$b}->{$qs}; } } --=20 2.27.0.windows.1 --===============1372061557455818240==--