From a8641315f3c155ba710627ea7ea38ec75290ff6e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 28 Dec 2014 12:09:46 +0100 Subject: [PATCH] services: apply whitespace cleanups --- src/www/services_captiveportal.php | 44 ++-- .../services_captiveportal_filemanager.php | 80 +++---- src/www/services_captiveportal_hostname.php | 44 ++-- .../services_captiveportal_hostname_edit.php | 70 +++--- src/www/services_captiveportal_ip.php | 50 ++-- src/www/services_captiveportal_ip_edit.php | 66 +++--- src/www/services_captiveportal_mac.php | 38 +-- src/www/services_captiveportal_mac_edit.php | 30 +-- src/www/services_captiveportal_vouchers.php | 150 ++++++------ .../services_captiveportal_vouchers_edit.php | 82 +++---- src/www/services_captiveportal_zones.php | 24 +- src/www/services_captiveportal_zones_edit.php | 20 +- src/www/services_dhcp.php | 38 +-- src/www/services_dhcp_edit.php | 30 +-- src/www/services_dhcp_relay.php | 48 ++-- src/www/services_dhcpv6.php | 72 +++--- src/www/services_dhcpv6_edit.php | 80 +++---- src/www/services_dhcpv6_relay.php | 46 ++-- src/www/services_dnsmasq.php | 56 ++--- .../services_dnsmasq_domainoverride_edit.php | 28 +-- src/www/services_dnsmasq_edit.php | 72 +++--- src/www/services_dyndns.php | 36 +-- src/www/services_dyndns_edit.php | 82 +++---- src/www/services_igmpproxy.php | 32 +-- src/www/services_igmpproxy_edit.php | 56 ++--- src/www/services_ntpd.php | 36 +-- src/www/services_ntpd_gps.php | 36 +-- src/www/services_ntpd_pps.php | 38 +-- src/www/services_rfc2136.php | 36 +-- src/www/services_rfc2136_edit.php | 44 ++-- src/www/services_snmp.php | 222 +++++++++--------- src/www/services_unbound.php | 72 +++--- src/www/services_unbound_acls.php | 56 ++--- src/www/services_unbound_advanced.php | 26 +- .../services_unbound_domainoverride_edit.php | 32 +-- src/www/services_unbound_host_edit.php | 60 ++--- src/www/services_vpn_pppoe.php | 2 +- src/www/services_wol.php | 80 +++---- src/www/services_wol_edit.php | 74 +++--- 39 files changed, 1094 insertions(+), 1094 deletions(-) diff --git a/src/www/services_captiveportal.php b/src/www/services_captiveportal.php index 7ab824550..fc136f662 100644 --- a/src/www/services_captiveportal.php +++ b/src/www/services_captiveportal.php @@ -497,16 +497,16 @@ function enable_change(enable_change) {
-
+
- - + + - +
- - + + - -
- -
- -
- + ?> + +
+ +
+ + +
@@ -553,7 +553,7 @@ function enable_change(enable_change) { - + - + - + - +
- +
" . htmlspecialchars("{$sn['descr']} - {$snip}") . ">\n"; @@ -873,13 +873,13 @@ function enable_change(enable_change) {
/>
/>

@@ -1080,7 +1080,7 @@ function enable_change(enable_change) {
-
+
@@ -1092,4 +1092,4 @@ function enable_change(enable_change) { enable_change(false); //]]> - \ No newline at end of file + diff --git a/src/www/services_captiveportal_filemanager.php b/src/www/services_captiveportal_filemanager.php index cedc95e5d..46f26a899 100644 --- a/src/www/services_captiveportal_filemanager.php +++ b/src/www/services_captiveportal_filemanager.php @@ -58,7 +58,7 @@ require("captiveportal.inc"); $cpzone = $_GET['zone']; if (isset($_POST['zone'])) $cpzone = $_POST['zone']; - + if (empty($cpzone)) { header("Location: services_captiveportal_zones.php"); exit; @@ -86,14 +86,14 @@ if ($_POST) { if (is_uploaded_file($_FILES['new']['tmp_name'])) { - if(!stristr($_FILES['new']['name'], "captiveportal-")) - $name = "captiveportal-" . $_FILES['new']['name']; - else - $name = $_FILES['new']['name']; - $size = filesize($_FILES['new']['tmp_name']); + if(!stristr($_FILES['new']['name'], "captiveportal-")) + $name = "captiveportal-" . $_FILES['new']['name']; + else + $name = $_FILES['new']['name']; + $size = filesize($_FILES['new']['tmp_name']); - // is there already a file with that name? - foreach ($a_element as $element) { + // is there already a file with that name? + foreach ($a_element as $element) { if ($element['name'] == $name) { $input_errors[] = sprintf(gettext("A file with the name '%s' already exists."), $name); break; @@ -146,14 +146,14 @@ $main_buttons = array(
-
+
- - - + + +
- - - -
- -
- -
+ +
+ +
+ + - - + +
- +
- +
Upload fileUpload file
" /> - Cancel - + Cancel +

- + - - - + + +
- +
- + - + 0): ?> - + - +
- +
@@ -214,18 +214,18 @@ $main_buttons = array(
- +
@@ -242,13 +242,13 @@ $main_buttons = array( <a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&redirurl=$PORTAL_REDIRURL$"></a>

- + -
+
- \ No newline at end of file + diff --git a/src/www/services_captiveportal_hostname.php b/src/www/services_captiveportal_hostname.php index a5028df51..2db2db92f 100644 --- a/src/www/services_captiveportal_hostname.php +++ b/src/www/services_captiveportal_hostname.php @@ -67,7 +67,7 @@ if ($_GET['act'] == "del" && !empty($cpzone)) { $a_allowedhostnames =& $a_cp[$cpzone]['allowedhostname']; if ($a_allowedhostnames[$_GET['id']]) { $ipent = $a_allowedhostnames[$_GET['id']]; - + if (isset($a_cp[$cpzone]['enable'])) { if (!empty($ipent['sn'])) $ipent['ip'] .= "/{$ipent['sn']}"; @@ -83,7 +83,7 @@ if ($_GET['act'] == "del" && !empty($cpzone)) { pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_XDEL, 4, $ip); } } - + unset($a_allowedhostnames[$_GET['id']]); write_config(); captiveportal_allowedhostname_configure(); @@ -105,14 +105,14 @@ $main_buttons = array(
-
+
- - - + + +
- - - -
- -
- -
+ +
+ +
+ + - +
- +
any"; } - - ?> + + ?> - +
- +
  @@ -165,7 +165,7 @@ $main_buttons = array(  ')" class="btn btn-default btn-xs">


@@ -193,11 +193,11 @@ $main_buttons = array(

-
+
- \ No newline at end of file + diff --git a/src/www/services_captiveportal_hostname_edit.php b/src/www/services_captiveportal_hostname_edit.php index de606aee3..fe7aede27 100644 --- a/src/www/services_captiveportal_hostname_edit.php +++ b/src/www/services_captiveportal_hostname_edit.php @@ -1,4 +1,4 @@ - @@ -7,17 +7,17 @@ Originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2004 Dinesh Nair All rights reserved. - + 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. - + 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 @@ -99,10 +99,10 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "hostname"); $reqdfieldsn = array(gettext("Allowed Hostname")); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - - if (($_POST['hostname'] && !is_hostname($_POST['hostname']))) + + if (($_POST['hostname'] && !is_hostname($_POST['hostname']))) $input_errors[] = sprintf(gettext("A valid Hostname must be specified. [%s]"), $_POST['hostname']); if ($_POST['bw_up'] && !is_numeric($_POST['bw_up'])) @@ -113,11 +113,11 @@ if ($_POST) { foreach ($a_allowedhostnames as $ipent) { if (isset($id) && ($a_allowedhostnames[$id]) && ($a_allowedhostnames[$id] === $ipent)) continue; - + if ($ipent['hostname'] == $_POST['hostname']){ $input_errors[] = sprintf("[%s] %s.", $_POST['hostname'], gettext("already allowed")) ; break ; - } + } } if (!$input_errors) { @@ -136,7 +136,7 @@ if ($_POST) { $a_allowedhostnames[] = $ip; allowedhostnames_sort(); - + write_config(); $rules = captiveportal_allowedhostname_configure(); @@ -144,7 +144,7 @@ if ($_POST) { $cpzoneid = $a_cp[$cpzone]['zoneid']; mwexec("/sbin/ipfw -x {$cpzoneid} {$g['tmp_path']}/hostname_rules"); unset($rules); - + header("Location: services_captiveportal_hostname.php?zone={$cpzone}"); exit; } @@ -161,25 +161,25 @@ include("head.inc");
- -
- + +
+ - +
- -
- -
- -
- + +
+ + + +
+
- - - @@ -218,7 +218,7 @@ include("head.inc"); -
+ -
- . +
+ . .
+ -
+
.
+
.
  + " /> @@ -227,12 +227,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_captiveportal_ip.php b/src/www/services_captiveportal_ip.php index 5d1c1a635..50b847c43 100644 --- a/src/www/services_captiveportal_ip.php +++ b/src/www/services_captiveportal_ip.php @@ -65,21 +65,21 @@ if ($_GET['act'] == "del") { $a_allowedips =& $config['captiveportal'][$cpzone]['allowedip']; if ($a_allowedips[$_GET['id']]) { $ipent = $a_allowedips[$_GET['id']]; - + if (isset($config['captiveportal'][$cpzone]['enable'])) { $mask = (!empty($ipent['sn'])) ? $ipent['sn'] : 32; - + $ipfw = pfSense_ipfw_getTablestats($cpzone, 3, $ipent['ip'], $mask); pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_XDEL, 3, $ipent['ip'], $mask); pfSense_ipfw_Tableaction($cpzone, IP_FW_TABLE_XDEL, 4, $ipent['ip'], $mask); - + if (is_array($ipfw)) { captiveportal_free_dn_ruleno($ipfw['dnpipe']); pfSense_pipe_action("pipe delete {$ipfw['dnpipe']}"); pfSense_pipe_action("pipe delete " . ($ipfw['dnpipe']+1)); } } - + unset($a_allowedips[$_GET['id']]); write_config(); header("Location: services_captiveportal_ip.php?zone={$cpzone}"); @@ -102,14 +102,14 @@ $main_buttons = array(
-
+
- - - + + +
- - - -
- -
- -
+ +
+ +
+ + - +
- +
any"; } - - ?> + + ?> - +
- +
  @@ -166,7 +166,7 @@ $main_buttons = array( ')" class="btn btn-default btn-xs">


@@ -178,11 +178,11 @@ $main_buttons = array(

-
+
- \ No newline at end of file + diff --git a/src/www/services_captiveportal_ip_edit.php b/src/www/services_captiveportal_ip_edit.php index 449cc74bc..8a37195a9 100644 --- a/src/www/services_captiveportal_ip_edit.php +++ b/src/www/services_captiveportal_ip_edit.php @@ -1,23 +1,23 @@ - All rights reserved. - Originally part of m0n0wall (http://m0n0.ch/wall) + Originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2004 Dinesh Nair All rights reserved. - + 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. - + 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 @@ -63,7 +63,7 @@ $shortcut_section = "captiveportal"; $cpzone = $_GET['zone']; if (isset($_POST['zone'])) $cpzone = $_POST['zone']; - + if (empty($cpzone) || empty($config['captiveportal'][$cpzone])) { header("Location: services_captiveportal_zones.php"); exit; @@ -98,15 +98,15 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "ip sn"); $reqdfieldsn = array(gettext("Allowed IP address"), gettext("Subnet mask")); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - + if ($_POST['ip'] && !is_ipaddr($_POST['ip'])) $input_errors[] = sprintf(gettext("A valid IP address must be specified. [%s]"), $_POST['ip']); - + if ($_POST['sn'] && (!is_numeric($_POST['sn']) || ($_POST['sn'] < 1) || ($_POST['sn'] > 32))) $input_errors[] = gettext("A valid subnet mask must be specified"); - + if ($_POST['bw_up'] && !is_numeric($_POST['bw_up'])) $input_errors[] = gettext("Upload speed needs to be an integer"); @@ -116,11 +116,11 @@ if ($_POST) { foreach ($a_allowedips as $ipent) { if (isset($id) && ($a_allowedips[$id]) && ($a_allowedips[$id] === $ipent)) continue; - + if ($ipent['ip'] == $_POST['ip']){ $input_errors[] = sprintf("[%s] %s.", $_POST['ip'], gettext("already allowed")) ; break ; - } + } } if (!$input_errors) { @@ -168,7 +168,7 @@ if ($_POST) { mwexec("/sbin/ipfw -x {$cpzoneid} -q {$g['tmp_path']}/{$uniqid}_tmp"); @unlink("{$g['tmp_path']}/{$uniqid}_tmp"); } - + header("Location: services_captiveportal_ip.php?zone={$cpzone}"); exit; } @@ -185,38 +185,38 @@ include("head.inc");
- -
- + +
+ - +
- -
- -
- -
- + +
+ + + +
+
- - @@ -237,7 +237,7 @@ include("head.inc"); -
+ / -
+
.
+
.
  + " /> @@ -246,12 +246,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_captiveportal_mac.php b/src/www/services_captiveportal_mac.php index a1af1f6b9..1e2721412 100644 --- a/src/www/services_captiveportal_mac.php +++ b/src/www/services_captiveportal_mac.php @@ -148,17 +148,17 @@ $main_buttons = array(
-
+
- +

You must apply the changes in order for them to take effect."));?>
- - + +

- - - -
- -
- -
+ +
+ +
+ + - +
- +
@@ -211,7 +211,7 @@ $main_buttons = array( endforeach; endif; ?> - +
@@ -224,12 +224,12 @@ $main_buttons = array(
-
+
- +
- - \ No newline at end of file + + diff --git a/src/www/services_captiveportal_mac_edit.php b/src/www/services_captiveportal_mac_edit.php index b9ac79f9a..fe4973bea 100644 --- a/src/www/services_captiveportal_mac_edit.php +++ b/src/www/services_captiveportal_mac_edit.php @@ -180,19 +180,19 @@ include("head.inc");
- -
- + +
+ - +
- -
- -
- -
- + +
+ + + +
+
@@ -266,12 +266,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_captiveportal_vouchers.php b/src/www/services_captiveportal_vouchers.php index 4430f1d5f..2f38b4868 100644 --- a/src/www/services_captiveportal_vouchers.php +++ b/src/www/services_captiveportal_vouchers.php @@ -1,18 +1,18 @@ - - All rights reserved. - + All rights reserved. + 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. - + 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 @@ -78,7 +78,7 @@ if (!is_array($config['captiveportal'])) $config['captiveportal'] = array(); $a_cp =& $config['captiveportal']; -if (!is_array($config['voucher'])) +if (!is_array($config['voucher'])) $config['voucher'] = array(); if (empty($a_cp[$cpzone])) { @@ -91,17 +91,17 @@ if (empty($a_cp[$cpzone])) { $pgtitle = array(gettext("Services"), gettext("Captive portal"), gettext("Vouchers"), $a_cp[$cpzone]['zone']); $shortcut_section = "captiveportal-vouchers"; -if (!is_array($config['voucher'][$cpzone]['roll'])) +if (!is_array($config['voucher'][$cpzone]['roll'])) $config['voucher'][$cpzone]['roll'] = array(); -if (!isset($config['voucher'][$cpzone]['charset'])) +if (!isset($config['voucher'][$cpzone]['charset'])) $config['voucher'][$cpzone]['charset'] = '2345678abcdefhijkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ'; -if (!isset($config['voucher'][$cpzone]['rollbits'])) +if (!isset($config['voucher'][$cpzone]['rollbits'])) $config['voucher'][$cpzone]['rollbits'] = 16; -if (!isset($config['voucher'][$cpzone]['ticketbits'])) +if (!isset($config['voucher'][$cpzone]['ticketbits'])) $config['voucher'][$cpzone]['ticketbits'] = 10; -if (!isset($config['voucher'][$cpzone]['checksumbits'])) +if (!isset($config['voucher'][$cpzone]['checksumbits'])) $config['voucher'][$cpzone]['checksumbits'] = 5; -if (!isset($config['voucher'][$cpzone]['magic'])) +if (!isset($config['voucher'][$cpzone]['magic'])) $config['voucher'][$cpzone]['magic'] = rand(); // anything slightly random will do if (!isset($config['voucher'][$cpzone]['exponent'])) { while (true) { @@ -128,9 +128,9 @@ if (!isset($config['voucher'][$cpzone]['publickey'])) { } // Check for invalid or expired vouchers -if (!isset($config['voucher'][$cpzone]['descrmsgnoaccess'])) +if (!isset($config['voucher'][$cpzone]['descrmsgnoaccess'])) $config['voucher'][$cpzone]['descrmsgnoaccess'] = gettext("Voucher invalid"); -if (!isset($config['voucher'][$cpzone]['descrmsgexpired'])) +if (!isset($config['voucher'][$cpzone]['descrmsgexpired'])) $config['voucher'][$cpzone]['descrmsgexpired'] = gettext("Voucher expired"); $a_roll = &$config['voucher'][$cpzone]['roll']; @@ -138,7 +138,7 @@ $a_roll = &$config['voucher'][$cpzone]['roll']; if ($_GET['act'] == "del") { $id = $_GET['id']; if ($a_roll[$id]) { - $roll = $a_roll[$id]['number']; + $roll = $a_roll[$id]['number']; $voucherlck = lock("voucher{$cpzone}"); unset($a_roll[$id]); voucher_unlink_db($roll); @@ -207,36 +207,36 @@ if ($_POST) { /* input validation */ if ($_POST['enable'] == "yes") { - if (!$_POST['vouchersyncusername']) { + if (!$_POST['vouchersyncusername']) { $reqdfields = explode(" ", "charset rollbits ticketbits checksumbits publickey magic"); $reqdfieldsn = array(gettext("charset"),gettext("rollbits"),gettext("ticketbits"),gettext("checksumbits"),gettext("publickey"),gettext("magic")); } else { $reqdfields = explode(" ", "vouchersyncdbip vouchersyncport vouchersyncpass vouchersyncusername"); $reqdfieldsn = array(gettext("Synchronize Voucher Database IP"),gettext("Sync port"),gettext("Sync password"),gettext("Sync username")); } - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); } - - if (!$_POST['vouchersyncusername']) { + + if (!$_POST['vouchersyncusername']) { // Check for form errors - if ($_POST['charset'] && (strlen($_POST['charset'] < 2))) + if ($_POST['charset'] && (strlen($_POST['charset'] < 2))) $input_errors[] = gettext("Need at least 2 characters to create vouchers."); - if ($_POST['charset'] && (strpos($_POST['charset'],"\"")>0)) + if ($_POST['charset'] && (strpos($_POST['charset'],"\"")>0)) $input_errors[] = gettext("Double quotes aren't allowed."); - if ($_POST['charset'] && (strpos($_POST['charset'],",")>0)) + if ($_POST['charset'] && (strpos($_POST['charset'],",")>0)) $input_errors[] = "',' " . gettext("aren't allowed."); - if ($_POST['rollbits'] && (!is_numeric($_POST['rollbits']) || ($_POST['rollbits'] < 1) || ($_POST['rollbits'] > 31))) + if ($_POST['rollbits'] && (!is_numeric($_POST['rollbits']) || ($_POST['rollbits'] < 1) || ($_POST['rollbits'] > 31))) $input_errors[] = gettext("# of Bits to store Roll Id needs to be between 1..31."); - if ($_POST['ticketbits'] && (!is_numeric($_POST['ticketbits']) || ($_POST['ticketbits'] < 1) || ($_POST['ticketbits'] > 16))) + if ($_POST['ticketbits'] && (!is_numeric($_POST['ticketbits']) || ($_POST['ticketbits'] < 1) || ($_POST['ticketbits'] > 16))) $input_errors[] = gettext("# of Bits to store Ticket Id needs to be between 1..16."); - if ($_POST['checksumbits'] && (!is_numeric($_POST['checksumbits']) || ($_POST['checksumbits'] < 1) || ($_POST['checksumbits'] > 31))) + if ($_POST['checksumbits'] && (!is_numeric($_POST['checksumbits']) || ($_POST['checksumbits'] < 1) || ($_POST['checksumbits'] > 31))) $input_errors[] = gettext("# of Bits to store checksum needs to be between 1..31."); - if ($_POST['publickey'] && (!strstr($_POST['publickey'],"BEGIN PUBLIC KEY"))) + if ($_POST['publickey'] && (!strstr($_POST['publickey'],"BEGIN PUBLIC KEY"))) $input_errors[] = gettext("This doesn't look like an RSA Public key."); - if ($_POST['privatekey'] && (!strstr($_POST['privatekey'],"BEGIN RSA PRIVATE KEY"))) + if ($_POST['privatekey'] && (!strstr($_POST['privatekey'],"BEGIN RSA PRIVATE KEY"))) $input_errors[] = gettext("This doesn't look like an RSA Private key."); - if ($_POST['vouchersyncdbip'] && (is_ipaddr_configured($_POST['vouchersyncdbip']))) + if ($_POST['vouchersyncdbip'] && (is_ipaddr_configured($_POST['vouchersyncdbip']))) $input_errors[] = gettext("You cannot sync the voucher database to this host (itself)."); } @@ -272,7 +272,7 @@ if ($_POST) { $newvoucher['vouchersyncport'] = $_POST['vouchersyncport']; $newvoucher['vouchersyncusername'] = $_POST['vouchersyncusername']; $newvoucher['vouchersyncpass'] = $_POST['vouchersyncpass']; - if($newvoucher['vouchersyncpass'] && $newvoucher['vouchersyncusername'] && + if($newvoucher['vouchersyncpass'] && $newvoucher['vouchersyncusername'] && $newvoucher['vouchersyncport'] && $newvoucher['vouchersyncdbip']) { // Synchronize the voucher DB from the master node require_once("xmlrpc.inc"); @@ -283,7 +283,7 @@ if ($_POST) { $protocol = "https"; if ($protocol == "https" || $newvoucher['vouchersyncport'] == "443") $url = "https://{$newvoucher['vouchersyncdbip']}"; - else + else $url = "http://{$newvoucher['vouchersyncdbip']}"; $execcmd = <<value()); if(!is_array($toreturn)) { - if($toreturn == "Authentication failed") + if($toreturn == "Authentication failed") $input_errors[] = "Could not synchronize the voucher database: Authentication Failed."; - } else { + } else { // If we received back the voucher roll and other information then store it. if($toreturn['voucher']['roll']) $newvoucher['roll'] = $toreturn['voucher']['roll']; @@ -378,10 +378,10 @@ function generatenewkey() { jQuery('#privatekey').val('One moment please...'); jQuery.ajax("services_captiveportal_vouchers.php?zone=&generatekey=true", { type: 'get', - success: function(data) { + success: function(data) { eval(data); } - }); + }); } function before_save() { document.iform.charset.disabled = false; @@ -399,7 +399,7 @@ function before_save() { } function enable_change(enable_change) { var endis; - endis = !(document.iform.enable.checked || enable_change); + endis = !(document.iform.enable.checked || enable_change); document.iform.charset.disabled = endis; document.iform.rollbits.disabled = endis; document.iform.ticketbits.disabled = endis; @@ -441,15 +441,15 @@ function enable_change(enable_change) {
-
+
- + - - + +
- - - -
- -
- -
+ +
+ +
+ + - +
- - +
+ @@ -508,20 +508,20 @@ function enable_change(enable_change) { - - -
  onclick="enable_change(false)" /> @@ -480,8 +480,8 @@ function enable_change(enable_change) {
- (Synchronized from {$pconfig['vouchersyncdbip']})"; ?>   +
- + + + . - + @@ -556,7 +556,7 @@ function enable_change(enable_change) { - + # @@ -564,7 +564,7 @@ function enable_change(enable_change) { - + # @@ -572,7 +572,7 @@ function enable_change(enable_change) { - + # @@ -580,7 +580,7 @@ function enable_change(enable_change) { - + @@ -588,14 +588,14 @@ function enable_change(enable_change) { - +
($PORTAL_MESSAGE$). - + @@ -608,11 +608,11 @@ function enable_change(enable_change) {   - +-->   @@ -659,11 +659,11 @@ function enable_change(enable_change) {

- +
-
+
@@ -675,4 +675,4 @@ function enable_change(enable_change) { enable_change(false); //]]> - \ No newline at end of file + diff --git a/src/www/services_captiveportal_vouchers_edit.php b/src/www/services_captiveportal_vouchers_edit.php index 614850d29..5e105777c 100644 --- a/src/www/services_captiveportal_vouchers_edit.php +++ b/src/www/services_captiveportal_vouchers_edit.php @@ -1,18 +1,18 @@ -. - All rights reserved. - + All rights reserved. + 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. - + 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 @@ -24,7 +24,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: captiveportal */ @@ -84,7 +84,7 @@ $maxnumber = (1<<$config['voucher'][$cpzone]['rollbits']) -1; // Highest Roll $maxcount = (1<<$config['voucher'][$cpzone]['ticketbits']) -1; // Highest Ticket# if ($_POST) { - + unset($input_errors); $pconfig = $_POST; @@ -101,8 +101,8 @@ if ($_POST) { break; } } - - if (!is_numeric($_POST['number']) || $_POST['number'] >= $maxnumber) + + if (!is_numeric($_POST['number']) || $_POST['number'] >= $maxnumber) $input_errors[] = sprintf(gettext("Roll number must be numeric and less than %s"), $maxnumber); if (!is_numeric($_POST['count']) || $_POST['count'] < 1 || $_POST['count'] > $maxcount) @@ -171,57 +171,57 @@ include("head.inc");
- -
- + +
+ - -
- -
- -
- -
- - +
+ +
+ + + +
+
+ + - - + - - + - - + - - + -
# - + +
# (0..) .
- + +
.
- + +
(1..) .
- + +
.
  - " /> + + " /> @@ -229,12 +229,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_captiveportal_zones.php b/src/www/services_captiveportal_zones.php index c30b771dd..1522fa66e 100644 --- a/src/www/services_captiveportal_zones.php +++ b/src/www/services_captiveportal_zones.php @@ -43,7 +43,7 @@ $shortcut_section = "captiveportal"; include("head.inc"); $main_buttons = array( - array('href'=>'services_captiveportal_zones_edit.php', 'label'=>gettext("add a new captiveportal instance")), + array('href'=>'services_captiveportal_zones_edit.php', 'label'=>gettext("add a new captiveportal instance")), ); ?> @@ -52,22 +52,22 @@ $main_buttons = array(
-
+
- +

" . gettext("You must apply the changes in order for them to take effect."));?> - +

- -
- -
+ +
+ +
- +
@@ -75,7 +75,7 @@ $main_buttons = array( $cpitem): @@ -109,10 +109,10 @@ $main_buttons = array(
- +
- +
- \ No newline at end of file + diff --git a/src/www/services_captiveportal_zones_edit.php b/src/www/services_captiveportal_zones_edit.php index d9e31f120..114d3bdfe 100644 --- a/src/www/services_captiveportal_zones_edit.php +++ b/src/www/services_captiveportal_zones_edit.php @@ -91,24 +91,24 @@ include("head.inc");
- -
- + +
+
- -
+ +

- +
- +
- +
@@ -132,7 +132,7 @@ include("head.inc");
-
+
@@ -141,4 +141,4 @@ include("head.inc");
- \ No newline at end of file + diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php index 48d5f8d40..10397ebee 100644 --- a/src/www/services_dhcp.php +++ b/src/www/services_dhcp.php @@ -705,9 +705,9 @@ include("head.inc");
-
+
- +
@@ -715,9 +715,9 @@ include("head.inc");
- - - - -
- + +
+
- + - - + +
@@ -893,7 +893,7 @@ include("head.inc"); - +
@@ -1177,7 +1177,7 @@ include("head.inc"); //]]>
- + @@ -1210,7 +1210,7 @@ include("head.inc");
- +
@@ -1265,23 +1265,23 @@ include("head.inc"); - +
- +
- - + + - \ No newline at end of file + diff --git a/src/www/services_dhcp_edit.php b/src/www/services_dhcp_edit.php index 8684302a3..f6b1f085c 100644 --- a/src/www/services_dhcp_edit.php +++ b/src/www/services_dhcp_edit.php @@ -361,19 +361,19 @@ include("head.inc");
- -
- + +
+ - +
- -
- -
- -
- + +
+ + + +
+
@@ -556,12 +556,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_dhcp_relay.php b/src/www/services_dhcp_relay.php index 826b67c40..af71cfb7d 100644 --- a/src/www/services_dhcp_relay.php +++ b/src/www/services_dhcp_relay.php @@ -3,7 +3,7 @@ services_dhcp_relay.php Copyright (C) 2003-2004 Justin Ellison . - Copyright (C) 2010 Ermal Luçi + Copyright (C) 2010 Ermal Luçi All rights reserved. Redistribution and use in source and binary forms, with or without @@ -56,8 +56,8 @@ $iflist = get_configured_interface_with_descr(); */ $dhcpd_enabled = false; if (is_array($config['dhcpd'])) { - foreach($config['dhcpd'] as $dhcp) - if (isset($dhcp['enable'])) + foreach($config['dhcpd'] as $dhcp) + if (isset($dhcp['enable'])) $dhcpd_enabled = true; } @@ -128,29 +128,29 @@ function enable_change(enable_over) {
- -
- + +
+
- -
- -
- - + +
+ + + +

DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.

- +
-

-
- -
-
- +

+ + +
+
+
Enable @@ -198,16 +198,16 @@ function enable_change(enable_over) {
-
-
- +
+
+ -
+
- + - + @@ -850,9 +850,9 @@ include("head.inc"); - -
- + +
+
@@ -912,12 +912,12 @@ include("head.inc");
 
- - + + - + - + @@ -926,4 +926,4 @@ include("head.inc"); enable_change(false); //]]> - \ No newline at end of file + diff --git a/src/www/services_dhcpv6_edit.php b/src/www/services_dhcpv6_edit.php index 36397a7d0..7a97334e7 100644 --- a/src/www/services_dhcpv6_edit.php +++ b/src/www/services_dhcpv6_edit.php @@ -1,23 +1,23 @@ -. Copyright (C) 2011 Seth Mos . All rights reserved. - + 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. - + 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 @@ -65,7 +65,7 @@ require("guiconfig.inc"); $if = $_GET['if']; if ($_POST['if']) $if = $_POST['if']; - + if (!$if) { header("Location: services_dhcpv6.php"); exit; @@ -112,13 +112,13 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "duid"); $reqdfieldsn = array(gettext("DUID Identifier")); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); if ($_POST['hostname']) { preg_match("/\-\$/", $_POST['hostname'], $matches); if($matches) - $input_errors[] = gettext("The hostname cannot end with a hyphen according to RFC952"); + $input_errors[] = gettext("The hostname cannot end with a hyphen according to RFC952"); if (!is_hostname($_POST['hostname'])) { $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'."); } else { @@ -133,7 +133,7 @@ if ($_POST) { if (empty($_POST['duid'])) { $input_errors[] = gettext("A valid DUID Identifier must be specified."); } - + /* check for overlaps */ foreach ($a_maps as $mapent) { if (isset($id) && ($a_maps[$id]) && ($a_maps[$id] === $mapent)) @@ -144,7 +144,7 @@ if ($_POST) { break; } } - + /* make sure it's not within the dynamic subnet */ if ($_POST['ipaddrv6']) { /* oh boy, we need to be able to somehow do this at some point. skip */ @@ -164,7 +164,7 @@ if ($_POST) { else $a_maps[] = $mapent; staticmaps_sort($if); - + write_config(); if(isset($config['dhcpdv6'][$if]['enable'])) { @@ -194,26 +194,26 @@ include("head.inc");
- -
- - -
- -
- -
- -
- - +
+ + +
+ +
+ + + +
+
+ + - - + + - - - + - - + @@ -250,16 +250,16 @@ include("head.inc");
-, overrides setting on main page. - + - - + -
+

@@ -222,7 +222,7 @@ include("head.inc");
+
@@ -230,12 +230,12 @@ include("head.inc");
+
Netboot filename
+
  + " /> " onclick="window.location.href=''" /> @@ -269,12 +269,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_dhcpv6_relay.php b/src/www/services_dhcpv6_relay.php index 3f98d3a76..559a54028 100644 --- a/src/www/services_dhcpv6_relay.php +++ b/src/www/services_dhcpv6_relay.php @@ -3,8 +3,8 @@ services_dhcpv6_relay.php Copyright (C) 2003-2004 Justin Ellison . - Copyright (C) 2010 Ermal Luçi - Copyright (C) 2010 Seth Mos + Copyright (C) 2010 Ermal Luçi + Copyright (C) 2010 Seth Mos All rights reserved. Redistribution and use in source and binary forms, with or without @@ -57,8 +57,8 @@ $iflist = get_configured_interface_with_descr(); */ $dhcpd_enabled = false; if (is_array($config['dhcpdv6'])) { - foreach($config['dhcpdv6'] as $dhcp) - if (isset($dhcp['enable'])) + foreach($config['dhcpdv6'] as $dhcp) + if (isset($dhcp['enable'])) $dhcpd_enabled = true; } @@ -129,29 +129,29 @@ function enable_change(enable_over) {
- -
- + +
+
- -
- -
- - + +
+ + + +

DHCPv6 Server is currently enabled. Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.

- +
-

-
- -
-
- +

+ + +
+
+
@@ -201,10 +201,10 @@ function enable_change(enable_over) {
Enable
-
- +
+
-
+
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php index 1766a4643..f61d14bd5 100644 --- a/src/www/services_dnsmasq.php +++ b/src/www/services_dnsmasq.php @@ -177,9 +177,9 @@ function show_advanced_dns() {
- -
- + +
+
@@ -187,18 +187,18 @@ function show_advanced_dns() {
- -
- -
- + +
+ + +
-

-
- -
-
- +

+ + +
+
+
@@ -336,8 +336,8 @@ function show_advanced_dns() {
-
- +
+


','','','');?>

- +
- - - - +
+ + +

@@ -368,9 +368,9 @@ function show_advanced_dns() {
- +
- +
@@ -436,7 +436,7 @@ function show_advanced_dns() {
- +
@@ -447,8 +447,8 @@ function show_advanced_dns() { " authoritative DNS server to be queried for that domain.");?>

- - + + @@ -465,7 +465,7 @@ function show_advanced_dns() { - + @@ -498,4 +498,4 @@ function show_advanced_dns() { enable_change(false); //]]> - \ No newline at end of file + diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php index 394ddc3df..9755d78d0 100644 --- a/src/www/services_dnsmasq_domainoverride_edit.php +++ b/src/www/services_dnsmasq_domainoverride_edit.php @@ -130,18 +130,18 @@ include("head.inc");
- -
+ +
- +
- -
- - - -
-
+ +
+ + + +
+
@@ -183,12 +183,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_dnsmasq_edit.php b/src/www/services_dnsmasq_edit.php index 3444d0b3a..08ad27bf6 100644 --- a/src/www/services_dnsmasq_edit.php +++ b/src/www/services_dnsmasq_edit.php @@ -1,22 +1,22 @@ - and 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: - + 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. - + 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 @@ -56,7 +56,7 @@ require("guiconfig.inc"); $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php'); -if (!is_array($config['dnsmasq']['hosts'])) +if (!is_array($config['dnsmasq']['hosts'])) $config['dnsmasq']['hosts'] = array(); $a_hosts = &$config['dnsmasq']['hosts']; @@ -82,16 +82,16 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "domain ip"); $reqdfieldsn = array(gettext("Domain"),gettext("IP address")); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - - if (($_POST['host'] && !is_hostname($_POST['host']))) + + if (($_POST['host'] && !is_hostname($_POST['host']))) $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'."); - if (($_POST['domain'] && !is_domain($_POST['domain']))) + if (($_POST['domain'] && !is_domain($_POST['domain']))) $input_errors[] = gettext("A valid domain must be specified."); - - if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) + + if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) $input_errors[] = gettext("A valid IP address must be specified."); /* collect aliases */ @@ -156,11 +156,11 @@ if ($_POST) { else $a_hosts[] = $hostent; hosts_sort(); - + mark_subsystem_dirty('hosts'); - + write_config(); - + header("Location: services_dnsmasq.php"); exit; } @@ -195,24 +195,24 @@ include("head.inc");
- -
+ +
- +
- -
- -
- -
- + +
+ + + +
+
- + - - - - @@ -298,7 +298,7 @@ include("head.inc"); -
+

@@ -220,21 +220,21 @@ include("head.inc");
+

+

192.168.100.100 fd00:abcd::1
+
  + " /> " onclick="window.location.href=''" /> @@ -307,12 +307,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_dyndns.php b/src/www/services_dyndns.php index b407ba35c..6ac7e624a 100644 --- a/src/www/services_dyndns.php +++ b/src/www/services_dyndns.php @@ -71,29 +71,29 @@ $main_buttons = array(
-
+
- + - - + +
- - - -
- - -
+ +
+ + +
- - +
+ @@ -193,7 +193,7 @@ $main_buttons = array( - +


@@ -206,12 +206,12 @@ $main_buttons = array(

- +
- - - \ No newline at end of file + + + diff --git a/src/www/services_dyndns_edit.php b/src/www/services_dyndns_edit.php index b6e055a0e..8ebbd0038 100644 --- a/src/www/services_dyndns_edit.php +++ b/src/www/services_dyndns_edit.php @@ -41,7 +41,7 @@ function is_dyndns_username($uname) { if (!is_string($uname)) return false; - + if (preg_match("/[^a-z0-9\-.@_:]/i", $uname)) return false; else @@ -85,9 +85,9 @@ if ($_POST) { unset($input_errors); $pconfig = $_POST; - + if(($pconfig['type'] == "freedns" || $pconfig['type'] == "namecheap") && $_POST['username'] == "") - $_POST['username'] = "none"; + $_POST['username'] = "none"; /* input validation */ $reqdfields = array(); @@ -99,12 +99,12 @@ if ($_POST) { $reqdfieldsn[] = gettext("Hostname"); $reqdfields[] = "password"; $reqdfieldsn[] = gettext("Password"); - $reqdfields[] = "username"; - $reqdfieldsn[] = gettext("Username"); + $reqdfields[] = "username"; + $reqdfieldsn[] = gettext("Username"); }else{ $reqdfields[] = "updateurl"; $reqdfieldsn[] = gettext("Update URL"); - } + } do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); @@ -120,10 +120,10 @@ if ($_POST) { unset($host_to_check); } - if (($_POST['mx'] && !is_domain($_POST['mx']))) + if (($_POST['mx'] && !is_domain($_POST['mx']))) $input_errors[] = gettext("The MX contains invalid characters."); - if ((in_array("username", $reqdfields) && $_POST['username'] && !is_dyndns_username($_POST['username'])) || ((in_array("username", $reqdfields)) && ($_POST['username'] == ""))) - $input_errors[] = gettext("The username contains invalid characters."); + if ((in_array("username", $reqdfields) && $_POST['username'] && !is_dyndns_username($_POST['username'])) || ((in_array("username", $reqdfields)) && ($_POST['username'] == ""))) + $input_errors[] = gettext("The username contains invalid characters."); if (!$input_errors) { $dyndns = array(); @@ -150,14 +150,14 @@ if ($_POST) { ($dyndns['type'] == "custom" || $dyndns['type'] == "custom-v6") ? $dyndns['requestif'] = $_POST['requestif'] : $dyndns['requestif'] = $_POST['interface']; $dyndns['descr'] = $_POST['descr']; $dyndns['force'] = isset($_POST['force']); - + if($dyndns['username'] == "none") $dyndns['username'] = ""; if (isset($id) && $a_dyndns[$id]) $a_dyndns[$id] = $dyndns; else { - $a_dyndns[] = $dyndns; + $a_dyndns[] = $dyndns; $id = count($a_dyndns) - 1; } @@ -184,10 +184,10 @@ include("head.inc"); - + - +
- -
- + +
+ - +
- -
- -
- -
- + +
+ + + +
+
@@ -272,12 +272,12 @@ include("head.inc"); - + - + - + - + - + - - + +
@@ -437,7 +437,7 @@ include("head.inc"); " onclick="enable_change(true)" /> - + " onclick="enable_change(true)" /> @@ -452,17 +452,17 @@ include("head.inc"); by DHCP/PPP on WAN for dynamic DNS updates to work."),'','');?>
- + - + - + - \ No newline at end of file + diff --git a/src/www/services_igmpproxy.php b/src/www/services_igmpproxy.php index 7631bec94..4ed2ebc4e 100644 --- a/src/www/services_igmpproxy.php +++ b/src/www/services_igmpproxy.php @@ -2,7 +2,7 @@ /* $Id$ */ /* services_igmpproxy.php - + Copyright (C) 2009 Ermal Luçi Copyright (C) 2004 Scott Ullrich All rights reserved. @@ -92,28 +92,28 @@ $main_buttons = array(
- -
+ +

" . gettext("You must apply the changes in order for them to take effect."));?>
- -
- -
- -
- + +
+ + + +
+
@@ -143,7 +143,7 @@ $main_buttons = array( - +
- +

@@ -157,12 +157,12 @@ $main_buttons = array(
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_igmpproxy_edit.php b/src/www/services_igmpproxy_edit.php index 79d7a73ca..ab272b672 100644 --- a/src/www/services_igmpproxy_edit.php +++ b/src/www/services_igmpproxy_edit.php @@ -110,7 +110,7 @@ if ($_POST) { mark_subsystem_dirty('igmpproxy'); header("Location: services_igmpproxy.php"); - exit; + exit; } //we received input errors, copy data to prevent retype else @@ -127,48 +127,48 @@ include("head.inc"); - + - + - + - +
- -
- + +
+
- +
- -
- -
- -
- + +
+ + + +
+
@@ -181,7 +181,7 @@ include("head.inc"); if ($ifnam == $pconfig['ifname']) echo " selected=\"selected\""; echo ">{$ifdescr}"; - } + } ?> @@ -238,7 +238,7 @@ include("head.inc"); - + @@ -295,14 +295,14 @@ include("head.inc");
- delete + delete
-
+
-
+
- + - \ No newline at end of file + diff --git a/src/www/services_ntpd.php b/src/www/services_ntpd.php index a525ba120..c09718c07 100644 --- a/src/www/services_ntpd.php +++ b/src/www/services_ntpd.php @@ -226,30 +226,30 @@ include("head.inc");
-
+
- + - - + +
- - - -
- - -
+ +
+ + +
- - +
+ @@ -267,7 +267,7 @@ include("head.inc"); $size = (count($interfaces) < 10) ? count($interfaces) : 10; ?>  "; echo "\n
- - + +
- \ No newline at end of file + diff --git a/src/www/services_ntpd_gps.php b/src/www/services_ntpd_gps.php index ab7a8def8..2d2e9cd69 100644 --- a/src/www/services_ntpd_gps.php +++ b/src/www/services_ntpd_gps.php @@ -236,7 +236,7 @@ U-Blox = #U-Blox 5, 6 and probably 7 $PUBX,40,THS,0,0,0,0,0,0*54 #turn off THS all ports (U-Blox 6) $PUBX,41,1,0007,0003,4800,0*13 # set port 1 to 4800 baud -SureGPS = #Sure Electronics SKG16B +SureGPS = #Sure Electronics SKG16B $PMTK225,0*2B $PMTK314,1,1,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,1,0*2D $PMTK301,2*2E @@ -358,28 +358,28 @@ SureGPS = #Sure Electronics SKG16B
-
+
- + - - + +
- - - -
- -
+ +
+ +
- +
@@ -412,7 +412,7 @@ SureGPS = #Sure Electronics SKG16B - +
- - - + + +
- + - \ No newline at end of file + diff --git a/src/www/services_ntpd_pps.php b/src/www/services_ntpd_pps.php index cb9303da6..baae2977d 100644 --- a/src/www/services_ntpd_pps.php +++ b/src/www/services_ntpd_pps.php @@ -87,7 +87,7 @@ if ($_POST) { $config['ntpd']['pps']['refid'] = $_POST['ppsrefid']; elseif (isset($config['ntpd']['pps']['refid'])) unset($config['ntpd']['pps']['refid']); - + write_config("Updated NTP PPS Settings"); $retval = 0; @@ -106,37 +106,37 @@ include("head.inc");
-
+
- + - - + +
- - - -
- -
+ +
+ +
- - +
+ -
- + +

: NTP"); ?> @@ -223,12 +223,12 @@ include("head.inc");
- - + +
- - \ No newline at end of file + + diff --git a/src/www/services_rfc2136.php b/src/www/services_rfc2136.php index a979f864b..a5c718eec 100644 --- a/src/www/services_rfc2136.php +++ b/src/www/services_rfc2136.php @@ -64,28 +64,28 @@ $main_buttons = array(
-
+
- - - + + +
- - - -
- - -
+ +
+ + +
- - +
+ @@ -178,16 +178,16 @@ $main_buttons = array( - - + +
- - + +
- \ No newline at end of file + diff --git a/src/www/services_rfc2136_edit.php b/src/www/services_rfc2136_edit.php index e1c459083..350fe2005 100644 --- a/src/www/services_rfc2136_edit.php +++ b/src/www/services_rfc2136_edit.php @@ -74,9 +74,9 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - if (($_POST['host'] && !is_domain($_POST['host']))) + if (($_POST['host'] && !is_domain($_POST['host']))) $input_errors[] = gettext("The DNS update host name contains invalid characters."); - if (($_POST['ttl'] && !is_numericint($_POST['ttl']))) + if (($_POST['ttl'] && !is_numericint($_POST['ttl']))) $input_errors[] = gettext("The DNS update TTL must be an integer."); if (($_POST['keyname'] && !is_domain($_POST['keyname']))) $input_errors[] = gettext("The DNS update key name contains invalid characters."); @@ -124,24 +124,24 @@ include("head.inc");
- -
- + +
+ - +
- -
- -
- -
- - + +
+ + + +
+
+ @@ -152,16 +152,16 @@ include("head.inc"); - + - +
- +
@@ -241,12 +241,12 @@ include("head.inc"); "by DHCP/PPP on WAN for dynamic DNS updates to work."),'', '');?>
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_snmp.php b/src/www/services_snmp.php index a38616bb0..e72cce346 100644 --- a/src/www/services_snmp.php +++ b/src/www/services_snmp.php @@ -1,22 +1,22 @@ -. All rights reserved. - + 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. - + 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 @@ -89,7 +89,7 @@ if ($_POST) { /* input validation */ if ($_POST['enable']) { if (strstr($_POST['syslocation'],"#")) $input_errors[] = gettext("Invalid character '#' in system location"); - if (strstr($_POST['syscontact'],"#")) $input_errors[] = gettext("Invalid character '#' in system contact"); + if (strstr($_POST['syscontact'],"#")) $input_errors[] = gettext("Invalid character '#' in system contact"); if (strstr($_POST['rocommunity'],"#")) $input_errors[] = gettext("Invalid character '#' in read community string"); $reqdfields = explode(" ", "rocommunity"); @@ -99,8 +99,8 @@ if ($_POST) { $reqdfields = explode(" ", "pollport"); $reqdfieldsn = array(gettext("Polling Port")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - - + + } if ($_POST['trapenable']) { @@ -128,12 +128,12 @@ if ($_POST) { } */ - + if (!$input_errors) { $config['snmpd']['enable'] = $_POST['enable'] ? true : false; $config['snmpd']['pollport'] = $_POST['pollport']; - $config['snmpd']['syslocation'] = $_POST['syslocation']; + $config['snmpd']['syslocation'] = $_POST['syslocation']; $config['snmpd']['syscontact'] = $_POST['syscontact']; $config['snmpd']['rocommunity'] = $_POST['rocommunity']; /* disabled until some docs show up on what this does. @@ -144,7 +144,7 @@ if ($_POST) { $config['snmpd']['trapserver'] = $_POST['trapserver']; $config['snmpd']['trapserverport'] = $_POST['trapserverport']; $config['snmpd']['trapstring'] = $_POST['trapstring']; - + $config['snmpd']['modules']['mibii'] = $_POST['mibii'] ? true : false; $config['snmpd']['modules']['netgraph'] = $_POST['netgraph'] ? true : false; $config['snmpd']['modules']['pf'] = $_POST['pf'] ? true : false; @@ -153,9 +153,9 @@ if ($_POST) { $config['snmpd']['modules']['ucd'] = $_POST['ucd'] ? true : false; $config['snmpd']['modules']['regex'] = $_POST['regex'] ? true : false; $config['snmpd']['bindip'] = $_POST['bindip']; - + write_config(); - + $retval = 0; $retval = services_snmpd_configure(); $savemsg = get_std_save_message($retval); @@ -252,7 +252,7 @@ function enable_change(whichone) { document.iform.syslocation.disabled = true; document.iform.syscontact.disabled = true; document.iform.rocommunity.disabled = true; - /* + /* document.iform.rwenable.disabled = true; document.iform.rwcommunity.disabled = true; */ @@ -280,37 +280,37 @@ function enable_change(whichone) {
-
- -
+
+ +
-
- + +
- -
- - + +
+ +
-

-
- -
- - -
- - +

+ + +
+ + +
+
+ - + - - + + - - - + + - - - + + - - - - + - */ + */ ?> -
onclick="enable_change(this)" />
@@ -318,39 +318,39 @@ function enable_change(whichone) {

+
+
+

  - onclick="enable_change(this)" /> + onclick="enable_change(this)" /> Enable Write Community String
Write community string @@ -358,36 +358,36 @@ function enable_change(whichone) {
Please use something other then "private" here
-
-
- -
+
+
+
+ +
- -
-

-
- -
- - -
- - + +
+

+
+ +
+ + +
+
+ - - - + + + - + - + -
onclick="enable_change(this)" />
@@ -395,7 +395,7 @@ function enable_change(whichone) {

@@ -403,7 +403,7 @@ function enable_change(whichone) {

@@ -411,26 +411,26 @@ function enable_change(whichone) {

-
-
- -
+ + + + +
- -
-

-
- -
- - -
- - - + +
+

+
+ +
+ + +
+
+ + - -
@@ -448,26 +448,26 @@ function enable_change(whichone) {
-
-
- -
+ + + + + +
- -
-

-
- -
- - -
- - + +
+

+
+ +
+ + +
+
+ - + -
@@ -486,25 +486,25 @@ function enable_change(whichone) {
  + " onclick="enable_change(true)" />
-
-
-
+ + +
- + - + - \ No newline at end of file + diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php index 00aecf7dc..b4cc9325c 100644 --- a/src/www/services_unbound.php +++ b/src/www/services_unbound.php @@ -191,31 +191,31 @@ function show_advanced_dns() {
-
+
- +
" . gettext("You must apply the changes in order for them to take effect."));?>
- +
- +
- - - -
+ +
- +
@@ -356,8 +356,8 @@ function show_advanced_dns() {
- -
+ +


','');?>

- +
- +
- +
- +
-

-
- -
- - -
+

+ + +
+ + +
@@ -435,22 +435,22 @@ function show_advanced_dns() { - + - +
- +
- +
-

-
- -
-

+ + +

+

-
- +
+
@@ -468,7 +468,7 @@ function show_advanced_dns() { - + @@ -499,7 +499,7 @@ function show_advanced_dns() { - + @@ -510,4 +510,4 @@ function show_advanced_dns() { enable_change(false); //]]> - \ No newline at end of file + diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php index 1d1484320..fe9daefca 100644 --- a/src/www/services_unbound_acls.php +++ b/src/www/services_unbound_acls.php @@ -164,46 +164,46 @@ include("head.inc");
-
+
- + - - - + + +
- - - -
- - -
+ +
+ + + - +
-
- +
+ @@ -291,10 +291,10 @@ include("head.inc"); loaded = ; //]]> - + - +
@@ -315,13 +315,13 @@ include("head.inc");
- -
+ +
- +
- +
@@ -384,13 +384,13 @@ include("head.inc");
- - + +
- - \ No newline at end of file + + diff --git a/src/www/services_unbound_advanced.php b/src/www/services_unbound_advanced.php index 69a6aea96..54dfea8f2 100644 --- a/src/www/services_unbound_advanced.php +++ b/src/www/services_unbound_advanced.php @@ -135,33 +135,33 @@ include_once("head.inc");
-
+
- +
" . gettext("You must apply the changes in order for them to take effect."));?>
- - + +
- - - -
- - + +
+ +
- +
@@ -434,11 +434,11 @@ include_once("head.inc");
- +
- \ No newline at end of file + diff --git a/src/www/services_unbound_domainoverride_edit.php b/src/www/services_unbound_domainoverride_edit.php index d76541f49..3bcfe626b 100644 --- a/src/www/services_unbound_domainoverride_edit.php +++ b/src/www/services_unbound_domainoverride_edit.php @@ -4,7 +4,7 @@ part of the pfSense project (https://www.pfsense.org) Copyright (C) 2014 Warren Baker (warren@decoy.co.za) All rights reserved. - + Copyright (C) 2003-2005 Bob Zoller and Manuel Kasper . All rights reserved. @@ -125,20 +125,20 @@ include("head.inc");
- -
- + +
+
- -
- -
- -
- - + +
+ + + +
+
+
@@ -180,12 +180,12 @@ include("head.inc");
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/services_unbound_host_edit.php b/src/www/services_unbound_host_edit.php index cf453410a..5caf4188e 100644 --- a/src/www/services_unbound_host_edit.php +++ b/src/www/services_unbound_host_edit.php @@ -1,24 +1,24 @@ - and 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: - + 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. - + 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 @@ -58,7 +58,7 @@ function hosts_sort() { require("guiconfig.inc"); -if (!is_array($config['unbound']['hosts'])) +if (!is_array($config['unbound']['hosts'])) $config['unbound']['hosts'] = array(); $a_hosts = &$config['unbound']['hosts']; @@ -84,16 +84,16 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "domain ip"); $reqdfieldsn = array(gettext("Domain"),gettext("IP address")); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); - - if (($_POST['host'] && !is_hostname($_POST['host']))) + + if (($_POST['host'] && !is_hostname($_POST['host']))) $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'."); - if (($_POST['domain'] && !is_domain($_POST['domain']))) + if (($_POST['domain'] && !is_domain($_POST['domain']))) $input_errors[] = gettext("A valid domain must be specified."); - - if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) + + if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) $input_errors[] = gettext("A valid IP address must be specified."); /* collect aliases */ @@ -156,11 +156,11 @@ if ($_POST) { else $a_hosts[] = $hostent; hosts_sort(); - + mark_subsystem_dirty('unbound'); - + write_config(); - + header("Location: services_unbound.php"); exit; } @@ -175,7 +175,7 @@ include("head.inc"); "> - +