elkarte · eurich · Nov 7, 2013 · Nov 7, 2013 · Nov 7, 2013
diff --git a/sources/controllers/Emailpost.controller.php b/sources/controllers/Emailpost.controller.php
@@ -419,7 +419,10 @@ function pbe_create_post($pbe, $email_message, $topic_info)
 	// Notify members who have notification turned on for this,
 	// but only if it's going to be approved
 	if ($becomesApproved)
+	{
+		require_once(SUBSDIR . '/Notification.subs.php');
 		sendNotifications($topic_info['id_topic'], 'reply', array(), array(), $pbe);
+	}
 
 	return true;
 }
@@ -576,7 +579,10 @@ function pbe_create_topic($pbe, $email_message, $board_info)
 
 	// Notify members who have notification turned on for this, (if it's approved)
 	if ($becomesApproved)
+	{
+		require_once(SUBSDIR . '/Notification.subs.php');
 		sendNotifications($topicOptions['id'], 'reply', array(), array(), $pbe);
+	}
 
 	// Update this users info so the log shows them as active
 	query_update_member_stats($pbe, $email_message, $topicOptions);

diff --git a/sources/controllers/MergeTopics.controller.php b/sources/controllers/MergeTopics.controller.php
@@ -151,8 +151,7 @@ public function action_mergeIndex()
 	 */
 	public function action_mergeExecute($topics = array())
 	{
-		global $user_info, $txt, $context, $scripturl;
-		global $language, $modSettings;
+		global $user_info, $txt, $context, $scripturl, $language, $modSettings;
 
 		$db = database();
 
@@ -486,9 +485,9 @@ public function action_mergeExecute($topics = array())
 		}
 
 		$enforce_subject = isset($_POST['enforce_subject']) ? Util::htmlspecialchars(trim($_POST['enforce_subject'])): '';
+
 		// Merge topic notifications.
 		$notifications = isset($_POST['notifications']) && is_array($_POST['notifications']) ? array_intersect($topics, $_POST['notifications']) : array();
-
 		fixMergedTopics($first_msg, $topics, $id_topic, $target_board, $target_subject, $enforce_subject, $notifications);
 
 		// Asssign the properties of the newly merged topic.
@@ -546,6 +545,7 @@ public function action_mergeExecute($topics = array())
 		logAction('merge', array('topic' => $id_topic, 'board' => $id_board));
 
 		// Notify people that these topics have been merged?
+		require_once(SUBSDIR . '/Notification.subs.php');
 		sendNotifications($id_topic, 'merge');
 
 		// If there's a search index that needs updating, update it...

diff --git a/sources/controllers/MessageIndex.controller.php b/sources/controllers/MessageIndex.controller.php
@@ -551,6 +551,7 @@ public function action_quickmod()
 
 		// This is going to be needed to send off the notifications and for updateLastMessages().
 		require_once(SUBSDIR . '/Post.subs.php');
+		require_once(SUBSDIR . '/Notification.subs.php');
 
 		// Process process process data.
 		require_once(SUBSDIR . '/Topic.subs.php');
@@ -991,7 +992,6 @@ public function action_quickmod()
 
 		if (!empty($markCache))
 		{
-			require_once(SUBSDIR . '/Topic.subs.php');
 			$logged_topics = getLoggedTopics($user_info['id'], $markCache);
 
 			$markArray = array();

diff --git a/sources/controllers/MoveTopic.controller.php b/sources/controllers/MoveTopic.controller.php
@@ -318,6 +318,7 @@ public function action_movetopic2()
 			logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $toboard));
 
 		// Notify people that this topic has been moved?
+		require_once(SUBSDIR . '/Notification.subs.php');
 		sendNotifications($topic, 'move');
 
 		// Why not go back to the original board in case they want to keep moving?

