diff options
Diffstat (limited to 'config/mailreport')
| -rw-r--r-- | config/mailreport/mail_reports.inc | 3 | ||||
| -rw-r--r-- | config/mailreport/mailreport.xml | 2 | ||||
| -rw-r--r-- | config/mailreport/status_mail_report_edit.php | 2 |
3 files changed, 3 insertions, 4 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..d9c5dfff 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.9</version> <title>Status: Mail Reports</title> <additional_files_needed> <prefix>/usr/local/bin/</prefix> diff --git a/config/mailreport/status_mail_report_edit.php b/config/mailreport/status_mail_report_edit.php index 0baa9aa6..6cbb8a67 100644 --- a/config/mailreport/status_mail_report_edit.php +++ b/config/mailreport/status_mail_report_edit.php @@ -178,7 +178,7 @@ if ($_POST) { if ($pconfig['frequency'] == "yearly") { $pconfig['monthofyear'] = isset($pconfig['monthofyear']) ? $pconfig['monthofyear'] : 1; $friendly = "Yearly, on day {$pconfig['dayofmonth']} of {$monthofyear[$pconfig['monthofyear']]} at {$friendlytime}"; - } else { + } elseif ($pconfig['frequency'] != "quarterly") { if (isset($pconfig['monthofyear'])) unset($pconfig['monthofyear']); } |