From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/2] Improve indentation and HTML output of
 PrintActualLeases & leasesort
Date: Mon, 26 Oct 2020 10:52:31 +0100
Message-ID: <29cdc9c5-3517-fce9-15d5-0b8119289c60@leo-andres.de>
In-Reply-To: <166A3248-86CB-48BE-8B14-E277D821E5C4@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8831724858270478263=="
List-Id: <development.lists.ipfire.org>

--===============8831724858270478263==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Michael,
thank you for reviewing & merging my patch!

I agree, this was an interesting read. I think the web interface code could b=
e improved. Feel free to point me to other issues, maybe I can contribute mor=
e.

Best regards,
Leo

Am 23.10.2020 um 12:07 schrieb Michael Tremer:
> Hey Leo-Andres,
>
> Thank you for splitting the patch. This was easier to review.
>
> It is still interesting code and it is very interesting too that all the DH=
CP stuff is in header.pl.
>
> But that is outside the scope of this patch.
>
> I will merge it. Thank you!
>
> Best,
> -Michael
>
>> On 21 Oct 2020, at 11:48, Leo-Andres Hofmann <hofmann(a)leo-andres.de> wro=
te:
>>
>> Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
>> ---
>> 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
>> <th width=3D'25%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?ETHER'><=
b>$tr{'mac address'}</b></a></th>
>> <th width=3D'20%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?HOSTNAME=
'><b>$tr{'hostname'}</b></a></th>
>> <th width=3D'25%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?ENDTIME'=
><b>$tr{'lease expires'} (local time d/m/y)</b></a></th>
>> -<th width=3D'5%' align=3D'center'><b>Add to fix leases<b></th>
>> +<th width=3D'5%' align=3D'center'><b>Add to fix leases</b></th>
>> </tr>
>> END
>> ;
>>
>>      open(LEASES,"/var/state/dhcp/dhcpd.leases") or die "Can't open dhcpd.=
leases";
>> -    while ($line =3D <LEASES>) {
>> -	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 <LEASES>) {
>> +		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 "";
>> +		}
>>
>> -	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);
>> +		}
>>
>> -	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;
>> +		}
>>
>> -	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;
>> +		}
>>
>> -	if ($line eq "}") {
>> -	    @record =3D ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAM=
E',$hostname);
>> -    	    $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 o=
f hashes
>> -	}
>> +		if ($line eq "}") {
>> +			@record =3D ('IPADDR',$ip,'ENDTIME',$endtime,'ETHER',$ether,'HOSTNAME'=
,$hostname);
>> +			$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 has=
hes
>> +		}
>>      }
>>      close(LEASES);
>>
>>      my $id =3D 0;
>> -    my $col=3D"";
>> +    my $col =3D "";
>>      foreach my $key (sort leasesort keys %entries) {
>> -	print "<form method=3D'post' action=3D'/cgi-bin/dhcp.cgi'>\n";
>> -	my $hostname =3D &cleanhtml($entries{$key}->{HOSTNAME},"y");
>> +		print "<form method=3D'post' action=3D'/cgi-bin/dhcp.cgi'>\n";
>> +		my $hostname =3D &cleanhtml($entries{$key}->{HOSTNAME},"y");
>>
>> -	if ($id % 2) {
>> -	    print "<tr>";
>> -	    $col=3D"bgcolor=3D'$table1colour'";
>> -	}
>> -	else {
>> -	    print "<tr>";
>> -	    $col=3D"bgcolor=3D'$table2colour'";
>> -	}
>> +		if ($id % 2) {
>> +			print "<tr>";
>> +			$col=3D"bgcolor=3D'$table1colour'";
>> +		} else {
>> +			print "<tr>";
>> +			$col=3D"bgcolor=3D'$table2colour'";
>> +		}
>>
>> -	print <<END
>> +		print <<END
>> <td align=3D'center' $col><input type=3D'hidden' name=3D'FIX_ADDR' value=
=3D'$entries{$key}->{IPADDR}' />$entries{$key}->{IPADDR}</td>
>> <td align=3D'center' $col><input type=3D'hidden' name=3D'FIX_MAC' value=3D=
'$entries{$key}->{ETHER}' />$entries{$key}->{ETHER}</td>
>> <td align=3D'center' $col><input type=3D'hidden' name=3D'FIX_REMARK' value=
=3D'$hostname' />&nbsp;$hostname</td>
>> @@ -470,20 +469,20 @@ END
>> END
>> ;
>>
>> -	($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) =3D localtim=
e ($entries{$key}->{ENDTIME});
>> -	$enddate =3D sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+1=
900,$hour,$min,$sec);
>> +		($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) =3D localti=
me ($entries{$key}->{ENDTIME});
>> +		$enddate =3D sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+=
1900,$hour,$min,$sec);
>>
>> -	if ($entries{$key}->{ENDTIME} < time() ){
>> -	    print "<strike>$enddate</strike>";
>> -	} else {
>> -	    print "$enddate";
>> -	}
>> -	print <<END
>> +		if ($entries{$key}->{ENDTIME} < time() ){
>> +			print "<strike>$enddate</strike>";
>> +		} else {
>> +			print "$enddate";
>> +		}
>> +		print <<END
>> </td><td $col><input type=3D'hidden' name=3D'ACTION' value=3D'$Lang::tr{'a=
dd'}2' /><input type=3D'submit' name=3D'SUBMIT' value=3D'$Lang::tr{'add'}' />
>> </td></tr></form>
>> END
>> ;
>> -	$id++;
>> +		$id++;
>>      }
>>
>>      print "</table>";
>> @@ -493,34 +492,34 @@ END
>>
>> # 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($dhcpsetti=
ngs{'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{'S=
ORT_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};
>> +		}
>> 	}
>> -    }
>> }
>>
>> sub colorize {
>> --=20
>> 2.27.0.windows.1
>>
>>

--===============8831724858270478263==--