X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=ea19e26f5904cfae7feb21b11ae948091e643bc7;hb=f16bcc3e310ef5118dfbf3258306ab20d6b93916;hp=c07182ec6becf8beaee74343b788d0dc6380a922;hpb=0cac94cc32d08cceec03523c8023c92c0d1c9628;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index c07182ec6..ea19e26f5 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team # # # # 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 # @@ -20,6 +20,7 @@ ############################################################################### use strict; +use Net::Telnet; # enable only the following on debugging purpose #use warnings; @@ -58,14 +59,7 @@ my %mainsettings = (); my $connstate = &Header::connectionstatus(); -# check if reboot is necessary -my $reboot = 0; -if (`find /var/run/need_reboot 2>/dev/null`) { - $reboot = 1; -} - - - + if ( -e "/var/ipfire/main/gpl-accepted" ) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { $refresh = ""; } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ @@ -73,6 +67,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $La } elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") { $refresh = ""; } +} if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'}) { @@ -142,7 +137,7 @@ my $dialButtonDisabled = "disabled='disabled'"; if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') { system('touch /var/ipfire/main/gpl_accepted') } -if (`find /var/ipfire/main/gpl_accepted 2>/dev/null`) { +if ( -e "/var/ipfire/main/gpl_accepted" ) { &Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y")); @@ -246,19 +241,22 @@ END print < - + + + + + + "; } } - if ( `cat /var/ipfire/ovpn/settings | grep ^ENABLED=on` || - `cat /var/ipfire/ovpn/settings | grep ^ENABLED_BLUE=on` || - `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\/\/'`; + +### +# Check if there is any OpenVPN connection configured. +### + +if ( -s "${General::swroot}/ovpn/ovpnconfig") + { + print < + +END + # Check if the OpenVPN server for Road Warrior Connections is running and display status information. + my %confighash=(); + + &General::readhash("${General::swroot}/ovpn/settings", \%confighash); + + if (($confighash{'ENABLED'} eq "on") || + ($confighash{'ENABLED_BLUE'} eq "on") || + ($confighash{'ENABLED_ORANGE'} eq "on")) { + + my $ovpnip = $confighash{'DOVPN_SUBNET'}; print < + + + END + } + } } +} + +# Fireinfo +if ( ! -e "/var/ipfire/main/send_profile") { + $warnmessage .= "
  • $Lang::tr{'fireinfo please enable'}
    • "; +} # Memory usage warning my @free = `/usr/bin/free`; @@ -408,7 +479,7 @@ if ($used / $mem > 90) { # Diskspace usage warning my @temp=(); my $temp2=(); -my @df = `/bin/df -B M -x rootfs`; +my @df = `/bin/df -B M -P -x rootfs`; foreach my $line (@df) { next if $line =~ m/^Filesystem/; if ($line =~ m/root/ ) { @@ -432,7 +503,7 @@ foreach my $line (@df) { } # S.M.A.R.T. health warning -my @files = `/bin/ls /var/run/smartctl_out_hddtemp-*`; +my @files = `/bin/ls /var/run/smartctl_out_hddtemp-* 2>/dev/null`; foreach my $file (@files) { chomp ($file); my $disk=`echo $file | cut -d"-" -f2`; @@ -442,6 +513,13 @@ foreach my $file (@files) { } } +# Reiser4 warning +my @files = `mount | grep " reiser4 (" 2>/dev/null`; +foreach my $disk (@files) { + chomp ($disk); + $warnmessage .= "
  • $disk - $Lang::tr{'deprecated fs warn'}
    • \n\n"; +} + if ($warnmessage) { print "
    $Lang::tr{'network'} - IP - $Lang::tr{'status'} -
    $Lang::tr{'internet'}
    -     		$ipaddr - $connstate +
    $Lang::tr{'network'}IP$Lang::tr{'status'}
    $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 < +
    +
    $Lang::tr{'profile'}:
    $Lang::tr{'capsclosed'}
    "; } else { foreach my $line (@status) { - if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) { + if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || + ($line =~/$confighash{$key}[1]\{.*INSTALLED/ )) + { $active = "
    $Lang::tr{'capsopen'}
    "; } } @@ -383,16 +383,87 @@ END print "
    		$active + OpenVPN
    +     		OpenVPN
    		$ovpnip - Online + Online +END + + } + + # Print the OpenVPN N2N connection status. + if ( -d "${General::swroot}/ovpn/n2nconf") { + my %confighash=(); + + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + foreach my $dkey (keys %confighash) { + if (($confighash{$dkey}[3] eq 'net') && (-e "/var/run/$confighash{$dkey}[1]n2n.pid")) { + my $tport = $confighash{$dkey}[22]; + next if ($tport eq ''); + + my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); + $tnet->open('127.0.0.1'); + my @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/'); + my @tustate = split(/\,/, $output[1]); + + my $display; + my $display_colour = $Header::colourred; + if ( $tustate[1] eq 'CONNECTED') { + $display_colour = $Header::colourgreen; + $display = $Lang::tr{'capsopen'}; + } else { + $display = $tustate[1]; + } + + print < + + $confighash{$dkey}[1] + + $confighash{$dkey}[11] + + + + $display + + +
    $warnmessage
    "; @@ -453,8 +531,8 @@ END &Pakfire::dblist("upgrade", "notice"); print <$Lang::tr{'needreboot'}!"; +if ( -e "/var/run/need_reboot" ) { + print "

    $Lang::tr{'needreboot'}!"; } } else { my $message=''; @@ -484,632 +562,19 @@ END else { &Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'}); print <
    - +END +; +if ( -e "/usr/share/doc/licenses/GPLv3" ) { + print ''; +} +else { + print '
    GNU GENERAL PUBLIC LICENSE
    '; +} +print < $Lang::tr{'gpl i accept these terms and conditions'}. @@ -1117,7 +582,7 @@ copy of the Program in return for a fee.

    - $Lang::tr{'gpl unofficial translation of the general public license v3'} + $Lang::tr{'gpl unofficial translation of the general public license v3'} END