Update:

[people/pmueller/ipfire-2.x.git] / config / cfgroot / header.pl

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 336ac194f1f1deb89cc6ee4c869e9d4a9bdade65..a29e8a9698adea92c27c595bd151a56d15ac1a71 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -88,11 +88,12 @@ if ( -d "/var/ipfire/langs/${language}/" ) {
 };
 
 ### Read IPFire Buildversion
-$FIREBUILD = "Datei firebuild nicht gefunden\n";
+$FIREBUILD = "File not found: firebuild\n";
 if (open(MYFile, "<${swroot}/firebuild")) {
     $FIREBUILD = <MYFile>;
+    chomp($FIREBUILD);
     $FIREBUILD = "(Build: $FIREBUILD)";
-    close(_File);
+    close(MYFile);
 };
 
 require "${swroot}/langs/en.pl";
@@ -256,9 +257,9 @@ sub genmenu {
                                 'enabled' => 1,
                                 };
     $subnetwork->{'50.scheduler'} = {
-                                'caption' => $tr{'scheduler'},
+                                'caption' => $tr{'connscheduler'},
                                 'uri' => '/cgi-bin/connscheduler.cgi',
-                                'title' => "$tr{'scheduler'}",
+                                'title' => "$tr{'connscheduler'}",
                                 'enabled' => 1,
                                 };
     $subnetwork->{'60.hosts'} = {
@@ -395,7 +396,7 @@ sub genmenu {
                                'enabled' => 1
                                };
     $sublogs->{'60.urlfilter'} = {
-                               'caption' => $tr{'urlfilter log'},
+                               'caption' => $tr{'urlfilter logs'},
                                'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
                                'title' => "$tr{'urlfilter log'}",
                                'enabled' => 1,
@@ -819,12 +820,6 @@ END
     ;
     
     &showsubsubsection($menu);
-
-    eval {
-       require 'ipfire-network.pl';
-       $supported = check_support();
-       warn_unsupported($supported);
-    };
 }
 
 sub openpagewithoutmenu {