menu: Fix warnings, clean code

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>

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 5ddea348ecfa830871a687d7bf38f3f60c0b4053..65459cc92c7d2a8c6903f0c698c5b3227b5ee871 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -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"

diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 2bcf0d5e8d0784ba5065005303c3cddc47e64557..f969a3b0b35ebdc7826052a0c3a0385868da6395 100644 (file)
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -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',

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 19571a8705615817b3dc4a30d0de35a9e02ac3b5..4ef537ed4dd49c29e3dccb361b33de57518dbb67 100644 (file)
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -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'},

diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index d74c962e430fb9529792f22c360164879710ef4b..f2b8e99257b505f7b5c25ec3bd1f09ef2141988f 100644 (file)
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -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;

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6094c191aa7a0c5a1ca0c7aafb8bee9c6aae6889..1145745e00aa6b126fe2e1c123a0b769021d215c 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -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',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 03fc754dff0245875db36380a4ace592523fe97d..23c01ddb842fe6b77f48794025f65646e6fd0a66 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -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',