diff --git a/sources/controllers/Post.controller.php b/sources/controllers/Post.controller.php
@@ -1737,6 +1737,7 @@ function action_post2()
 		// Notify any members who have notification turned on for this topic/board - only do this if it's going to be approved(!)
 		if ($becomesApproved)
 		{
+			require_once(SUBSDIR . '/Notification.subs.php');
 			if ($newTopic)
 			{
 				$notifyData = array(
@@ -1749,7 +1750,7 @@ function action_post2()
 					'topic' => $topic,
 					'signature' => (isset($user_settings['signature']) ? $user_settings['signature'] : ''),
 				);
-				notifyMembersBoard($notifyData);
+				sendBoardNotifications($notifyData);
 			}
 			elseif (empty($_REQUEST['msg']))
 			{

diff --git a/sources/controllers/Register.controller.php b/sources/controllers/Register.controller.php
@@ -712,9 +712,8 @@ function action_activate()
 
 		if (!isset($_POST['new_email']))
 		{
-			require_once(SUBSDIR . '/Post.subs.php');
-
-			adminNotify('activation', $row['id_member'], $row['member_name']);
+			require_once(SUBSDIR . '/Notification.subs.php');
+			sendAdminNotifications('activation', $row['id_member'], $row['member_name']);
 		}
 
 		$context += array(

diff --git a/sources/controllers/RemoveTopic.controller.php b/sources/controllers/RemoveTopic.controller.php
@@ -48,7 +48,7 @@ function action_removetopic2()
 		checkSession('get');
 
 		// This file needs to be included for sendNotifications().
-		require_once(SUBSDIR . '/Post.subs.php');
+		require_once(SUBSDIR . '/Notification.subs.php');
 
 		// This needs to be included for all the topic db functions
 		require_once(SUBSDIR . '/Topic.subs.php');

diff --git a/sources/controllers/SplitTopics.controller.php b/sources/controllers/SplitTopics.controller.php
@@ -49,7 +49,7 @@ public function action_splittopics()
 		if (empty($topic))
 			fatal_lang_error('numbers_one_to_nine', false);
 
-		// Load up the "dependencies" - the template, getMsgMemberID(), and sendNotifications().
+		// Load up the "dependencies" - the template, getMsgMemberID().
 		if (!isset($_REQUEST['xml']))
 			loadTemplate('SplitTopics');
 

diff --git a/sources/controllers/Topic.controller.php b/sources/controllers/Topic.controller.php
@@ -60,8 +60,8 @@ public function action_lock()
 
 		checkSession('get');
 
-		// Get subs/Post.subs.php for sendNotifications.
-		require_once(SUBSDIR . '/Post.subs.php');
+		// Load up the helpers
+		require_once(SUBSDIR . '/Notification.subs.php');
 		require_once(SUBSDIR . '/Topic.subs.php');
 
 		// Find out who started the topic and its lock status
@@ -129,8 +129,9 @@ public function action_sticky()
 
 		checkSession('get');
 
-		// We need subs/Post.subs.php for the sendNotifications() function.
-		require_once(SUBSDIR . '/Post.subs.php');
+		// We need this for the sendNotifications() function.
+		require_once(SUBSDIR . '/Notification.subs.php');
+
 		// And Topic subs for topic attributes.
 		require_once(SUBSDIR . '/Topic.subs.php');
 

diff --git a/sources/subs/Members.subs.php b/sources/subs/Members.subs.php
@@ -787,8 +787,8 @@ function registerMember(&$regOptions, $error_context = 'register')
 		}
 
 		// Send admin their notification.
-		require_once(SUBSDIR . '/Post.subs.php');
-		adminNotify('standard', $memberID, $regOptions['username']);
+		require_once(SUBSDIR . '/Notification.subs.php');
+		sendAdminNotifications('standard', $memberID, $regOptions['username']);
 	}
 	// Need to activate their account - or fall under COPPA.
 	elseif ($regOptions['require'] == 'activation' || $regOptions['require'] == 'coppa')
@@ -832,8 +832,8 @@ function registerMember(&$regOptions, $error_context = 'register')
 		sendmail($regOptions['email'], $emaildata['subject'], $emaildata['body'], null, null, false, 0);
 
 		// Admin gets informed here...
-		require_once(SUBSDIR . '/Post.subs.php');
-		adminNotify('approval', $memberID, $regOptions['username']);
+		require_once(SUBSDIR . '/Notification.subs.php');
+		sendAdminNotifications('approval', $memberID, $regOptions['username']);
 	}
 
 	// Okay, they're for sure registered... make sure the session is aware of this for security. (Just married :P!)