X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=207e304551bc9d80b6eec317b2b252ff12df66aa;hp=3eab9845b3e8705fb2cd549878a97de0e8b3f9df;hb=33e1f48cfbb2a62fabf089b0e1e0e9480e86f2b8;hpb=8de160ffb94b9c9082c2b0b1b387a965cefff238 diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 3eab9845b3..207e304551 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -1,17 +1,29 @@ #!/usr/bin/perl -# -# SmoothWall CGIs -# -# This code is distributed under the terms of the GPL -# -# (c) The SmoothWall Team -# +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### use strict; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -43,10 +55,13 @@ my %mainsettings = (); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); my $connstate = &Header::connectionstatus(); -if ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { - $refresh = ""; -} elsif ($connstate =~ /$Lang::tr{'connecting'}/) { + +if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { + $refresh = ""; +} elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ $refresh = ""; +} elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { + $refresh = ""; } if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) @@ -114,6 +129,8 @@ my $dialButtonDisabled = "disabled='disabled'"; &Header::openbigbox('', 'center'); &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); + + if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ )) { if (open(IPADDR,"${General::swroot}/ddns/ipcache")) { $ipaddr = ; @@ -131,9 +148,9 @@ if ( ( $pppsettings{'VALID'} eq 'yes' && $modemsettings{'VALID'} eq 'yes' ) || ( print "$Lang::tr{'profile has errors'}\n \n"; } -if ( $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) { - $ipaddr = $netsettings{'RED_ADDRESS'}; -} +#if ( $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) { +# $ipaddr = $netsettings{'RED_ADDRESS'}; +#} my $death = 0; my $rebirth = 0; @@ -168,10 +185,11 @@ print < $Lang::tr{'network'} IP $Lang::tr{'status'} - $Lang::tr{'internet'}:
- $ipaddr - $connstate + $Lang::tr{'internet'}
+ $ipaddr + $connstate END +if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){ print `/usr/local/bin/dialctrl.pl show`; print < @@ -205,11 +223,11 @@ END } else { print "$Lang::tr{'profile has errors'}\n \n"; } - +} my $HOSTNAME = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0]; if ( "$HOSTNAME" ne "" ) { print <Hostname:$HOSTNAME  + Hostname:$HOSTNAME  END } @@ -217,7 +235,7 @@ END my $GATEWAY = `cat /var/ipfire/red/remote-ipaddress`; chomp($GATEWAY); print <Gateway:$GATEWAY  + Gateway:$GATEWAY  END } @@ -227,11 +245,11 @@ END chomp($DNS1); if ( $DNS1 ) { print <DNS-Server:$DNS1 + DNS-Server:$DNS1 END } if ( $DNS2 ) { print <$DNS2 + $DNS2 END } else { print <  @@ -239,9 +257,9 @@ END } if ( $netsettings{'GREEN_DEV'} ) { print <$Lang::tr{'lan'}: - $netsettings{'GREEN_ADDRESS'} - + $Lang::tr{'lan'} + $netsettings{'GREEN_ADDRESS'} + END if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE=on` ) { print "Proxy an"; @@ -249,9 +267,9 @@ END } else { print "Proxy aus"; } } if ( $netsettings{'BLUE_DEV'} ) { print <$Lang::tr{'wireless'}:
- $netsettings{'BLUE_ADDRESS'} - + $Lang::tr{'wireless'}
+ $netsettings{'BLUE_ADDRESS'} + END if ( `cat /var/ipfire/proxy/advanced/settings | grep ^ENABLE_BLUE=on` ) { print "Proxy an"; @@ -259,9 +277,9 @@ END } else { print "Proxy aus"; } } if ( $netsettings{'ORANGE_DEV'} ) { print <$Lang::tr{'dmz'}:
- $netsettings{'ORANGE_ADDRESS'} - Online + $Lang::tr{'dmz'}
+ $netsettings{'ORANGE_ADDRESS'} + Online END } if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` || @@ -271,9 +289,9 @@ END my %confighash = (); &General::readhasharray("${General::swroot}/vpn/config", \%confighash); print <$Lang::tr{'vpn'}:
- $ipsecip - Online + $Lang::tr{'vpn'}
+ $ipsecip + Online END my $id = 0; my $gif; @@ -281,11 +299,11 @@ END if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; } if ($id % 2) { - print "\n"; + print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")"; } else { - print "\n"; + print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")"; } - print " $confighash{$key}[1] / " . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")"; + my $active = "
$Lang::tr{'capsclosed'}
"; if ($confighash{$key}[0] eq 'off') { $active = "
$Lang::tr{'capsclosed'}
"; @@ -304,9 +322,9 @@ END `cat /var/ipfire/ovpn/settings | grep ^ENABLED_ORANGE=on`) { my $ovpnip = `cat /var/ipfire/ovpn/settings | grep ^DOVPN_SUBNET= | cut -c 14- | sed -e 's\/\\/255.255.255.0\/\/'`; print <OpenVPN:
- $ovpnip - Online + OpenVPN
+ $ovpnip + Online END } @@ -365,7 +383,7 @@ END
-




+