summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2017-03-30 21:20:18 +0200
committerRenato Botelho <renato@netgate.com>2017-04-20 16:04:09 -0300
commit37b4ec4c47b97b80ee50812f051c7e7d362675e3 (patch)
tree0e1ddeda6d091bbdb5a619ea94b0fa989a4c7409
parentfe91a918b23f36e17f223de30cef914e62e32196 (diff)
downloadpfsense-37b4ec4c47b97b80ee50812f051c7e7d362675e3.zip
pfsense-37b4ec4c47b97b80ee50812f051c7e7d362675e3.tar.gz
ipsec overview, check label exists for interface including disabled ones, tell what was configured if not found.
(cherry picked from commit ac24ac6bbb5b94e1eb8420404a9b7bd9daf998b7)
-rw-r--r--src/usr/local/www/vpn_ipsec.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php
index 015ef24..f5e7f2f 100644
--- a/src/usr/local/www/vpn_ipsec.php
+++ b/src/usr/local/www/vpn_ipsec.php
@@ -290,7 +290,7 @@ display_top_tabs($tab_array);
</thead>
<tbody class="p1-entries">
<?php
-$iflabels = get_configured_interface_with_descr();
+$iflabels = get_configured_interface_with_descr(false, true);
$viplist = get_configured_vip_list();
foreach ($viplist as $vip => $address) {
$iflabels[$vip] = $address;
@@ -340,7 +340,11 @@ $i = 0; foreach ($a_phase1 as $ph1ent):
<td>
<?php
if ($ph1ent['interface']) {
- $if = htmlspecialchars($iflabels[$ph1ent['interface']]);
+ if (isset($iflabels[$ph1ent['interface']])) {
+ $if = htmlspecialchars($iflabels[$ph1ent['interface']]);
+ } else {
+ $if = sprintf("Interface not found: '%s'", $ph1ent['interface']);
+ }
} else {
$if = "WAN";
}
OpenPOWER on IntegriCloud