mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00
Code Issues Releases Wiki Activity

[ticket/11454] Add messenger function set_addresses

Browse Source 
Automatically fills to/im from a user row

Send messenger the Jabber address if using Jabber notifications

PHPBB3-11454
This commit is contained in:
Nathaniel Guse
2013-04-24 10:38:57 -05:00
committed by Nathan Guse
parent 212971a3a6
commit ebb5169a46
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/includes/functions_messenger.php
View File

@@ -56,6 +56,24 @@ class messenger
$this->mail_priority = MAIL_NORMAL_PRIORITY; $this->mail_priority = MAIL_NORMAL_PRIORITY;
} }
/**
* Set addresses for to/im as available
*
* @param array $user User row
*/
function set_addresses($user)
{
if ($user['user_email'])
{
$this->to($user['user_email'], ($user['username']) ?: '');
}
if ($user['user_jabber'])
{
$this->im($user['user_jabber'], ($user['username']) ?: '');
}
}
/** /**
* Sets an email address to send to * Sets an email address to send to
*/ */

2
phpBB/includes/notification/method/messenger_base.php
View File

@@ -80,7 +80,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati
$messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']); $messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']);
$messenger->to($user['user_email'], $user['username']); $messenger->set_addresses($user);
$messenger->assign_vars(array_merge(array( $messenger->assign_vars(array_merge(array(
'USERNAME' => $user['username'], 'USERNAME' => $user['username'],