ipsec: Drop delayed restart setting

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

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ea91e0c20c5723f47bccca05865fb500515848f5..c7bf9f323242092642d4f23434b538fbf1589351 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -367,13 +367,12 @@ END
        }
 #check if IPSEC is running
 if ( $vpnsettings{'ENABLED'} eq 'on' || $vpnsettings{'ENABLED_BLUE'} eq 'on' ) {
-       my $ipsecip = $vpnsettings{'VPN_IP'};
 print<<END;
                <tr>
                        <td style='width:25%; text-align:center; background-color:$Header::colourvpn;'>
                                <a href='/cgi-bin/vpnmain.cgi' style='color:white'><b>$Lang::tr{'ipsec'}</b></a>
                        </td>
-                       <td style='width:30%; text-align:center;'>$ipsecip</td>
+                       <td style='width:30%; text-align:center;'></td>
                        <td style='width:45%; text-align:center; color:$Header::colourgreen;'>Online</td>
                </tr>
 END
@@ -444,9 +443,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,10 +460,14 @@ 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'};
+                               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'};