diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-09-03 16:34:01 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-09-04 07:47:42 -0300 |
| commit | a6057836c08b6f033ac61fa8a0b05fc684b962fa (patch) | |
| tree | fa9e2b15d9a051f6e3536c59e82ab51fcf8b23d3 | |
| parent | 63c058e780fc5b5e28f3247dab831e83bff40dc4 (diff) | |
| download | pfsense-a6057836c08b6f033ac61fa8a0b05fc684b962fa.zip pfsense-a6057836c08b6f033ac61fa8a0b05fc684b962fa.tar.gz | |
Use array id to delete phase2, it will simplify changes I'm working on and will commit soon
| -rw-r--r-- | usr/local/www/vpn_ipsec.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index f46cd8c..ed5dbd9 100644 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -150,14 +150,9 @@ if (isset($_GET['p1index']) && is_numericint($_GET['p1index']) && isset($a_phase mark_subsystem_dirty('ipsec'); } else if ($_GET['act'] == "delph2") { /* remove the phase2 entry */ - foreach ($a_phase2 as $ph2idx => $ph2) { - if ($ph2['uniqid'] == $_GET['p2index']) { - unset($a_phase2[$ph2idx]); - write_config(); - mark_subsystem_dirty('ipsec'); - break; - } - } + unset($a_phase2[$_GET['p2index']]); + write_config(); + mark_subsystem_dirty('ipsec'); } else if ($_GET['act'] == "toggle") { if (isset($a_phase1[$_GET['p1index']]['disabled'])) unset($a_phase1[$_GET['p1index']]['disabled']); @@ -410,7 +405,7 @@ include("head.inc"); </td> </tr> <?php - foreach ($a_phase2 as $ph2ent): + foreach ($a_phase2 as $ph2index => $ph2ent): if ($ph2ent['ikeid'] != $ph1ent['ikeid']) continue; @@ -487,7 +482,7 @@ include("head.inc"); <a href="vpn_ipsec_phase2.php?p2index=<?=$ph2ent['uniqid'];?>"> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit phase2 entry"); ?>" width="17" height="17" border="0" alt="edit" /> </a> - <a href="vpn_ipsec.php?act=delph2&p1index=<?=$i;?>&p2index=<?=$ph2ent['uniqid'];?>" onclick="return confirm('<?=gettext("Do you really want to delete this phase2 entry?"); ?>')"> + <a href="vpn_ipsec.php?act=delph2&p1index=<?=$i;?>&p2index=<?=$ph2index;?>" onclick="return confirm('<?=gettext("Do you really want to delete this phase2 entry?"); ?>')"> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete phase2 entry"); ?>" width="17" height="17" border="0" alt="delete" /> </a> <a href="vpn_ipsec_phase2.php?dup=<?=$ph2ent['uniqid'];?>"> |
