From 4d09ffde75c76be8b0f6ee357ef6d57832db1f59 Mon Sep 17 00:00:00 2001 From: k-paulius Date: Wed, 17 Feb 2016 12:01:45 -0600 Subject: Code style changes (cherry picked from commit b2836666a8e7fc021ea750fafc8fc6e8097d52ff) --- src/etc/inc/system.inc | 8 ++++---- src/usr/local/www/status_pkglogs.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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; -- cgit v1.1