summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-08-16 14:15:56 +0930
committerPhil Davis <phil.davis@inf.org>2016-08-16 14:15:56 +0930
commit9d3e8723171c727cf43338bd8e95ab2bb7e6a66c (patch)
tree0c6bfba9d9404fc5d0adeb954268090ab82f56bc /src/etc
parent0ed3b15981b4451efb11839d6ee7b9acf1ed1d84 (diff)
downloadpfsense-9d3e8723171c727cf43338bd8e95ab2bb7e6a66c.zip
pfsense-9d3e8723171c727cf43338bd8e95ab2bb7e6a66c.tar.gz
Code style and comments
No functional change - just making style consistent
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/filter_log.inc4
-rw-r--r--src/etc/inc/pfsense-utils.inc2
-rw-r--r--src/etc/inc/upgrade_config.inc2
-rw-r--r--src/etc/inc/util.inc4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc
index 8690ee0..bd91d6e 100644
--- a/src/etc/inc/filter_log.inc
+++ b/src/etc/inc/filter_log.inc
@@ -223,7 +223,7 @@ function parse_vpn_login_log_line($line) {
if (!( (trim($flent['time']) == "") && (trim($flent['action']) == "") && (trim($flent['user']) == "") && (trim($flent['ip_address']) == "") )) {
return $flent;
} else {
- if($g['debug']) {
+ if ($g['debug']) {
log_error(sprintf(gettext("There was a error parsing log entry: %s. Please report to mailing list or forum."), $line));
}
return "";
@@ -245,7 +245,7 @@ function parse_vpn_service_log_line($line) {
if (!( (trim($flent['time']) == "") && (trim($flent['type']) == "") && (trim($flent['message']) == "") )) {
return $flent;
} else {
- if($g['debug']) {
+ if ($g['debug']) {
log_error(sprintf(gettext("There was a error parsing log entry: %s. Please report to mailing list or forum."), $line));
}
return "";
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 81ce48f..9087ff7 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -707,7 +707,7 @@ function get_filename_from_url($url) {
function get_dir($dir) {
$dir_array = array();
$d = dir($dir);
- if(!is_object($d)) {
+ if (!is_object($d)) {
return array();
}
while (false !== ($entry = $d->read())) {
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index b64e290..ffb21af 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4437,7 +4437,7 @@ function upgrade_142_to_143() {
if (is_array($config['filter']['separator'])) {
foreach ($config['filter']['separator'] as $interface => $separators) {
- if(is_array($separators)) {
+ if (is_array($separators)) {
foreach ($separators as $sepn => $separator) {
$seprow = substr($separator['row']['0'], 2);
diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc
index c1c9a4f..cef65ab 100644
--- a/src/etc/inc/util.inc
+++ b/src/etc/inc/util.inc
@@ -872,7 +872,7 @@ function check_subnetsv4_overlap($subnet1, $bits1, $subnet2, $bits2) {
$subnetv4_start1 = gen_subnetv4($subnet1, $largest_sn);
$subnetv4_start2 = gen_subnetv4($subnet2, $largest_sn);
- if($subnetv4_start1 == '' || $subnetv4_start2 == '') {
+ if ($subnetv4_start1 == '' || $subnetv4_start2 == '') {
// One or both args is not a valid IPv4 subnet
//FIXME: needs to return "bad data" not true/false if bad. For now return false, best we can do until fixed
return false;
@@ -887,7 +887,7 @@ function check_subnetsv6_overlap($subnet1, $bits1, $subnet2, $bits2) {
$subnetv6_start1 = gen_subnetv6($subnet1, $largest_sn);
$subnetv6_start2 = gen_subnetv6($subnet2, $largest_sn);
- if($subnetv6_start1 == '' || $subnetv6_start2 == '') {
+ if ($subnetv6_start1 == '' || $subnetv6_start2 == '') {
// One or both args is not a valid IPv6 subnet
//FIXME: needs to return "bad data" not true/false if bad. For now return false, best we can do until fixed
return false;
OpenPOWER on IntegriCloud