webif: hide main-menu if gpl was not accepted.

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index d90086d3822b8e6755c8af0e9325de0a91cd5674..acccfc834756baad04abc0c1b430a28b73d2047a 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -142,6 +142,8 @@ sub genmenu {
     my %sublogshash = ();
     my $sublogs = \%sublogshash;
 
+  if ( -e "/var/ipfire/main/gpl_accepted") {
+
     eval `/bin/cat /var/ipfire/menu.d/*.menu`;
     eval `/bin/cat /var/ipfire/menu.d/*.main`;
 
@@ -159,6 +161,7 @@ sub genmenu {
     if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) {
         $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
     }
+  }
 }
 
 sub showhttpheaders

diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
index d2c1f87874f5871a23c02db63f11f15a8bedb768..753c38d98dd846b3ec9e3b2d50c963fdaf91e6f2 100644 (file)
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@ -12,4 +12,5 @@ srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/routing.cgi
 usr/sbin/dhcrelay
 var/ipfire/general-functions.pl
+var/ipfire/header.pl
 var/ipfire/langs