diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-11-22 23:27:10 -0500 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-11-22 23:27:10 -0500 |
| commit | 3fd53f7221352702ffe64f9de9ef7820b75e51b8 (patch) | |
| tree | 196c73ff9ba9278f25fc9db063cbf182c75772f6 /config/sarg | |
| parent | 595c831d2768547d49e6daf147889c6aee15f9a4 (diff) | |
| parent | 3a5b698d014f470e7b475261d5e7d2926d4fc220 (diff) | |
| download | pfsense-packages-3fd53f7221352702ffe64f9de9ef7820b75e51b8.tar.gz pfsense-packages-3fd53f7221352702ffe64f9de9ef7820b75e51b8.tar.bz2 pfsense-packages-3fd53f7221352702ffe64f9de9ef7820b75e51b8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/sarg')
| -rw-r--r-- | config/sarg/sarg.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 59b7eb11..1a4db315 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -272,6 +272,8 @@ function sync_package_sarg() { $bytes_in_sites_users_report=(preg_match('/bytes_in_sites_users_report/',$sarg['report_options'])?"yes":"no"); $date_time_by=(preg_match('/date_time_by_bytes/',$sarg['report_options'])?"bytes":""); $date_time_by.=(preg_match('/date_time_by_elap/',$sarg['report_options'])?" elap":""); + if(empty($date_time_by)) + $date_time_by="bytes"; $date_format=(preg_match("/\w/",$sarg['report_date_format'])?$sarg['report_date_format']:"u"); $report_type=preg_replace('/,/',' ',$sarg['report_type']); $report_charset=(empty($sarg['report_charset'])?"UTF-8":$sarg['report_charset']); |