aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2014-02-03 08:09:33 -0800
committerJim P <jim@pingle.org>2014-02-03 08:09:33 -0800
commit4474a7011a169a1d61194e353c2c71bcb4a3f840 (patch)
tree38ccc8148066da636c177b36f293b1329f5ae443
parent009498abc6de6dfcec82ad2f88d1e096a3a76287 (diff)
parentfa4d472f8a13db1d2e06c532789fe7c4564fb040 (diff)
downloadpfsense-packages-4474a7011a169a1d61194e353c2c71bcb4a3f840.tar.gz
pfsense-packages-4474a7011a169a1d61194e353c2c71bcb4a3f840.tar.bz2
pfsense-packages-4474a7011a169a1d61194e353c2c71bcb4a3f840.zip
Merge pull request #583 from danhunsaker/bugfix/mailreport/more-freqs-sched-bug
mailreport - Fixed a bug with quarterly report scheduling
-rw-r--r--config/mailreport/mailreport.xml2
-rw-r--r--config/mailreport/status_mail_report_edit.php2
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 5 insertions, 5 deletions
diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml
index 4d392fd9..d9c5dfff 100644
--- a/config/mailreport/mailreport.xml
+++ b/config/mailreport/mailreport.xml
@@ -37,7 +37,7 @@
]]>
</copyright>
<name>mailreport</name>
- <version>2.0.8</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']);
}
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 09a9000f..28b657cb 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1385,7 +1385,7 @@
<name>mailreport</name>
<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
<category>Network Management</category>
- <version>2.0.8</version>
+ <version>2.0.9</version>
<status>Stable</status>
<required_version>2.2</required_version>
<config_file>http://www.pfsense.com/packages/config/mailreport/mailreport.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index eac69a81..503a30ad 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1717,7 +1717,7 @@
<name>mailreport</name>
<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
<category>Network Management</category>
- <version>2.0.8</version>
+ <version>2.0.9</version>
<status>Stable</status>
<required_version>2.0</required_version>
<config_file>http://www.pfsense.com/packages/config/mailreport/mailreport.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index ae51523f..0a01d318 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1704,7 +1704,7 @@
<name>mailreport</name>
<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
<category>Network Management</category>
- <version>2.0.8</version>
+ <version>2.0.9</version>
<status>Stable</status>
<required_version>2.0</required_version>
<config_file>http://www.pfsense.com/packages/config/mailreport/mailreport.xml</config_file>