diff options
| author | k-paulius <k.dash.paulius@gmail.com> | 2016-02-17 12:01:45 -0600 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-09-13 14:34:20 -0300 |
| commit | 4d09ffde75c76be8b0f6ee357ef6d57832db1f59 (patch) | |
| tree | 79e9912a804ecf35618b83ef59f7256e6d6988ea /src | |
| parent | 7066f0cce295a8cbae046bec7fcb1dfebbf74dd9 (diff) | |
| download | pfsense-4d09ffde75c76be8b0f6ee357ef6d57832db1f59.zip pfsense-4d09ffde75c76be8b0f6ee357ef6d57832db1f59.tar.gz | |
Code style changes
(cherry picked from commit b2836666a8e7fc021ea750fafc8fc6e8097d52ff)
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/system.inc | 8 | ||||
| -rw-r--r-- | src/usr/local/www/status_pkglogs.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 8a1094d..14e7bf2 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -1097,13 +1097,13 @@ EOD; $syslogd_extra = "-f {$g['varetc_path']}/syslog.conf {$sourceip}"; } - $log_sockets = array(); - $log_sockets[] = "{$g['dhcpd_chroot_path']}/var/run/log"; + $log_sockets = array("{$g['dhcpd_chroot_path']}/var/run/log"); if (isset($config['installedpackages']['package'])) { foreach ($config['installedpackages']['package'] as $package) { - if (isset($package['logging']['logsocket']) && '' != $package['logging']['logsocket'] && - is_dir(pathinfo($package['logging']['logsocket'], PATHINFO_DIRNAME)) && !in_array($package['logging']['logsocket'], $log_sockets)) { + if (isset($package['logging']['logsocket']) && $package['logging']['logsocket'] != '' && + is_dir(dirname($package['logging']['logsocket'])) && + !in_array($package['logging']['logsocket'], $log_sockets)) { $log_sockets[] = $package['logging']['logsocket']; } } diff --git a/src/usr/local/www/status_pkglogs.php b/src/usr/local/www/status_pkglogs.php index ef8d576..20f35e5 100644 --- a/src/usr/local/www/status_pkglogs.php +++ b/src/usr/local/www/status_pkglogs.php @@ -83,7 +83,7 @@ $apkg = $_GET['pkg']; if (!$apkg) { // If we aren't looking for a specific package, locate the first package that handles logging. if (isset($config['installedpackages']['package'])) { foreach ($config['installedpackages']['package'] as $package) { - if (isset($package['logging']['logfilename']) && '' != $package['logging']['logfilename']) { + if (isset($package['logging']['logfilename']) && $package['logging']['logfilename'] != '') { $pkgwithlogging = true; $apkg = $package['name']; $apkgid = $i; |
