Geändert:

* Webinterface Menü bearbeitet.
  * Squid-Error gefixt.
  * Pakfire gefixt, aber noch nicht funktionsfähig!


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@154 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-06-03 12:22:38 +00:00
parent ed38f89d27
commit 6d4147d250
14 changed files with 242 additions and 204 deletions

View File

@@ -84,8 +84,6 @@ if (-e "${General::swroot}/ovpn/settings") {
push(@network, $tempovpnsubnet[0]);
push(@masklen, $tempovpnsubnet[1]);
push(@colour, ${Header::colourovpn} );
push(@ports, '0' );
push(@protocols, '' );
if ( ($ovpnsettings{'ENABLED'} eq 'on') && open(IP, "${General::swroot}/red/local-ipaddress") ) {
# add RED:port / proto
@@ -95,24 +93,18 @@ if (-e "${General::swroot}/ovpn/settings") {
push(@network, $redip );
push(@masklen, '255.255.255.255' );
push(@colour, ${Header::colourovpn} );
push(@ports, $ovpnsettings{'DDEST_PORT'} );
push(@protocols, $ovpnsettings{'DPROTOCOL'} );
}
if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
# add BLUE:port / proto
push(@network, $netsettings{'BLUE_ADDRESS'} );
push(@masklen, '255.255.255.255' );
push(@colour, ${Header::colourovpn} );
push(@ports, $ovpnsettings{'DDEST_PORT'} );
push(@protocols, $ovpnsettings{'DPROTOCOL'} );
}
if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
# add ORANGE:port / proto
push(@network, $netsettings{'ORANGE_ADDRESS'} );
push(@masklen, '255.255.255.255' );
push(@colour, ${Header::colourovpn} );
push(@ports, $ovpnsettings{'DDEST_PORT'} );
push(@protocols, $ovpnsettings{'DPROTOCOL'} );
}
}

View File

@@ -803,18 +803,6 @@ if ($errormessage) {
&Header::closebox();
}
if (($advproxyversion lt $latest) && (-e $sysupdflagfile)) { unlink($sysupdflagfile); }
if (!-e $sysupdflagfile) {
&Header::openbox('100%', 'left', $Lang::tr{'advproxy update notification'});
print "<table width='100%' cellpadding='5'>\n";
print "<tr>\n";
print "<td bgcolor='$hintcolour' class='base'>$Lang::tr{'advproxy update information'}</td>";
print "</tr>\n";
print "</table>\n";
&Header::closebox();
}
# ===================================================================
# Main settings
# ===================================================================