summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-11-03 10:54:21 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-11-03 10:54:21 -0200
commitfe9d4894a250ae569aa4c717e8c473c77dc9187c (patch)
tree49e1406cf0353e9d91b6007b0371e4510a6732e5 /usr
parent2783e408c429e8c2028704aba5054118cd5163a4 (diff)
downloadpfsense-fe9d4894a250ae569aa4c717e8c473c77dc9187c.zip
pfsense-fe9d4894a250ae569aa4c717e8c473c77dc9187c.tar.gz
Fix indent
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/services_unbound.php58
-rw-r--r--usr/local/www/services_unbound_acls.php18
-rw-r--r--usr/local/www/services_unbound_advanced.php60
3 files changed, 68 insertions, 68 deletions
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index b23cb4d..80f9eaf 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -60,22 +60,22 @@ if (!is_array($config['unbound']['domainoverrides'])) {
$a_domainOverrides = &$config['unbound']['domainoverrides'];
if (isset($config['unbound']['enable'])) {
- $pconfig['enable'] = true;
+ $pconfig['enable'] = true;
}
if (isset($config['unbound']['dnssec'])) {
- $pconfig['dnssec'] = true;
+ $pconfig['dnssec'] = true;
}
if (isset($config['unbound']['forwarding'])) {
- $pconfig['forwarding'] = true;
+ $pconfig['forwarding'] = true;
}
if (isset($config['unbound']['regdhcp'])) {
- $pconfig['regdhcp'] = true;
+ $pconfig['regdhcp'] = true;
}
if (isset($config['unbound']['regdhcpstatic'])) {
- $pconfig['regdhcpstatic'] = true;
+ $pconfig['regdhcpstatic'] = true;
}
if (isset($config['unbound']['txtsupport'])) {
- $pconfig['txtsupport'] = true;
+ $pconfig['txtsupport'] = true;
}
$pconfig['port'] = $config['unbound']['port'];
@@ -101,69 +101,69 @@ if ($_POST) {
$savemsg = get_std_save_message($retval);
if ($retval == 0) {
clear_subsystem_dirty('unbound');
- }
+ }
/* Update resolv.conf in case the interface bindings exclude localhost. */
system_resolvconf_generate();
} else {
if (isset($_POST['enable']) && isset($config['dnsmasq']['enable'])) {
$input_errors[] = "The system dns-forwarder is still active. Disable it before enabling the DNS Resolver.";
- }
+ }
if (empty($_POST['active_interface'])) {
$input_errors[] = "A single network interface needs to be selected for the DNS Resolver to bind to.";
- }
+ }
if (empty($_POST['outgoing_interface'])) {
$input_errors[] = "A single outgoing network interface needs to be selected for the DNS Resolver to use for outgoing DNS requests.";
- }
+ }
if ($_POST['port']) {
if (is_port($_POST['port'])) {
$a_unboundcfg['port'] = $_POST['port'];
- } else {
+ } else {
$input_errors[] = gettext("You must specify a valid port number.");
- }
- } else if (isset($config['unbound']['port'])) {
+ }
+ } else if (isset($config['unbound']['port'])) {
unset($config['unbound']['port']);
- }
+ }
if (isset($_POST['enable'])) {
$a_unboundcfg['enable'] = true;
- } else {
+ } else {
unset($a_unboundcfg['enable']);
- }
+ }
if (isset($_POST['dnssec'])) {
$a_unboundcfg['dnssec'] = true;
- } else {
+ } else {
unset($a_unboundcfg['dnssec']);
- }
+ }
if (isset($_POST['forwarding'])) {
$a_unboundcfg['forwarding'] = true;
- } else {
+ } else {
unset($a_unboundcfg['forwarding']);
- }
- if (isset($_POST['regdhcp'])) {
+ }
+ if (isset($_POST['regdhcp'])) {
$a_unboundcfg['regdhcp'] = true;
- } else {
+ } else {
unset($a_unboundcfg['regdhcp']);
- }
+ }
if (isset($_POST['regdhcpstatic'])) {
$a_unboundcfg['regdhcpstatic'] = true;
- } else {
+ } else {
unset($a_unboundcfg['regdhcpstatic']);
- }
+ }
if (isset($_POST['txtsupport'])) {
$a_unboundcfg['txtsupport'] = true;
- } else {
+ } else {
unset($a_unboundcfg['txtsupport']);
- }
+ }
if (is_array($_POST['active_interface']) && !empty($_POST['active_interface'])) {
$a_unboundcfg['active_interface'] = implode(",", $_POST['active_interface']);
- }
+ }
if (is_array($_POST['outgoing_interface']) && !empty($_POST['outgoing_interface'])) {
$a_unboundcfg['outgoing_interface'] = implode(",", $_POST['outgoing_interface']);
- }
+ }
$a_unboundcfg['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']);
diff --git a/usr/local/www/services_unbound_acls.php b/usr/local/www/services_unbound_acls.php
index 9d124e8..043993f 100644
--- a/usr/local/www/services_unbound_acls.php
+++ b/usr/local/www/services_unbound_acls.php
@@ -92,24 +92,24 @@ if ($_POST) {
$networkacl[$x]['description'] = $pconfig["description{$x}"];
if (!is_ipaddr($networkacl[$x]['acl_network'])) {
$input_errors[] = gettext("You must enter a valid network IP address for {$networkacl[$x]['acl_network']}.");
- }
+ }
if (is_ipaddr($networkacl[$x]['acl_network'])) {
if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) {
$input_errors[] = gettext("You must enter a valid IPv4 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}.");
- }
+ }
} else if (function_exists("is_ipaddrv6")) {
if (!is_ipaddrv6($networkacl[$x]['acl_network'])) {
$input_errors[] = gettext("You must enter a valid IPv6 address for {$networkacl[$x]['acl_network']}.");
- } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) {
+ } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) {
$input_errors[] = gettext("You must enter a valid IPv6 netmask for {$networkacl[$x]['acl_network']}/{$networkacl[$x]['mask']}.");
- }
+ }
} else {
$input_errors[] = gettext("You must enter a valid IPv4 address for {$networkacl[$x]['acl_network']}.");
- }
+ }
} else if (isset($networkacl[$x])) {
unset($networkacl[$x]);
- }
+ }
}
if (!$input_errors) {
@@ -123,13 +123,13 @@ if ($_POST) {
$acl_entry['row'] = array();
foreach ($networkacl as $acl) {
$acl_entry['row'][] = $acl;
- }
+ }
if (isset($id) && $a_acls[$id]) {
$a_acls[$id] = $acl_entry;
- } else {
+ } else {
$a_acls[] = $acl_entry;
- }
+ }
mark_subsystem_dirty("unbound");
write_config();
diff --git a/usr/local/www/services_unbound_advanced.php b/usr/local/www/services_unbound_advanced.php
index 9640074..aad65fd 100644
--- a/usr/local/www/services_unbound_advanced.php
+++ b/usr/local/www/services_unbound_advanced.php
@@ -6,26 +6,26 @@
Copyright (C) 2011 Warren Baker (warren@pfsense.org)
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.
*/
/*
pfSense_MODULE: dnsresolver
@@ -86,38 +86,38 @@ if ($_POST) {
$savemsg = get_std_save_message($retval);
if ($retval == 0) {
clear_subsystem_dirty('unbound');
- }
+ }
} else {
if (isset($_POST['hideidentity'])) {
$config['unbound']['hideidentity'] = true;
- } else {
+ } else {
unset($config['unbound']['hideidentity']);
- }
+ }
if (isset($_POST['hideversion'])) {
$config['unbound']['hideversion'] = true;
- } else {
+ } else {
unset($config['unbound']['hideversion']);
- }
+ }
if (isset($_POST['prefetch'])) {
$config['unbound']['prefetch'] = true;
- } else {
+ } else {
unset($config['unbound']['prefetch']);
- }
+ }
if (isset($_POST['prefetchkey'])) {
$config['unbound']['prefetchkey'] = true;
- } else {
+ } else {
unset($config['unbound']['prefetchkey']);
- }
+ }
if (isset($_POST['hardenglue'])) {
$config['unbound']['hardenglue'] = true;
- } else {
+ } else {
unset($config['unbound']['hardenglue']);
- }
+ }
if (isset($_POST['dnssecstripped'])) {
$config['unbound']['dnssecstripped'] = true;
- } else {
+ } else {
unset($config['unbound']['dnssecstripped']);
- }
+ }
$config['unbound']['msgcachesize'] = $_POST['msgcachesize'];
$config['unbound']['outgoing_num_tcp'] = $_POST['outgoing_num_tcp'];
$config['unbound']['incoming_num_tcp'] = $_POST['incoming_num_tcp'];
OpenPOWER on IntegriCloud