From 4bbb315509ebc0dd721fe7761e09f4b476028c91 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 25 Aug 2009 14:38:14 -0400
Subject: Ensure both fields are present before sending email

---
 etc/inc/notices.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc
index c354b05..5464741 100644
--- a/etc/inc/notices.inc
+++ b/etc/inc/notices.inc
@@ -200,12 +200,16 @@ function are_notices_pending($category = "all") {
  *   returns true if message was sent
  ******/
 function notify_via_growl($message) {
-	require_once("smtp.inc");
 	global $config;
 
 	if(!$config['notifications']['smtp']['ipaddress'])
 		return;
 
+	if(!$config['notifications']['smtp']['notifyemailaddress']) 
+		return;
+
+	require_once("smtp.inc");
+
 	$smtp = new smtp_class;
 
 	$from = "pfsense@{$config['system']['hostname']}.{$config['system']['domain']}";
-- 
cgit v1.1