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
This commit is contained in:
ms
2006-06-04 22:55:40 +00:00
parent 072cd9978e
commit c980f4d2e5
2 changed files with 17 additions and 17 deletions

View File

@@ -305,13 +305,19 @@ sub genmenu {
'title' => "$tr{'external access configuration'}", 'title' => "$tr{'external access configuration'}",
'enabled' => 1, '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'}, 'caption' => $tr{'ssdmz pinholes'},
'uri' => '/cgi-bin/dmzholes.cgi', 'uri' => '/cgi-bin/dmzholes.cgi',
'title' => "$tr{'dmz pinhole configuration'}", 'title' => "$tr{'dmz pinhole configuration'}",
'enabled' => 1, 'enabled' => 1,
}; };
$subfirewall->{'04.outgoing'} = { $subfirewall->{'05.outgoing'} = {
'caption' => $tr{'outgoing firewall'}, 'caption' => $tr{'outgoing firewall'},
'uri' => '/cgi-bin/outgoingfw.cgi', 'uri' => '/cgi-bin/outgoingfw.cgi',
'title' => "$tr{'outgoing firewall'}", 'title' => "$tr{'outgoing firewall'}",
@@ -427,7 +433,13 @@ sub genmenu {
}; };
if (! blue_used() && ! orange_used()) { 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"> <div id="header">
<img id="logo-product" src="/images/logo_ipfire.gif"> <img id="logo-product" src="/images/logo_ipfire.gif">
<div id="header-icons"> <div id="header-icons">
END <a href="http://users.ipfire.eu/" target="_blank"><img border="0" src="/images/help.gif"></a>
;
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
</div> </div>
</div> </div>

View File

@@ -6,7 +6,7 @@
use CGI; use CGI;
my $swroot = "/var/ipcop"; my $swroot = "/var/ipfire";
my $apdir = "$swroot/proxy/advanced"; my $apdir = "$swroot/proxy/advanced";
my $group_def_file = "$apdir/cre/classrooms"; my $group_def_file = "$apdir/cre/classrooms";
my $svhosts_file = "$apdir/cre/supervisors"; my $svhosts_file = "$apdir/cre/supervisors";