X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=eec3f9bf361f6a1d463c4e616e16e504c05b3f0a;hp=6a93b68375ea47d99206054bbd22975b2e335a4b;hb=57ba1e9023b0f1f3499cc888f66827a81574bb41;hpb=579a39d0ba66b05767eacef0841e61b715429f20

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 6a93b68375..eec3f9bf36 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) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -58,7 +58,7 @@ my %mainsettings = ();
 
 my $connstate = &Header::connectionstatus();
 
-	if ( -e "/var/ipfire/main/gpl-acceted" ) {
+	if ( -e "/var/ipfire/main/gpl-accepted" ) {
 if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
 	$refresh = "<meta http-equiv='refresh' content='300;'>";
 } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
@@ -369,7 +369,9 @@ END
 			    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
 			} 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 = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
 				}
 			   }
@@ -407,7 +409,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/ ) {
@@ -431,7 +433,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`;