diff options
author | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-11-15 07:00:24 -0800 |
---|---|---|
committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2013-11-15 07:00:24 -0800 |
commit | 8d91049ac5a4991f3b7717777f52c8711476a590 (patch) | |
tree | 3cd0d54f6fc1401f26efe766fb2154153086a513 | |
parent | ff99cf6899b67e84d58a1cce4a584f1edc9664d3 (diff) | |
parent | c73be282209c62d450d874ba5a358e1d1fd565ed (diff) | |
download | pfsense-packages-8d91049ac5a4991f3b7717777f52c8711476a590.tar.gz pfsense-packages-8d91049ac5a4991f3b7717777f52c8711476a590.tar.bz2 pfsense-packages-8d91049ac5a4991f3b7717777f52c8711476a590.zip |
Merge pull request #550 from dbaio/master
sarg - fix default value (date_time_by)
-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']); |