From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 1/2] Improve indentation and HTML output of PrintActualLeases & leasesort Date: Wed, 21 Oct 2020 12:48:30 +0100 Message-ID: <7eb80482-9fa4-4c80-a042-f55d25cf869c@Leo-Laptop.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7137744399022982403==" List-Id: --===============7137744399022982403== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Leo-Andres Hofmann --- config/cfgroot/header.pl | 159 +++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 80 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 1046f5992..6322cfebe 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -403,66 +403,65 @@ sub PrintActualLeases = $tr{'mac address'} = $tr{'hostname'} <= b>$tr{'lease expires'} (local time d/m/y) -Add to fix leases +Add to fix leases END ; =20 open(LEASES,"/var/state/dhcp/dhcpd.leases") or die "Can't open dhcpd.lea= ses"; - while ($line =3D ) { - next if( $line =3D~ /^\s*#/ ); - chomp($line); - @temp =3D split (' ', $line); - - if ($line =3D~ /^\s*lease/) { - $ip =3D $temp[1]; - #All field are not necessarily read. Clear everything - $endtime =3D 0; - $ether =3D ""; - $hostname =3D ""; - } + while (my $line =3D ) { + next if( $line =3D~ /^\s*#/ ); + chomp($line); + @temp =3D split (' ', $line); + + if ($line =3D~ /^\s*lease/) { + $ip =3D $temp[1]; + #All field are not necessarily read. Clear everything + $endtime =3D 0; + $ether =3D ""; + $hostname =3D ""; + } =20 - if ($line =3D~ /^\s*ends/) { - $line =3D~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/; - $endtime =3D timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); - } + if ($line =3D~ /^\s*ends/) { + $line =3D~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/; + $endtime =3D timegm($6, $5, $4, $3, $2 - 1, $1 - 1900); + } =20 - if ($line =3D~ /^\s*hardware ethernet/) { - $ether =3D $temp[2]; - $ether =3D~ s/;//g; - } + if ($line =3D~ /^\s*hardware ethernet/) { + $ether =3D $temp[2]; + $ether =3D~ s/;//g; + } =20 - if ($line =3D~ /^\s*client-hostname/) { - $hostname =3D "$temp[1] $temp[2] $temp[3]"; - $hostname =3D~ s/;//g; - $hostname =3D~ s/\"//g; - } + if ($line =3D~ /^\s*client-hostname/) { + $hostname =3D "$temp[1] $temp[2] $temp[3]"; + $hostname =3D~ s/;//g; + $hostname =3D~ s/\"//g; + } =20 - if ($line eq "}") { - @record =3D ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',= $hostname); - $record =3D {}; # create a reference to em= pty hash - %{$record} =3D @record; # populate that hash with @rec= ord - $entries{$record->{'IPADDR'}} =3D $record; # add this to a hash of h= ashes - } + if ($line eq "}") { + @record =3D ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME',$h= ostname); + $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 + } } close(LEASES); =20 my $id =3D 0; - my $col=3D""; + my $col =3D ""; foreach my $key (sort leasesort keys %entries) { - print "
\n"; - my $hostname =3D &cleanhtml($entries{$key}->{HOSTNAME},"y"); + print "\n"; + my $hostname =3D &cleanhtml($entries{$key}->{HOSTNAME},"y"); =20 - if ($id % 2) { - print ""; - $col=3D"bgcolor=3D'$table1colour'"; - } - else { - print ""; - $col=3D"bgcolor=3D'$table2colour'"; - } + if ($id % 2) { + print ""; + $col=3D"bgcolor=3D'$table1colour'"; + } else { + print ""; + $col=3D"bgcolor=3D'$table2colour'"; + } =20 - print <{IPADDR}' />$entries{$key}->{IPADDR} {ETHER}' />$entries{$key}->{ETHER}  $hostname @@ -470,20 +469,20 @@ END END ; =20 - ($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+1900= ,$hour,$min,$sec); + ($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); =20 - if ($entries{$key}->{ENDTIME} < time() ){ - print "$enddate"; - } else { - print "$enddate"; - } - print <{ENDTIME} < time() ){ + print "$enddate"; + } else { + print "$enddate"; + } + print < END ; - $id++; + $id++; } =20 print ""; @@ -493,34 +492,34 @@ END =20 # This sub is used during display of actives leases sub leasesort { - if (rindex ($dhcpsettings{'SORT_LEASELIST'},'Rev') !=3D -1) - { - $qs=3Dsubstr ($dhcpsettings{'SORT_LEASELIST'},0,length($dhcpsettings= {'SORT_LEASELIST'})-3); - if ($qs eq 'IPADDR') { - @a =3D split(/\./,$entries{$a}->{$qs}); - @b =3D split(/\./,$entries{$b}->{$qs}); - ($b[0]<=3D>$a[0]) || - ($b[1]<=3D>$a[1]) || - ($b[2]<=3D>$a[2]) || - ($b[3]<=3D>$a[3]); - }else { - $entries{$b}->{$qs} cmp $entries{$a}->{$qs}; - } - } - else #not reverse - { - $qs=3D$dhcpsettings{'SORT_LEASELIST'}; - if ($qs eq 'IPADDR') { - @a =3D split(/\./,$entries{$a}->{$qs}); - @b =3D split(/\./,$entries{$b}->{$qs}); - ($a[0]<=3D>$b[0]) || - ($a[1]<=3D>$b[1]) || - ($a[2]<=3D>$b[2]) || - ($a[3]<=3D>$b[3]); - }else { - $entries{$a}->{$qs} cmp $entries{$b}->{$qs}; + if (rindex ($dhcpsettings{'SORT_LEASELIST'},'Rev') !=3D -1) + { + $qs=3Dsubstr ($dhcpsettings{'SORT_LEASELIST'},0,length($dhcpsettings{'SORT= _LEASELIST'})-3); + if ($qs eq 'IPADDR') { + @a =3D split(/\./,$entries{$a}->{$qs}); + @b =3D split(/\./,$entries{$b}->{$qs}); + ($b[0]<=3D>$a[0]) || + ($b[1]<=3D>$a[1]) || + ($b[2]<=3D>$a[2]) || + ($b[3]<=3D>$a[3]); + } else { + $entries{$b}->{$qs} cmp $entries{$a}->{$qs}; + } + } + else #not reverse + { + $qs=3D$dhcpsettings{'SORT_LEASELIST'}; + if ($qs eq 'IPADDR') { + @a =3D split(/\./,$entries{$a}->{$qs}); + @b =3D split(/\./,$entries{$b}->{$qs}); + ($a[0]<=3D>$b[0]) || + ($a[1]<=3D>$b[1]) || + ($a[2]<=3D>$b[2]) || + ($a[3]<=3D>$b[3]); + } else { + $entries{$a}->{$qs} cmp $entries{$b}->{$qs}; + } } - } } =20 sub colorize { --=20 2.27.0.windows.1 --===============7137744399022982403==--