Commit 1b899db5 authored by Ad Schellevis's avatar Ad Schellevis

whitespace firewall_rules_edit.php

parent 86b7b77c
...@@ -71,41 +71,40 @@ function formInterfaces() { ...@@ -71,41 +71,40 @@ function formInterfaces() {
* fetch list of selectable networks to use in form * fetch list of selectable networks to use in form
*/ */
function formNetworks() { function formNetworks() {
$networks = array();
$networks = array(); $networks["any"] = gettext("any");
$networks["any"] = gettext("any"); $networks["pptp"] = gettext("PPTP clients");
$networks["pptp"] = gettext("PPTP clients"); $networks["pppoe"] = gettext("PPPoE clients");
$networks["pppoe"] = gettext("PPPoE clients"); $networks["l2tp"] = gettext("L2TP clients");
$networks["l2tp"] = gettext("L2TP clients"); foreach (get_configured_interface_with_descr() as $ifent => $ifdesc) {
foreach (get_configured_interface_with_descr() as $ifent => $ifdesc) { $networks[$ifent] = htmlspecialchars($ifdesc) . " " . gettext("net");
$networks[$ifent] = htmlspecialchars($ifdesc) . " " . gettext("net"); $networks[$ifent."ip"] = htmlspecialchars($ifdesc). " ". gettext("address");
$networks[$ifent."ip"] = htmlspecialchars($ifdesc). " ". gettext("address"); }
} return $networks;
return $networks;
} }
/** /**
* check if advanced options are set on selected element * check if advanced options are set on selected element
*/ */
function FormSetAdvancedOptions(&$item) { function FormSetAdvancedOptions(&$item) {
foreach (array("max", "max-src-nodes", "max-src-conn", "max-src-states","nopfsync", "statetimeout" foreach (array("max", "max-src-nodes", "max-src-conn", "max-src-states","nopfsync", "statetimeout"
,"max-src-conn-rate","max-src-conn-rates", "tag", "tagged", "allowopts", "disablereplyto","tcpflags1" ,"max-src-conn-rate","max-src-conn-rates", "tag", "tagged", "allowopts", "disablereplyto","tcpflags1"
,"tcpflags2") as $fieldname) { ,"tcpflags2") as $fieldname) {
if (!empty($item[$fieldname])) { if (!empty($item[$fieldname])) {
return true; return true;
} }
} }
if (!empty($item["statetype"]) && $item["statetype"] != 'keep state') { if (!empty($item["statetype"]) && $item["statetype"] != 'keep state') {
return true; return true;
} }
return false; return false;
} }
function is_posnumericint($arg) { function is_posnumericint($arg) {
// Note that to be safe we do not allow any leading zero - "01", "007" // Note that to be safe we do not allow any leading zero - "01", "007"
return (is_numericint($arg) && $arg[0] != '0' && $arg > 0); return (is_numericint($arg) && $arg[0] != '0' && $arg > 0);
} }
...@@ -117,12 +116,12 @@ function is_posnumericint($arg) { ...@@ -117,12 +116,12 @@ function is_posnumericint($arg) {
$specialsrcdst = explode(" ", "any (self) pptp pppoe l2tp openvpn"); $specialsrcdst = explode(" ", "any (self) pptp pppoe l2tp openvpn");
$ifdisp = get_configured_interface_with_descr(); $ifdisp = get_configured_interface_with_descr();
foreach ($ifdisp as $kif => $kdescr) { foreach ($ifdisp as $kif => $kdescr) {
$specialsrcdst[] = "{$kif}"; $specialsrcdst[] = "{$kif}";
$specialsrcdst[] = "{$kif}ip"; $specialsrcdst[] = "{$kif}ip";
} }
if (!isset($config['filter']['rule'])) { if (!isset($config['filter']['rule'])) {
$config['filter']['rule'] = array(); $config['filter']['rule'] = array();
} }
$a_filter = &$config['filter']['rule']; $a_filter = &$config['filter']['rule'];
...@@ -205,9 +204,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -205,9 +204,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$outoftcpflags = array(); $outoftcpflags = array();
foreach ($tcpflags as $tcpflag) { foreach ($tcpflags as $tcpflag) {
if (isset($pconfig['tcpflags1_' . $tcpflag]) && $pconfig['tcpflags1_' . $tcpflag] == "on") if (isset($pconfig['tcpflags1_' . $tcpflag]) && $pconfig['tcpflags1_' . $tcpflag] == "on")
$settcpflags[] = $tcpflag; $settcpflags[] = $tcpflag;
if (isset($pconfig['tcpflags2_' . $tcpflag]) && $pconfig['tcpflags2_' . $tcpflag] == "on") if (isset($pconfig['tcpflags2_' . $tcpflag]) && $pconfig['tcpflags2_' . $tcpflag] == "on")
$outoftcpflags[] = $tcpflag; $outoftcpflags[] = $tcpflag;
} }
// flags should be set within // flags should be set within
if (!empty($outoftcpflags)) { if (!empty($outoftcpflags)) {
...@@ -302,11 +301,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -302,11 +301,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} }
if((is_ipaddr($pconfig['src']) && is_ipaddr($pconfig['dst']))) { if((is_ipaddr($pconfig['src']) && is_ipaddr($pconfig['dst']))) {
if(!validate_address_family($pconfig['src'], $pconfig['dst'])) if(!validate_address_family($pconfig['src'], $pconfig['dst']))
$input_errors[] = sprintf(gettext("The Source IP address %s Address Family differs from the destination %s."), $pconfig['src'], $pconfig['dst']); $input_errors[] = sprintf(gettext("The Source IP address %s Address Family differs from the destination %s."), $pconfig['src'], $pconfig['dst']);
if((is_ipaddrv6($pconfig['src']) || is_ipaddrv6($pconfig['dst'])) && ($pconfig['ipprotocol'] == "inet")) if((is_ipaddrv6($pconfig['src']) || is_ipaddrv6($pconfig['dst'])) && ($pconfig['ipprotocol'] == "inet"))
$input_errors[] = gettext("You can not use IPv6 addresses in IPv4 rules."); $input_errors[] = gettext("You can not use IPv6 addresses in IPv4 rules.");
if((is_ipaddrv4($pconfig['src']) || is_ipaddrv4($pconfig['dst'])) && ($pconfig['ipprotocol'] == "inet6")) if((is_ipaddrv4($pconfig['src']) || is_ipaddrv4($pconfig['dst'])) && ($pconfig['ipprotocol'] == "inet6"))
$input_errors[] = gettext("You can not use IPv4 addresses in IPv6 rules."); $input_errors[] = gettext("You can not use IPv4 addresses in IPv6 rules.");
} }
if (is_ipaddrv4($pconfig['src']) && $pconfig['srcmask'] > 32) { if (is_ipaddrv4($pconfig['src']) && $pconfig['srcmask'] > 32) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment