From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 31 Mar 2020 09:54:42 +0000 (+0000)
Subject: IPsec: Fix showing tunnels as connecting when they are established
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f3f2d676eff32f20d32f7ecfea45f235c9355fa;p=people%2Fms%2Fipfire-2.x.git

IPsec: Fix showing tunnels as connecting when they are established

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 5aec4c594a..fdf62361d2 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -457,6 +457,7 @@ END
 						if (($line =~ /\"$vpnconfig{$key}[1]\".*IPsec SA established/) || ($line =~/$vpnconfig{$key}[1]\{.*INSTALLED/ )){
 							$activecolor = $Header::colourgreen;
 							$activestatus = $Lang::tr{'capsopen'};
+							last;
 						} elsif ($line =~ /$vpnconfig{$key}[1]\[.*CONNECTING/) {
 							$activecolor = $Header::colourorange;
 							$activestatus = $Lang::tr{'vpn connecting'};
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index ae5e80d38e..db442e111d 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3019,6 +3019,7 @@ END
 		($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
 			$col1="bgcolor='${Header::colourgreen}'";
 			$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+			last;
 		} elsif ($line =~ /$confighash{$key}[1]\[.*CONNECTING/) {
 			$col1="bgcolor='${Header::colourorange}'";
 			$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn connecting'}</font></b>";