3 files changed, 111 insertions, 95 deletions
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 2cd1ba3ef6..571b0ec656 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_email extends phpbb_notification_method_base
+class phpbb_notification_method_email extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
@@ -34,20 +34,6 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	}
 
 	/**
-	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
-	*
-	* @var mixed
-	*/
-	protected $notify_method = NOTIFY_EMAIL;
-
-	/**
-	* Base directory to prepend to the email template name
-	*
-	* @var string
-	*/
-	protected $email_template_base_dir = '';
-
-	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
 	*/
@@ -61,68 +47,6 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
 	*/
 	public function notify()
 	{
-		if (!sizeof($this->queue))
-		{
-			return;
-		}
-
-		// Load all users we want to notify (we need their email address)
-		$user_ids = $users = array();
-		foreach ($this->queue as $notification)
-		{
-			$user_ids[] = $notification->user_id;
-		}
-
-		// We do not send emails to banned users
-		if (!function_exists('phpbb_get_banned_user_ids'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-		}
-		$banned_users = phpbb_get_banned_user_ids($user_ids);
-
-		// Load all the users we need
-		$this->user_loader->load_users($user_ids);
-
-		// Load the messenger
-		if (!class_exists('messenger'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
-		}
-		$messenger = new messenger();
-		$board_url = generate_board_url();
-
-		// Time to go through the queue and send emails
-		foreach ($this->queue as $notification)
-		{
-			if ($notification->get_email_template() === false)
-			{
-				continue;
-			}
-
-			$user = $this->user_loader->get_user($notification->user_id);
-
-			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
-			{
-				continue;
-			}
-
-			$messenger->template($this->email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
-
-			$messenger->to($user['user_email'], $user['username']);
-
-			$messenger->assign_vars(array_merge(array(
-				'USERNAME'						=> $user['username'],
-
-				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
-			), $notification->get_email_template_variables()));
-
-			$messenger->send($this->notify_method);
-		}
-
-		// Save the queue in the messenger class (has to be called or these emails could be lost?)
-		$messenger->save_queue();
-
-		// We're done, empty the queue
-		$this->empty_queue();
+		return $this->notify_using_messenger(NOTIFY_EMAIL);
 	}
 }
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index 863846b8a5..d3b756d020 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package notifications
 */
-class phpbb_notification_method_jabber extends phpbb_notification_method_email
+class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base
 {
 	/**
 	* Get notification method name
@@ -34,20 +34,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 	}
 
 	/**
-	* Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
-	*
-	* @var mixed
-	*/
-	protected $notify_method = NOTIFY_IM;
-
-	/**
-	* Base directory to prepend to the email template name
-	*
-	* @var string
-	*/
-	protected $email_template_base_dir = 'short/';
-
-	/**
 	* Is this method available for the user?
 	* This is checked on the notifications options
 	*/
@@ -62,7 +48,13 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 	*/
 	public function global_available()
 	{
-		return ($this->config['jab_enable'] && @extension_loaded('xml'));
+		return !(
+			empty($this->config['jab_enable']) ||
+			empty($this->config['jab_host']) ||
+			empty($this->config['jab_username']) ||
+			empty($this->config['jab_password']) ||
+			!@extension_loaded('xml')
+		);
 	}
 
 	public function notify()
@@ -72,6 +64,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
 			return;
 		}
 
-		return parent::notify();
+		return $this->notify_using_messenger(NOTIFY_IM, 'short/');
 	}
 }
diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php
new file mode 100644
index 0000000000..4966aa94bc
--- /dev/null
+++ b/phpBB/includes/notification/method/messenger_base.php
@@ -0,0 +1,100 @@
+<?php
+/**
+*
+* @package notifications
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Abstract notification method handling email and jabber notifications
+* using the phpBB messenger.
+*
+* @package notifications
+*/
+abstract class phpbb_notification_method_messenger_base extends phpbb_notification_method_base
+{
+	/**
+	* Notify using phpBB messenger
+	*
+	* @param int $notify_method				Notify method for messenger (e.g. NOTIFY_IM)
+	* @param string $template_dir_prefix	Base directory to prepend to the email template name
+	*
+	* @return null
+	*/
+	protected function notify_using_messenger($notify_method, $template_dir_prefix = '')
+	{
+		if (empty($this->queue))
+		{
+			return;
+		}
+
+		// Load all users we want to notify (we need their email address)
+		$user_ids = $users = array();
+		foreach ($this->queue as $notification)
+		{
+			$user_ids[] = $notification->user_id;
+		}
+
+		// We do not send emails to banned users
+		if (!function_exists('phpbb_get_banned_user_ids'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		}
+		$banned_users = phpbb_get_banned_user_ids($user_ids);
+
+		// Load all the users we need
+		$this->user_loader->load_users($user_ids);
+
+		// Load the messenger
+		if (!class_exists('messenger'))
+		{
+			include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
+		}
+		$messenger = new messenger();
+		$board_url = generate_board_url();
+
+		// Time to go through the queue and send emails
+		foreach ($this->queue as $notification)
+		{
+			if ($notification->get_email_template() === false)
+			{
+				continue;
+			}
+
+			$user = $this->user_loader->get_user($notification->user_id);
+
+			if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
+			{
+				continue;
+			}
+
+			$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
+
+			$messenger->set_addresses($user);
+
+			$messenger->assign_vars(array_merge(array(
+				'USERNAME'						=> $user['username'],
+
+				'U_NOTIFICATION_SETTINGS'		=> generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications',
+			), $notification->get_email_template_variables()));
+
+			$messenger->send($notify_method);
+		}
+
+		// Save the queue in the messenger class (has to be called or these emails could be lost?)
+		$messenger->save_queue();
+
+		// We're done, empty the queue
+		$this->empty_queue();
+	}
+}