Merge commit 'ms/openvpn-n2n' into next

[people/teissler/ipfire-2.x.git] / html / cgi-bin / index.cgi

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index dfe65bf81be1f9a8e3b053bd8aff1fecd5403d51..0ef95ba8ca26c83d6f203736793b3ee7c3b17af5 100644 (file)
--- 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        #
@@ -39,6 +39,7 @@ my $warnmessage = '';
 my $refresh = "";
 my $ipaddr='';
 
+
 &Header::showhttpheaders();
 
 $cgiparams{'ACTION'} = '';
@@ -57,6 +58,7 @@ my %mainsettings = ();
 
 my $connstate = &Header::connectionstatus();
 
+       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'}/ ){
@@ -64,6 +66,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'})
 {
@@ -128,8 +131,13 @@ my $dialButtonDisabled = "disabled='disabled'";
 
 &Header::openpage($Lang::tr{'main page'}, 1, $refresh);
 &Header::openbigbox('', 'center');
-&Header::openbox('100%', 'center', &Header::cleanhtml(`/bin/uname -n`,"y"));
 
+# licence agreement
+if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
+       system('touch /var/ipfire/main/gpl_accepted')
+}
+if ( -e "/var/ipfire/main/gpl_accepted" ) {
+&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)$/ )) {
@@ -361,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>";
                                }
                           }
@@ -380,6 +390,30 @@ END
 END
        }
 
+###
+# m.a.d n2n
+###
+
+if ( -d "${General::swroot}/ovpn/n2nconf") {
+my %confighash=();
+&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
+foreach my $dkey (keys %confighash) {
+if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') {
+my @n2novpnet =  split(/\//,$confighash{$dkey}[27]);
+    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'> $n2novpnet[0]
+               <td width='45%' align='center'><font color=$Header::colourblue>$confighash{$dkey}[6]</font>
+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+)/;
@@ -394,7 +428,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/ ) {
@@ -418,7 +452,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`;
@@ -437,8 +471,10 @@ END
 ;
 &Pakfire::dblist("upgrade", "notice");
 print <<END;
-
 END
+if ( -e "/var/run/need_reboot" ) {
+       print "<br /><br /><font color='red'>$Lang::tr{'needreboot'}!</font>";
+}
 } else {
        my $message='';
        if ($death) {
@@ -462,5 +498,37 @@ END
 } 
 
 &Header::closebox();
+}
+
+else {
+&Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
+print <<END;
+       $Lang::tr{'gpl please read carefully the general public license and accept it below'}.
+       <br /><br />
+END
+;      
+if ( -e "/usr/share/doc/licenses/GPLv3" ) {
+       print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>';
+       print `cat /usr/share/doc/licenses/GPLv3`;
+       print '</textarea>';
+}
+else {
+       print '<br /><a href=\'http://www.gnu.org/licenses/gpl-3.0.txt\' target=\'_blank\'>GNU GENERAL PUBLIC LICENSE</a><br />';
+}
+print <<END;
+       <p>
+               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                       <input type='checkbox' name='gpl_accepted' value='1'/> $Lang::tr{'gpl i accept these terms and conditions'}.
+                       <br/ >
+                       <input type='submit' name='ACTION' value=$Lang::tr{'yes'} />
+               </form>
+       </p>
+       <a href='http://www.gnu.org/licenses/translations.html' target='_blank'>$Lang::tr{'gpl unofficial translation of the general public license v3'}</a>
+
+END
+
+&Header::closebox();
+}
+
 &Header::closebigbox();
 &Header::closepage();