[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aec1925bea763d7dff55ed43d26bdb06acd2e07c

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aec1925bea763d7dff55ed43d26bdb06acd2e07c

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3881 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  aec1925bea763d7dff55ed43d26bdb06acd2e07c (commit)
      from  366b40c740bd61e412be23dcc987619b243b9c7b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aec1925bea763d7dff55ed43d26bdb06acd2e07c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Aug 23 17:34:50 2018 +0100

    IPsec: Show connected status for waiting connections that are active
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/124/filelists/files | 2 ++
 html/cgi-bin/index.cgi                    | 7 ++++---
 html/cgi-bin/vpnmain.cgi                  | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index ebebccdc1..eeb9048d9 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -6,6 +6,8 @@ etc/rc.d/init.d/localnet
 etc/rc.d/init.d/partresize
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/bin/install-bootloader
 usr/local/bin/backupiso
 var/ipfire/backup/exclude
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ef9da2389..03dc3574d 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -465,6 +465,10 @@ END
 
 				my $activecolor = $Header::colourred;
 				my $activestatus = $Lang::tr{'capsclosed'};
+				if ($vpnconfig{$key}[33] eq "add") {
+					$activecolor = ${Header::colourorange};
+					$activestatus = $Lang::tr{'vpn wait'};
+				}
 				if ($vpnconfig{$key}[0] eq 'off') {
 					$activecolor = $Header::colourblue;
 					$activestatus = $Lang::tr{'capsclosed'};
@@ -479,9 +483,6 @@ END
 						} elsif ($line =~ /$vpnconfig{$key}[1]\{.*ROUTED/) {
 							$activecolor = $Header::colourorange;
 							$activestatus = $Lang::tr{'vpn on-demand'};
-						} elsif ($vpnconfig{$key}[33] eq "add") {
-							$activecolor = ${Header::colourorange};
-							$activestatus = $Lang::tr{'vpn wait'};
 						}
 					}
 				}
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index e557122df..21fd1f4cd 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2844,8 +2844,11 @@ END
 	}
 	print "<td align='center' $col>$confighash{$key}[25]</td>";
 	my $col1="bgcolor='${Header::colourred}'";
-	# get real state
 	my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
+	if ($confighash{$key}[33] eq "add") {
+		$col1="bgcolor='${Header::colourorange}'";
+		$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>";
+	}
 	foreach my $line (@status) {
 		if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
 		($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
@@ -2857,9 +2860,6 @@ END
 		} elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
 			$col1="bgcolor='${Header::colourorange}'";
 			$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>";
-		} elsif ($confighash{$key}[33] eq "add") {
-			$col1="bgcolor='${Header::colourorange}'";
-			$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn wait'}</font></b>";
 		}
 	}
 	# move to blue if really down


hooks/post-receive
--
IPFire 2.x development tree