diff options
| author | Phil Davis <phil.davis@inf.org> | 2016-08-16 14:15:56 +0930 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-08-16 09:21:54 -0400 |
| commit | 9488f42b8190c92b6328697cbe84faad71647675 (patch) | |
| tree | d67ed8fa47eb873cf9c9adcb766c4a8a81013afe /src/etc/inc | |
| parent | c9cd556bdc4ef615778aa0c28c1030db23abf107 (diff) | |
| download | pfsense-9488f42b8190c92b6328697cbe84faad71647675.zip pfsense-9488f42b8190c92b6328697cbe84faad71647675.tar.gz | |
Code style and comments
No functional change - just making style consistent
(cherry picked from commit 9d3e8723171c727cf43338bd8e95ab2bb7e6a66c)
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/filter_log.inc | 4 | ||||
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/util.inc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 1208711..693488f 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -255,7 +255,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 ""; @@ -277,7 +277,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 a061dc3..fbdd290 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -739,7 +739,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 314796a..633cacc 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4469,7 +4469,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 e063d5d..6647e0a 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -904,7 +904,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; @@ -919,7 +919,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; |
