From edf66cc50f4529bbd1cc96ac1651bfde119f92c0 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 20 Aug 2015 07:43:14 +0000 Subject: [PATCH] whitespace firewall_nat_1to1_edit.php --- src/www/firewall_nat_1to1_edit.php | 792 ++++++++++++++--------------- 1 file changed, 396 insertions(+), 396 deletions(-) diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php index df12148dc..251501770 100644 --- a/src/www/firewall_nat_1to1_edit.php +++ b/src/www/firewall_nat_1to1_edit.php @@ -1,29 +1,29 @@ . - All rights reserved. + Copyright (C) 2014 Deciso B.V. + Copyright (C) 2003-2004 Manuel Kasper . + All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ require_once("guiconfig.inc"); @@ -34,45 +34,45 @@ require_once("pfsense-utils.inc"); * fetch list of selectable networks to use in form */ function formNetworks() { - $networks = array(); - $networks["any"] = gettext("any"); - $networks["pptp"] = gettext("PPTP clients"); - $networks["pppoe"] = gettext("PPPoE clients"); - $networks["l2tp"] = gettext("L2TP clients"); - foreach (get_configured_interface_with_descr() as $ifent => $ifdesc) { - $networks[$ifent] = htmlspecialchars($ifdesc) . " " . gettext("net"); - $networks[$ifent."ip"] = htmlspecialchars($ifdesc). " ". gettext("address"); - } - return $networks; + $networks = array(); + $networks["any"] = gettext("any"); + $networks["pptp"] = gettext("PPTP clients"); + $networks["pppoe"] = gettext("PPPoE clients"); + $networks["l2tp"] = gettext("L2TP clients"); + foreach (get_configured_interface_with_descr() as $ifent => $ifdesc) { + $networks[$ifent] = htmlspecialchars($ifdesc) . " " . gettext("net"); + $networks[$ifent."ip"] = htmlspecialchars($ifdesc). " ". gettext("address"); + } + return $networks; } /** * build array with interface options for this form */ function formInterfaces() { - global $config; - $interfaces = array(); - foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) - $interfaces[$if] = $ifdesc; + global $config; + $interfaces = array(); + foreach ( get_configured_interface_with_descr(false, true) as $if => $ifdesc) + $interfaces[$if] = $ifdesc; - if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") - $interfaces['l2tp'] = "L2TP VPN"; + if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server") + $interfaces['l2tp'] = "L2TP VPN"; - if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") - $interfaces['pptp'] = "PPTP VPN"; + if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server") + $interfaces['pptp'] = "PPTP VPN"; - if (is_pppoe_server_enabled()) - $interfaces['pppoe'] = "PPPoE VPN"; + if (is_pppoe_server_enabled()) + $interfaces['pppoe'] = "PPPoE VPN"; - /* add ipsec interfaces */ - if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) - $interfaces["enc0"] = "IPsec"; + /* add ipsec interfaces */ + if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable'])) + $interfaces["enc0"] = "IPsec"; - /* add openvpn/tun interfaces */ - if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) { - $interfaces['openvpn'] = 'OpenVPN'; - } - return $interfaces; + /* add openvpn/tun interfaces */ + if (isset($config['openvpn']['openvpn-server']) || isset($config['openvpn']['openvpn-client'])) { + $interfaces['openvpn'] = 'OpenVPN'; + } + return $interfaces; } /** @@ -82,135 +82,135 @@ function formInterfaces() { $specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn"); $ifdisp = get_configured_interface_with_descr(); foreach ($ifdisp as $kif => $kdescr) { - $specialsrcdst[] = "{$kif}"; - $specialsrcdst[] = "{$kif}ip"; + $specialsrcdst[] = "{$kif}"; + $specialsrcdst[] = "{$kif}ip"; } if (!isset($config['nat']['onetoone'])) { - $config['nat']['onetoone'] = array(); + $config['nat']['onetoone'] = array(); } $a_1to1 = &$config['nat']['onetoone']; if ($_SERVER['REQUEST_METHOD'] === 'GET') { - // input record id, if valid - if (isset($_GET['dup']) && isset($a_1to1[$_GET['dup']])) { - $configId = $_GET['dup']; - } elseif (isset($_GET['id']) && isset($a_1to1[$_GET['id']])) { - $id = $_GET['id']; - $configId = $id; - } + // input record id, if valid + if (isset($_GET['dup']) && isset($a_1to1[$_GET['dup']])) { + $configId = $_GET['dup']; + } elseif (isset($_GET['id']) && isset($a_1to1[$_GET['id']])) { + $id = $_GET['id']; + $configId = $id; + } - $pconfig = array(); - // set defaults - $pconfig['interface'] = "wan"; - $pconfig['src'] = 'lan'; - $pconfig['dst'] = 'any'; - if (isset($configId)) { - // copy settings from config - foreach (array('disabled','interface','external','descr','natreflection') as $fieldname) { - if (isset($a_1to1[$id][$fieldname])) { - $pconfig[$fieldname] = $a_1to1[$id][$fieldname]; - } else { - $pconfig[$fieldname] = null; - } - } - // read settings with some kind of logic - address_to_pconfig($a_1to1[$id]['source'], $pconfig['src'], - $pconfig['srcmask'], $pconfig['srcnot'], - $pconfig['srcbeginport'], $pconfig['srcendport']); + $pconfig = array(); + // set defaults + $pconfig['interface'] = "wan"; + $pconfig['src'] = 'lan'; + $pconfig['dst'] = 'any'; + if (isset($configId)) { + // copy settings from config + foreach (array('disabled','interface','external','descr','natreflection') as $fieldname) { + if (isset($a_1to1[$id][$fieldname])) { + $pconfig[$fieldname] = $a_1to1[$id][$fieldname]; + } else { + $pconfig[$fieldname] = null; + } + } + // read settings with some kind of logic + address_to_pconfig($a_1to1[$id]['source'], $pconfig['src'], + $pconfig['srcmask'], $pconfig['srcnot'], + $pconfig['srcbeginport'], $pconfig['srcendport']); - address_to_pconfig($a_1to1[$id]['destination'], $pconfig['dst'], - $pconfig['dstmask'], $pconfig['dstnot'], - $pconfig['dstbeginport'], $pconfig['dstendport']); - } else { - // init form data on new - foreach (array('disabled','interface','external','descr','natreflection' - ,'src','srcmask','srcnot','srcbeginport','srcendport' - ,'dst','dstmask','dstnot','dstbeginport','dstendport' - ) as $fieldname) { - if (!isset($pconfig[$fieldname])) { - $pconfig[$fieldname] = null; - } - } - } + address_to_pconfig($a_1to1[$id]['destination'], $pconfig['dst'], + $pconfig['dstmask'], $pconfig['dstnot'], + $pconfig['dstbeginport'], $pconfig['dstendport']); + } else { + // init form data on new + foreach (array('disabled','interface','external','descr','natreflection' + ,'src','srcmask','srcnot','srcbeginport','srcendport' + ,'dst','dstmask','dstnot','dstbeginport','dstendport' + ) as $fieldname) { + if (!isset($pconfig[$fieldname])) { + $pconfig[$fieldname] = null; + } + } + } } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { - $input_errors = array(); - $pconfig = $_POST; - // input record id, if valid - if (isset($_POST['id']) && isset($a_1to1[$_POST['id']])) { - $id = $_POST['id']; - } + $input_errors = array(); + $pconfig = $_POST; + // input record id, if valid + if (isset($_POST['id']) && isset($a_1to1[$_POST['id']])) { + $id = $_POST['id']; + } - // trim input - foreach (array('external','src','dst') as $fieldname) { - if (isset($pconfig[$fieldname])) { - $pconfig[$fieldname] = trim($pconfig[$fieldname]); - } - } + // trim input + foreach (array('external','src','dst') as $fieldname) { + if (isset($pconfig[$fieldname])) { + $pconfig[$fieldname] = trim($pconfig[$fieldname]); + } + } - // validate input - foreach ($pconfig as $key => $value) { - if($value <> htmlentities($value)) - $input_errors[] = sprintf(gettext("Invalid characters detected (%s). Please remove invalid characters and save again."),$temp); - } + // validate input + foreach ($pconfig as $key => $value) { + if($value <> htmlentities($value)) + $input_errors[] = sprintf(gettext("Invalid characters detected (%s). Please remove invalid characters and save again."),$temp); + } - /* input validation */ - $reqdfields = explode(" ", "interface external src dst"); - $reqdfieldsn = array(gettext("Interface"), gettext("External subnet"), gettext("Source address"), gettext("Destination address")); - do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors); + /* input validation */ + $reqdfields = explode(" ", "interface external src dst"); + $reqdfieldsn = array(gettext("Interface"), gettext("External subnet"), gettext("Source address"), gettext("Destination address")); + do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors); - /* For external, user can enter only ip's */ - if (!empty($pconfig['external']) && !is_ipaddr($_POST['external'])) { - $input_errors[] = gettext("A valid external subnet must be specified."); - } - /* For src, user can enter only ip's or networks */ - if (!is_specialnet($pconfig['src']) && !is_ipaddroralias($pconfig['src'])) { - $input_errors[] = sprintf(gettext("%s is not a valid source IP address or alias."), $pconfig['src']); - } - if (!empty($pconfig['srcmask']) && !is_numericint($pconfig['srcmask'])) { - $input_errors[] = gettext("A valid source bit count must be specified."); - } - /* For dst, user can enter ip's, networks or aliases */ - if (!is_specialnet($pconfig['dst']) && !is_ipaddroralias($pconfig['dst'])) { - $input_errors[] = sprintf(gettext("%s is not a valid destination IP address or alias."), $pconfig['dst']); - } - if (!empty($pconfig['dstmask']) && !is_numericint($pconfig['dstmask'])) { - $input_errors[] = gettext("A valid destination bit count must be specified."); - } + /* For external, user can enter only ip's */ + if (!empty($pconfig['external']) && !is_ipaddr($_POST['external'])) { + $input_errors[] = gettext("A valid external subnet must be specified."); + } + /* For src, user can enter only ip's or networks */ + if (!is_specialnet($pconfig['src']) && !is_ipaddroralias($pconfig['src'])) { + $input_errors[] = sprintf(gettext("%s is not a valid source IP address or alias."), $pconfig['src']); + } + if (!empty($pconfig['srcmask']) && !is_numericint($pconfig['srcmask'])) { + $input_errors[] = gettext("A valid source bit count must be specified."); + } + /* For dst, user can enter ip's, networks or aliases */ + if (!is_specialnet($pconfig['dst']) && !is_ipaddroralias($pconfig['dst'])) { + $input_errors[] = sprintf(gettext("%s is not a valid destination IP address or alias."), $pconfig['dst']); + } + if (!empty($pconfig['dstmask']) && !is_numericint($pconfig['dstmask'])) { + $input_errors[] = gettext("A valid destination bit count must be specified."); + } - if (count($input_errors) == 0) { - $natent = array(); - // 1-on-1 copy - $natent['external'] = $pconfig['external']; - $natent['descr'] = $pconfig['descr']; - $natent['interface'] = $pconfig['interface']; + if (count($input_errors) == 0) { + $natent = array(); + // 1-on-1 copy + $natent['external'] = $pconfig['external']; + $natent['descr'] = $pconfig['descr']; + $natent['interface'] = $pconfig['interface']; - // copy form data with some kind of logic in it - $natent['disabled'] = isset($_POST['disabled']) ? true:false; - pconfig_to_address($natent['source'], $pconfig['src'], - $pconfig['srcmask'], !empty($pconfig['srcnot'])); + // copy form data with some kind of logic in it + $natent['disabled'] = isset($_POST['disabled']) ? true:false; + pconfig_to_address($natent['source'], $pconfig['src'], + $pconfig['srcmask'], !empty($pconfig['srcnot'])); - pconfig_to_address($natent['destination'], $pconfig['dst'], - $pconfig['dstmask'], !empty($pconfig['dstnot'])); + pconfig_to_address($natent['destination'], $pconfig['dst'], + $pconfig['dstmask'], !empty($pconfig['dstnot'])); - if (isset($pconfig['natreflection'] ) && ($pconfig['natreflection'] == "enable" || $pconfig['natreflection'] == "disable")) { - $natent['natreflection'] = $pconfig['natreflection']; - } + if (isset($pconfig['natreflection'] ) && ($pconfig['natreflection'] == "enable" || $pconfig['natreflection'] == "disable")) { + $natent['natreflection'] = $pconfig['natreflection']; + } - // save data - if (isset($id)) { - $a_1to1[$id] = $natent; - } else { - $a_1to1[] = $natent; - } + // save data + if (isset($id)) { + $a_1to1[$id] = $natent; + } else { + $a_1to1[] = $natent; + } - if (write_config()) { - mark_subsystem_dirty('natconf'); - } - header("Location: firewall_nat_1to1.php"); - exit; - } + if (write_config()) { + mark_subsystem_dirty('natconf'); + } + header("Location: firewall_nat_1to1.php"); + exit; + } } legacy_html_escape_form_data($pconfig); @@ -219,251 +219,251 @@ include("head.inc"); ?> - + }); + -
-
-
+
+
+
0) - print_input_errors($input_errors); + if (isset($input_errors) && count($input_errors) > 0) + print_input_errors($input_errors); ?> -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- /> - -
-
- -
- -
- -
- -
- /> - -
- - - - - - - -
- -
-
- - "/> - -
-
- -
- /> - -
- - - - - - - -
- -
-
- - " aria-label=""/> - -
-
- -
- - -
- -
  - " /> - " onclick="window.location.href=''" /> - - - -
-
-
-
-
-
-
-
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ /> + +
+
+ +
+ +
+ +
+ +
+ /> + +
+ + + + + + + +
+ +
+
+ + "/> + +
+
+ +
+ /> + +
+ + + + + + + +
+ +
+
+ + " aria-label=""/> + +
+
+ +
+ + +
+ +
  + " /> + " onclick="window.location.href=''" /> + + + +
+
+
+
+
+
+
+