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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 2464 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  cb18f19307f64bfadada2d995893d9f5699911ed (commit)
      from  0102fcabdbf9ebcabff905717e58f5514820243a (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 cb18f19307f64bfadada2d995893d9f5699911ed
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Feb 11 23:23:54 2018 +0000

    index.cgi: Properly show IPsec subnets
    
    Fixes: #11604
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/index.cgi | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ea91e0c20..580671b71 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -444,9 +444,16 @@ END
 		foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
 			if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') {
 				$count++;
-				my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
-				$vpnsub=&General::iporsubtocidr($vpnsub);
-				$vpnip="$vpnip/$vpnsub";
+
+				my @n = ();
+
+				my @networks = split(/\|/, $vpnconfig{$key}[11]);
+				foreach my $network (@networks) {
+					my ($vpnip, $vpnsub) = split("/", $network);
+					$vpnsub = &Network::convert_netmask2prefix($vpnsub) || $vpnsub;
+					push(@n, "$vpnip/$vpnsub");
+				}
+
 				if ($count % 2){
 					$col = $color{'color22'};
 				}else{
@@ -454,7 +461,7 @@ END
 				}
 				print "<tr>";
 				print "<td style='text-align:left; color:white; background-color:$Header::colourvpn;'>$vpnconfig{$key}[1]</td>";
-				print "<td style='text-align:center; background-color:$col'>$vpnip</td>";
+				print "<td style='text-align:center; background-color:$col'>" . join("<br>", @n) . "</td>";
 
 				my $activecolor = $Header::colourred;
 				my $activestatus = $Lang::tr{'capsclosed'};


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