From 4b4b895946d5366ebf091e7d6c3237512cc44063 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 26 Jun 2011 15:16:32 +0200
Subject: [PATCH] ipsec: change status display in cgi's for charon.

---
 config/rootfiles/core/next/filelists/files | 2 ++
 html/cgi-bin/index.cgi                     | 4 +++-
 html/cgi-bin/vpnmain.cgi                   | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files
index e3580d4c6..18df10798 100644
--- a/config/rootfiles/core/next/filelists/files
+++ b/config/rootfiles/core/next/filelists/files
@@ -1,9 +1,11 @@
 etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
 var/ipfire/langs/es.pl
 var/ipfire/langs/fr.pl
+usr/local/bin/ipsecctrl
 usr/local/bin/vpn-watch
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 0dcadb0b2..32ae7ff38 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -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]\[.*ESTABLISHED/ ))
+				    {
 				    $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>";
 				}
 			   }
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 39bbbec38..c41248057 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2539,7 +2539,9 @@ END
 	# get real state
 	my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
 	foreach my $line (@status) {
-	    if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) {
+	    if ($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
+	       ($line =~ / $confighash{$key}[1]\[.*ESTABLISHED/))
+	    {
 		$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>";
 	    }
 	}
-- 
2.39.2