From 98d20fec1569a787f1071cf754b4c92d0ae01670 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 31 Mar 2015 16:36:10 +0000
Subject: [PATCH] refactor notices to keep the model more together

---
 src/etc/inc/{growl.class => notices.growl.class} | 0
 src/etc/inc/notices.inc                          | 9 ++++-----
 src/etc/inc/{sasl.inc => notices.sasl.inc}       | 0
 src/etc/inc/{smtp.inc => notices.smtp.inc}       | 0
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename src/etc/inc/{growl.class => notices.growl.class} (100%)
 rename src/etc/inc/{sasl.inc => notices.sasl.inc} (100%)
 rename src/etc/inc/{smtp.inc => notices.smtp.inc} (100%)

diff --git a/src/etc/inc/growl.class b/src/etc/inc/notices.growl.class
similarity index 100%
rename from src/etc/inc/growl.class
rename to src/etc/inc/notices.growl.class
diff --git a/src/etc/inc/notices.inc b/src/etc/inc/notices.inc
index 7bcd797bc..4974eba21 100644
--- a/src/etc/inc/notices.inc
+++ b/src/etc/inc/notices.inc
@@ -30,6 +30,10 @@
 
 require_once("globals.inc");
 require_once("led.inc");
+require_once("util.inc");
+require_once("notices.growl.class");
+require_once("notices.sasl.inc");
+require_once("notices.smtp.inc");
 
 /****f* notices/file_notice
  * NAME
@@ -115,7 +119,6 @@ function get_notices($category = 'all')
  ******/
 function close_notice($id)
 {
-	require_once("util.inc");
 
 	/* soekris */
 	if(file_exists("/dev/led/error"))
@@ -243,8 +246,6 @@ function notify_via_smtp($message, $force = false) {
 
 function send_smtp_message($message, $subject = "(no subject)") {
 	global $config, $g;
-	require_once("sasl.inc");
-	require_once("smtp.inc");
 
 	if(!$config['notifications']['smtp']['ipaddress'])
 		return;
@@ -303,7 +304,6 @@ function send_smtp_message($message, $subject = "(no subject)") {
  *   returns true if message was sent
  ******/
 function notify_via_growl($message, $force=false) {
-	require_once("growl.class");
 	global $config,$g;
 
 	if (isset($config['notifications']['growl']['disable']) && !$force)
@@ -342,7 +342,6 @@ function notify_via_growl($message, $force=false) {
  *   none
  ******/
 function register_via_growl() {
-	require_once("growl.class");
 	global $config;
 	$growl_ip = $config['notifications']['growl']['ipaddress'];
 	$growl_password = $config['notifications']['growl']['password'];
diff --git a/src/etc/inc/sasl.inc b/src/etc/inc/notices.sasl.inc
similarity index 100%
rename from src/etc/inc/sasl.inc
rename to src/etc/inc/notices.sasl.inc
diff --git a/src/etc/inc/smtp.inc b/src/etc/inc/notices.smtp.inc
similarity index 100%
rename from src/etc/inc/smtp.inc
rename to src/etc/inc/notices.smtp.inc