diff options
author | Bill Marquette <billm@pfsense.org> | 2005-05-15 22:35:06 +0000 |
---|---|---|
committer | Bill Marquette <billm@pfsense.org> | 2005-05-15 22:35:06 +0000 |
commit | 23a8ad04474bfdba690024314ccf2097b8ee754f (patch) | |
tree | c05d717299273613928d76fd072956d5d667a8d7 /usr/local/www/vpn_ipsec_edit.php | |
parent | e2cb6b50972de11c26f8a6eb482e37893d65d526 (diff) | |
download | pfsense-23a8ad04474bfdba690024314ccf2097b8ee754f.zip pfsense-23a8ad04474bfdba690024314ccf2097b8ee754f.tar.gz |
Remove duplicate code
Diffstat (limited to 'usr/local/www/vpn_ipsec_edit.php')
-rwxr-xr-x | usr/local/www/vpn_ipsec_edit.php | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php index a0fecfb..b290bb9 100755 --- a/usr/local/www/vpn_ipsec_edit.php +++ b/usr/local/www/vpn_ipsec_edit.php @@ -54,30 +54,6 @@ function is_specialnet($net) { return false; } -function address_to_pconfig($adr, &$padr, &$pmask) { - - if ($adr['network']) - $padr = $adr['network']; - else if ($adr['address']) { - list($padr, $pmask) = explode("/", $adr['address']); - if (is_null($pmask)) - $pmask = 32; - } -} - -function pconfig_to_address(&$adr, $padr, $pmask) { - - $adr = array(); - - if (is_specialnet($padr)) - $adr['network'] = $padr; - else { - $adr['address'] = $padr; - if ($pmask != 32) - $adr['address'] .= "/" . $pmask; - } -} - if (isset($id) && $a_ipsec[$id]) { $pconfig['disabled'] = isset($a_ipsec[$id]['disabled']); $pconfig['auto'] = isset($a_ipsec[$id]['auto']); @@ -86,7 +62,7 @@ if (isset($id) && $a_ipsec[$id]) { if (!isset($a_ipsec[$id]['local-subnet'])) $pconfig['localnet'] = "lan"; else - address_to_pconfig($a_ipsec[$id]['local-subnet'], $pconfig['localnet'], $pconfig['localnetmask']); + address_to_pconfig($a_ipsec[$id]['local-subnet'], $pconfig['localnet'], $pconfig['localnetmask'], null, null, null); if ($a_ipsec[$id]['interface']) $pconfig['interface'] = $a_ipsec[$id]['interface']; |