webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

menu: Fix warnings, clean code

Browse Source 
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 <hofmann@leo-andres.de>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
This commit is contained in:
Leo-Andres Hofmann
2022-04-20 15:32:34 +02:00
committed by Peter Müller
parent a04b39daa7
commit c13060fd4c
6 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/cfgroot/header.pl
View File

@@ -46,7 +46,7 @@ my $menu = \%menuhash;
%settings = ();
%ethsettings = ();
%pppsettings = ();
@URI = ();
my @URI = split('\?', $ENV{'REQUEST_URI'});
### Make sure this is an SSL request
if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') {
@@ -573,3 +573,5 @@ sub get_manualpage_url() {
# No manual page configured, return nothing
return;
}
1; # End of package "Header"

4
config/menu/20-status.menu
View File

@@ -49,7 +49,7 @@
$substatus->{'54.networkovpnsrv'} = {
'caption' => "$Lang::tr{'vpn statistic n2n'}",
'uri' => '/cgi-bin/netovpnsrv.cgi',
'title' => "$Lang::tr{'vpn statistics n2n'}",
'title' => "$Lang::tr{'vpn statistic n2n'}",
'enabled' => 1,
};
$substatus->{'60.hardwaregraphs'} = {
@@ -90,7 +90,7 @@
$substatus->{'75.atm-status'} = {'caption' => 'Atm-status',
'uri' => '/cgi-bin/atm-status.cgi',
'title' => 'Atm-status',
'enabled' => `find /sys/class/atm/*/device 2>/dev/null`,
'enabled' => (`find /sys/class/atm/*/device 2>/dev/null` ? 1 : 0),
};
$substatus->{'76.mdstat'} = {'caption' => 'Mdstat',
'uri' => '/cgi-bin/mdstat.cgi',

2
config/menu/30-network.menu
View File

@@ -67,7 +67,7 @@
'caption' => $Lang::tr{'aliases'},
'uri' => '/cgi-bin/aliases.cgi',
'title' => "$Lang::tr{'aliases'}",
'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`,
'enabled' => (`grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings` ? 1 : 0),
};
$subnetwork->{'80.macadressmenu'} = {
'caption' => $Lang::tr{'mac address menu'},

16
html/html/themes/ipfire/include/functions.pl
View File

@@ -31,8 +31,6 @@
# IPFire default theme. #
###############################################################################
require "${General::swroot}/lang.pl";
###############################################################################
#
# print menu html elements for submenu entries
@@ -101,20 +99,15 @@ sub openpage {
my $title = shift;
my $boh = shift;
my $extrahead = shift;
my $suppressMenu = shift;
my $suppressMenu = shift // 0;
my @tmp = split(/\./, basename($0));
my $scriptName = @tmp[0];
@URI=split ('\?', $ENV{'REQUEST_URI'} );
&General::readhash("${swroot}/main/settings", \%settings);
&genmenu();
my $headline = "IPFire";
if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
$headline = "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
}
print <<END;
<!DOCTYPE html>
<html>
@@ -165,7 +158,10 @@ print <<END
END
;
&showmenu() if ($suppressMenu != 1);
unless($suppressMenu) {
&genmenu();
&showmenu();
}
print <<END
<div class="bigbox fixed">
@@ -270,5 +266,3 @@ sub openbox {
sub closebox {
print "</div>";
}
1;

1
langs/de/cgi-bin/de.pl
View File

@@ -2874,7 +2874,6 @@
'vpn start action start' => 'Immer An',
'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik',
'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik',
'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken',
'vpn subjectaltname' => 'SubjectAlternativeName',
'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.',
'vpn wait' => 'WARTE',

1
langs/fr/cgi-bin/fr.pl
View File

@@ -2949,7 +2949,6 @@
'vpn start action start' => 'Toujours démarré',
'vpn statistic n2n' => 'OpenVPN (site-à-site)',
'vpn statistic rw' => 'OpenVPN (client nomade)',
'vpn statistics n2n' => 'OpenVPN (site-à-site)',
'vpn subjectaltname' => 'Nom de l\'objet',
'vpn subjectaltname missing' => 'Le nom de l\'objet ne peut être vide.',
'vpn wait' => 'ATTENTE',