From 5d8357465ad861be48fd0c7bd04500dfed3bd5bf Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 9 Oct 2013 08:07:22 -0400
Subject: When sending an e-mail report, do not generate output, otherwise it
 will generate a message from cron.

---
 config/mailreport/mail_reports.inc | 2 --
 config/mailreport/mailreport.xml   | 2 +-
 pkg_config.8.xml                   | 4 ++--
 pkg_config.8.xml.amd64             | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc
index 85b67ddf..cf8c837c 100644
--- a/config/mailreport/mail_reports.inc
+++ b/config/mailreport/mail_reports.inc
@@ -229,8 +229,6 @@ function mail_report_send($headertext, $cmdtext, $logtext, $attachments) {
 
 	if(!$mail->Send()) {
 		echo "Mailer Error: " . $mail->ErrorInfo;
-	} else {
-		echo "<strong>Message sent to {$address}!</strong>\n";
 	}
 }
 
diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml
index d27d3a28..000fc675 100644
--- a/config/mailreport/mailreport.xml
+++ b/config/mailreport/mailreport.xml
@@ -37,7 +37,7 @@
 		]]>
 	</copyright>
 	<name>mailreport</name>
-	<version>2.0.4</version>
+	<version>2.0.5</version>
 	<title>Status: Mail Reports</title>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index d06ec2d5..54828b49 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1714,8 +1714,8 @@
 		<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.4</version>
-		<status>BETA</status>
+		<version>2.0.5</version>
+		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/mailreport/mailreport.xml</config_file>
 		<configurationfile>mailreport.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 8834fa8e..16b1b41a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1701,8 +1701,8 @@
 		<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.4</version>
-		<status>BETA</status>
+		<version>2.0.5</version>
+		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/mailreport/mailreport.xml</config_file>
 		<configurationfile>mailreport.xml</configurationfile>
-- 
cgit v1.2.3