[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b21618696d28c672ddd11f8943bf27d38d5996dc

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b21618696d28c672ddd11f8943bf27d38d5996dc

[git]

[-- Attachment #1: Type: text/plain, Size: 2573 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  b21618696d28c672ddd11f8943bf27d38d5996dc (commit)
       via  903c6825aa0f1753b0d49786aba6fc3e7f195292 (commit)
      from  960e969ca105d3c9089658f3323121156c11da90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b21618696d28c672ddd11f8943bf27d38d5996dc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jul 16 17:26:14 2014 +0200

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

commit 903c6825aa0f1753b0d49786aba6fc3e7f195292
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jul 16 17:24:41 2014 +0200

    core80: add proxy.cgi to update.

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/header.pl                 | 3 +++
 config/rootfiles/core/80/filelists/files | 2 ++
 2 files changed, 5 insertions(+)

Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index d90086d..acccfc8 100644
--- 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 91d3b62..753c38d 100644
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@ -8,7 +8,9 @@ srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
 srv/web/ipfire/cgi-bin/netexternal.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
+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


hooks/post-receive
--
IPFire 2.x development tree