diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2015-01-09 22:47:38 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2015-01-09 22:47:38 +0100 |
| commit | 832ec9fee947bc195b5ddd14f5ba91045789c81d (patch) | |
| tree | 27542046f5791518055eac7f230a02ae93f58614 | |
| parent | 9218ecb6e767087e95d0478ffae64729951c6cef (diff) | |
| download | pfsense-832ec9fee947bc195b5ddd14f5ba91045789c81d.zip pfsense-832ec9fee947bc195b5ddd14f5ba91045789c81d.tar.gz | |
Just some reshufling and cleanup
| -rw-r--r-- | usr/local/www/widgets/widgets/ipsec.widget.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/local/www/widgets/widgets/ipsec.widget.php b/usr/local/www/widgets/widgets/ipsec.widget.php index d212ab6..43add04 100644 --- a/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/usr/local/www/widgets/widgets/ipsec.widget.php @@ -41,7 +41,7 @@ require_once("ipsec.inc"); if (isset($config['ipsec']['phase1'])) { ?> <div> </div> - <?php +<?php $tab_array = array(); $tab_array[0] = array("Overview", true, "ipsec-Overview"); $tab_array[1] = array("Tunnels", false, "ipsec-tunnel"); @@ -70,11 +70,11 @@ if (isset($config['ipsec']['phase1'])) { ?> $ikev1num = array(); if (isset($config['ipsec']['phase2'])) { foreach ($config['ipsec']['phase2'] as $ph2ent) { - if ($ph2ent['remoteid']['type'] == "mobile") - continue; if (!ipsec_lookup_phase1($ph2ent,$ph1ent)) continue; + if ($ph2ent['remoteid']['type'] == "mobile" || isset($ph1ent['mobile']))) + continue; if (isset($ph1ent['disabled']) || isset($ph2ent['disabled'])) continue; @@ -91,8 +91,7 @@ if (isset($config['ipsec']['phase1'])) { ?> foreach ($ipsec_status['query']['ikesalist']['ikesa'] as $ikesa) { if ($ikeid == $ikesa['peerconfig']) { $found = true; - $ph2ikeid = $ikesa['id']; - if (ipsec_phase1_status($ipsec_status['query']['ikesalist']['ikesa'], $ph2ikeid)) { + if (ipsec_phase1_status($ipsec_status['query']['ikesalist']['ikesa'], $ikesa['id'])) { /* tunnel is up */ $iconfn = "true"; $activecounter++; |
