diff options
-rw-r--r-- | etc/inc/ipsec.inc | 12 | ||||
-rw-r--r-- | usr/local/www/diag_ipsec.php | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index 5722bec..6b07187 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -555,19 +555,15 @@ function ipsec_get_descr($ikeid) { if (!isset($config['ipsec']['phase1']) || !is_array($config['ipsec']['phase1'])) - return ""; + return ''; - $descr = ''; - $a_phase1 = $config['ipsec']['phase1']; - foreach ($a_phase1 as $p1) { + foreach ($config['ipsec']['phase1'] as $p1) { if ($p1['ikeid'] == $ikeid) { - $descr = $p1['descr']; - break; + return $p1['descr']; } } - unset($a_phase1); - return $descr; + return ''; } function ipsec_get_phase1($ikeid) { diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index e6347c5..b14838f 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -137,8 +137,9 @@ $status = ipsec_smp_dump_status(); if ($ikesa['version'] == 1) { $ph1idx = substr($con_id, 0, strrpos(substr($con_id, 0, -1), '00')); $ipsecconnected[$ph1idx] = $ph1idx; - } else - $ipsecconnected[$con_id] = $con_id; + } else { + $ipsecconnected[$con_id] = $ph1idx = $con_id; + } if (ipsec_phase1_status($status['query']['ikesalist']['ikesa'], $ikesa['id'])) $icon = "pass"; @@ -150,7 +151,7 @@ $status = ipsec_smp_dump_status(); <tr> <td class="listlr"> <?php - echo htmlspecialchars(ipsec_get_descr($con_id)); + echo htmlspecialchars(ipsec_get_descr($ph1idx)); ?> </td> <td class="listr"> |