Firewall: Fix source preselection of alias when Firewall is selected

[people/teissler/ipfire-2.x.git] / html / cgi-bin / firewall.cgi

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 164e7cbacd765c2e5926b0559c1ce5582db71d04..e9957943afd6fe751222faab995b715208cbd4d6 100644 (file)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1401,11 +1401,13 @@ sub getcolor
                        }
                        #Check if IP is part of a IPsec N2N network
                        foreach my $key (sort keys %ipsecconf){
-                               my ($a,$b) = split("/",$ipsecconf{$key}[11]);
-                               $b=&General::iporsubtodec($b);
-                               if (&General::IpInSubnet($c,$a,$b)){
-                                       $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
-                                       return;
+                               if ($ipsecconf{$key}[11]){
+                                       my ($a,$b) = split("/",$ipsecconf{$key}[11]);
+                                       $b=&General::iporsubtodec($b);
+                                       if (&General::IpInSubnet($c,$a,$b)){
+                                               $tdcolor="style='background-color: $Header::colourvpn;color:white;'";
+                                               return;
+                                       }
                                }
                        }
                }
@@ -1611,7 +1613,7 @@ END
                if (! -z "${General::swroot}/ethernet/aliases"){
                        foreach my $alias (sort keys %aliases)
                        {
-                               print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
+                               print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias</option>";
                        }
                }
                print<<END;