From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 4 Jun 2006 22:55:40 +0000 (+0000)
Subject: Geändert:
X-Git-Tag: v2.3-beta1~1096
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c980f4d2e5c2b1ad77c823482f551aae513975a7

Geändert:
  * Webinterfacemenü vervollständigt.
  * Pfad im AdvProxy geändert.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@158 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3cabb1f194..065bb690b2 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -305,13 +305,19 @@ sub genmenu {
 				 'title' => "$tr{'external access configuration'}",
 				 'enabled' => 1,
 				 };
-    $subfirewall->{'03.dmz'} = {
+    $subfirewall->{'03.wireless'} = {
+				'caption' => $tr{'blue access'},
+				'uri' => '/cgi-bin/wireless.cgi',
+				'title' => "$tr{'blue access'}",
+				'enabled' => 1,
+				 };
+    $subfirewall->{'04.dmz'} = {
 				'caption' => $tr{'ssdmz pinholes'},
 				'uri' => '/cgi-bin/dmzholes.cgi',
 				'title' => "$tr{'dmz pinhole configuration'}",
 				'enabled' => 1,
 				 };
-    $subfirewall->{'04.outgoing'} = {
+    $subfirewall->{'05.outgoing'} = {
 				'caption' => $tr{'outgoing firewall'},
 				'uri' => '/cgi-bin/outgoingfw.cgi',
 				'title' => "$tr{'outgoing firewall'}",
@@ -427,7 +433,13 @@ sub genmenu {
 			  	};
 
     if (! blue_used() && ! orange_used()) {
-	$menu->{'05.firewall'}{'subMenu'}->{'03.dmz'}{'enabled'} = 0;
+	$menu->{'05.firewall'}{'subMenu'}->{'04.dmz'}{'enabled'} = 0;
+    }
+    if (! blue_used()) {
+	$menu->{'05.firewall'}{'subMenu'}->{'03.wireless'}{'enabled'} = 0;
+    }
+    if (! $ethsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && $ethsettings{'RED_TYPE'} eq 'STATIC' ) {
+	$menu->{'03.network'}{'subMenu'}->{'04.aliases'}{'enabled'} = 0;
     }
 }
 
@@ -728,19 +740,7 @@ sub openpage {
 <div id="header">
 	<img id="logo-product" src="/images/logo_ipfire.gif">
    <div id="header-icons">
-END
-;
-
-    if ($helpuri ne '') {
-	print <<END
-	    <a href="$helpuri" target="_blank"><img border="0" src="/images/help.gif"></a>
-END
-;
-    } else {
-	print '<img src="/images/help.gif">';
-    }
-
-print <<END
+	    <a href="http://users.ipfire.eu/" target="_blank"><img border="0" src="/images/help.gif"></a>
    </div>
 </div>
 
diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi
index 87f2df3443..f5a0c7e912 100644
--- a/html/cgi-bin/webaccess.cgi
+++ b/html/cgi-bin/webaccess.cgi
@@ -6,7 +6,7 @@
 
 use CGI;
 
-my $swroot = "/var/ipcop";
+my $swroot = "/var/ipfire";
 my $apdir  = "$swroot/proxy/advanced";
 my $group_def_file = "$apdir/cre/classrooms";
 my $svhosts_file = "$apdir/cre/supervisors";