X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=002352354a15a05ad780ba64ced3f66547328964;hp=cd1c0c200eef6825314cba179c289a5045646022;hb=54fd05358b874a2bbb5c0f58f4a04f010c196388;hpb=922092717b57a984732ecb8a2ad595dccadcf81b

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index cd1c0c200e..002352354a 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-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        #
@@ -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 = "<meta http-equiv='refresh' content='300;'>";
 } 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 = "<meta http-equiv='refresh' content='30;'>";
 }
+}
 
 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"));
 
 
@@ -375,7 +370,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>";
 				}
 			   }
@@ -391,9 +388,59 @@ END
 		<tr><td align='center' bgcolor='$Header::colourovpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN</b></font></a><br>
 	  	<td width='30%' align='center'>$ovpnip
   		<td width='45%' align='center'><font color=$Header::colourgreen>Online</font>
+	
 END
+
 	}
 
+###
+# m.a.d n2n
+###
+
+if ( -d "${General::swroot}/ovpn/n2nconf") {
+my %confighash=();
+my $display = '';
+
+&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
+foreach my $dkey (keys %confighash) {
+if ($confighash{$dkey}[3] eq 'net') {
+
+
+          if (-e "/var/run/$confighash{$dkey}[1]n2n.pid") {
+          my @output = "";
+          my @tustate = "";
+          my $tport = $confighash{$dkey}[22];
+          my $tnet = new Net::Telnet ( Timeout=>5, Errmode=>'return', Port=>$tport); 
+          if ($tport ne '') {
+          $tnet->open('127.0.0.1');
+          @output = $tnet->cmd(String => 'state', Prompt => '/(END.*\n|ERROR:.*\n)/');
+          @tustate = split(/\,/, $output[1]);
+         if ( $tustate[1] eq 'CONNECTED')
+          { $display = "<font color=$Header::colourgreen>$Lang::tr{'capsopen'}</font>";
+          } else {
+          $display = "<font color=$Header::colourred>$tustate[1]</font>"; }
+ 
+	print <<END;
+	<tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br>
+  <td width='30%' align='center'> $confighash{$dkey}[10]<td width='45%' align='center'> $display 
+
+END
+;
+}
+}
+}
+}
+}
+
+###
+# m.a.d n2n end
+###
+
+# Fireinfo
+if ( ! -e "/var/ipfire/main/send_profile") {
+	$warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>";
+}
+
 # Memory usage warning
 my @free = `/usr/bin/free`;
 $free[1] =~ m/(\d+)/;
@@ -408,7 +455,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 +479,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,7 +489,6 @@ foreach my $file (@files) {
 	}
 }
 
-
 if ($warnmessage) {
 	print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }
@@ -453,7 +499,7 @@ END
 &Pakfire::dblist("upgrade", "notice");
 print <<END;
 END
-if ($reboot == 1) {
+if ( -e "/var/run/need_reboot" ) {
 	print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
 }
 } else {
@@ -488,7 +534,7 @@ print <<END;
 	<br /><br />
 END
 ;	
-if (`find /usr/share/doc/licenses/GPLv3 2>/dev/null`) {
+if ( -e "/usr/share/doc/licenses/GPLv3" ) {
 	print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
 	print `cat /usr/share/doc/licenses/GPLv3`;
 	print '</textarea>';