diff options
| author | jim-p <jimp@pfsense.org> | 2014-01-30 16:11:33 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-01-30 16:11:33 -0500 |
| commit | 2c6efc978d2fc988ff8fafbf59bcdc6050a3695d (patch) | |
| tree | 70425ad169d43b61fbe2fb10effa34e550868e36 /config | |
| parent | f2a90c5c758afc8f8306beff5b45b150838a34ef (diff) | |
| download | pfsense-packages-2c6efc978d2fc988ff8fafbf59bcdc6050a3695d.tar.gz pfsense-packages-2c6efc978d2fc988ff8fafbf59bcdc6050a3695d.tar.bz2 pfsense-packages-2c6efc978d2fc988ff8fafbf59bcdc6050a3695d.zip | |
Allow for multiple filter terms in mailreport
Diffstat (limited to 'config')
| -rw-r--r-- | config/mailreport/mail_reports.inc | 3 | ||||
| -rw-r--r-- | config/mailreport/mailreport.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc index cf8c837c..94c7500c 100644 --- a/config/mailreport/mail_reports.inc +++ b/config/mailreport/mail_reports.inc @@ -1232,8 +1232,7 @@ function mail_report_get_log($logfile, $tail, $grepfor) { $logarr = ""; $grepline = " "; if(is_array($grepfor)) - foreach($grepfor as $agrep) - $grepline .= " | grep \"$agrep\""; + $grepline = " | /usr/bin/egrep " . escapeshellarg(implode("|", $grepfor)); if($config['system']['disablesyslogclog']) { exec("cat {$logfile}{$grepline} | /usr/bin/tail -n {$tail}", $logarr); } else { diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml index 3b926753..4d392fd9 100644 --- a/config/mailreport/mailreport.xml +++ b/config/mailreport/mailreport.xml @@ -37,7 +37,7 @@ ]]> </copyright> <name>mailreport</name> - <version>2.0.7</version> + <version>2.0.8</version> <title>Status: Mail Reports</title> <additional_files_needed> <prefix>/usr/local/bin/</prefix> |