From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Hofmann To: development@lists.ipfire.org Subject: Re: [PATCH 2/2] menu: Fix warnings, clean code Date: Thu, 07 Apr 2022 10:47:27 +0200 Message-ID: <9f9b1330-84ec-4724-fc6d-e34cfb6e4c17@leo-andres.de> In-Reply-To: <20220406133940.803-2-hofmann@leo-andres.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4162909510679285884==" List-Id: --===============4162909510679285884== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, looking at this patch again, I'm unhappy with the default value operator. The= "enabled" field is only numeric everywhere else. So I should prevent the grep output from ending up in this field, altough it = would be accepted as a "truthy" value. I'll send a better patch. Sorry for the noise! Best regards Leo Am 06.04.2022 um 15:39 schrieb Leo-Andres Hofmann: > This patch adds default values and removes a missing translation > to fix "uninitialized value" and "odd number of elements" warnings. > > Removes function calls from functions.pl that have already been > handled by the header before it is loaded by eval(). > > Signed-off-by: Leo-Andres Hofmann > --- > config/cfgroot/header.pl | 4 +++- > config/menu/20-status.menu | 4 ++-- > config/menu/30-network.menu | 2 +- > html/html/themes/ipfire/include/functions.pl | 14 ++++---------- > langs/de/cgi-bin/de.pl | 1 - > langs/fr/cgi-bin/fr.pl | 1 - > 6 files changed, 10 insertions(+), 16 deletions(-) > > diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl > index e6d2b7c78..92e454dd1 100644 > --- a/config/cfgroot/header.pl > +++ b/config/cfgroot/header.pl > @@ -46,7 +46,7 @@ my $menu =3D \%menuhash; > %settings =3D (); > %ethsettings =3D (); > %pppsettings =3D (); > -(a)URI =3D (); > +my @URI =3D split('\?', $ENV{'REQUEST_URI'}); > =20 > ### Make sure this is an SSL request > if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') { > @@ -596,3 +596,5 @@ sub _read_manualpage_hash() { > } > close($file); > } > + > +1; # End of package "Header" > diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu > index 2bcf0d5e8..6ab68ec8c 100644 > --- a/config/menu/20-status.menu > +++ b/config/menu/20-status.menu > @@ -49,7 +49,7 @@ > $substatus->{'54.networkovpnsrv'} =3D { > 'caption' =3D> "$Lang::tr{'vpn statistic n2n'}", > 'uri' =3D> '/cgi-bin/netovpnsrv.cgi', > - 'title' =3D> "$Lang::tr{'vpn statistics n2n'}", > + 'title' =3D> "$Lang::tr{'vpn statistic n2n'}", > 'enabled' =3D> 1, > }; > $substatus->{'60.hardwaregraphs'} =3D { > @@ -90,7 +90,7 @@ > $substatus->{'75.atm-status'} =3D {'caption' =3D> 'Atm-status', > 'uri' =3D> '/cgi-bin/atm-status.cgi', > 'title' =3D> 'Atm-status', > - 'enabled' =3D> `find /sys/class/atm/*/device 2>/dev/null`, > + 'enabled' =3D> `find /sys/class/atm/*/device 2>/dev/null` // 0, > }; > $substatus->{'76.mdstat'} =3D {'caption' =3D> 'Mdstat', > 'uri' =3D> '/cgi-bin/mdstat.cgi', > diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu > index 19571a870..faef89a41 100644 > --- a/config/menu/30-network.menu > +++ b/config/menu/30-network.menu > @@ -67,7 +67,7 @@ > 'caption' =3D> $Lang::tr{'aliases'}, > 'uri' =3D> '/cgi-bin/aliases.cgi', > 'title' =3D> "$Lang::tr{'aliases'}", > - 'enabled' =3D> `grep "RED_TYPE=3DSTATIC" /var/ipfire/ethernet/settin= gs`, > + 'enabled' =3D> `grep "RED_TYPE=3DSTATIC" /var/ipfire/ethernet/settin= gs` // 0, > }; > $subnetwork->{'80.macadressmenu'} =3D { > 'caption' =3D> $Lang::tr{'mac address menu'}, > diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/theme= s/ipfire/include/functions.pl > index 40afb3ce3..5a9ddbf88 100644 > --- a/html/html/themes/ipfire/include/functions.pl > +++ b/html/html/themes/ipfire/include/functions.pl > @@ -31,8 +31,6 @@ > # IPFire default theme. = # > #########################################################################= ###### > =20 > -require "${General::swroot}/lang.pl"; > - > #########################################################################= ###### > # > # print menu html elements for submenu entries > @@ -103,16 +101,11 @@ sub openpage { > my $extrahead =3D shift; > my $suppressMenu =3D shift; > =20 > - @URI=3Dsplit ('\?', $ENV{'REQUEST_URI'} ); > - &General::readhash("${swroot}/main/settings", \%settings); > - &genmenu(); > - > my $headline =3D "IPFire"; > if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHH= OSTNAME'} eq '')) { > $headline =3D "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}"; > } > =20 > - > print < > > @@ -163,7 +156,10 @@ print < END > ; > =20 > -&showmenu() if ($suppressMenu !=3D 1); > +unless($suppressMenu) { > + &genmenu(); > + &showmenu(); > +} > =20 > print <
> @@ -268,5 +264,3 @@ sub openbox { > sub closebox { > print "
"; > } > - > -1; > diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl > index 0be097609..ab9e0d52e 100644 > --- a/langs/de/cgi-bin/de.pl > +++ b/langs/de/cgi-bin/de.pl > @@ -2880,7 +2880,6 @@ > 'vpn start action start' =3D> 'Immer An', > 'vpn statistic n2n' =3D> 'OpenVPN: Netz-zu-Netz-Statistik', > 'vpn statistic rw' =3D> 'OpenVPN: Roadwarrior-Statistik', > -'vpn statistics n2n' =3D> 'OpenVPN: Netz-zu-Netz-Statistiken', > 'vpn subjectaltname' =3D> 'SubjectAlternativeName', > 'vpn subjectaltname missing' =3D> 'SubjectAlternativeName darf nicht leer= bleiben.', > 'vpn wait' =3D> 'WARTE', > diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl > index 60ea0dcc5..74184a416 100644 > --- a/langs/fr/cgi-bin/fr.pl > +++ b/langs/fr/cgi-bin/fr.pl > @@ -2956,7 +2956,6 @@ > 'vpn start action start' =3D> 'Toujours d=C3=A9marr=C3=A9', > 'vpn statistic n2n' =3D> 'OpenVPN (site-=C3=A0-site)', > 'vpn statistic rw' =3D> 'OpenVPN (client nomade)', > -'vpn statistics n2n' =3D> 'OpenVPN (site-=C3=A0-site)', > 'vpn subjectaltname' =3D> 'Nom de l\'objet', > 'vpn subjectaltname missing' =3D> 'Le nom de l\'objet ne peut =C3=AAtre v= ide.', > 'vpn wait' =3D> 'ATTENTE', --===============4162909510679285884==--