mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 18:49:52 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Refactor messenger code to services [ci skip]

Browse Source 
PHPBB3-17135
This commit is contained in:
rxu
2023-06-06 12:54:15 +07:00
parent df5b7fd66e
commit 5be1f5d5c9
20 changed files with 296 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/memberlist.php
View File

@@ -428,8 +428,6 @@ switch ($mode)
if (check_form_key('memberlist_messaging'))
{
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']);
$message = $request->variable('message', '', true);
@@ -438,22 +436,22 @@ switch ($mode)
trigger_error('EMPTY_MESSAGE_IM');
}
$messenger = new messenger(false);
$messenger = $phpbb_container->get('messenger.method_collection');
$jabber = $messenger->offsetGet('messenger.method.jabber');
$jabber->set_use_queue(false);
$messenger->template('profile_send_im', $row['user_lang']);
$messenger->subject(html_entity_decode($subject, ENT_COMPAT));
$jabber->template('profile_send_im', $row['user_lang']);
$jabber->subject(html_entity_decode($subject, ENT_COMPAT));
$jabber->set_addresses($row);
$messenger->replyto($user->data['user_email']);
$messenger->set_addresses($row);
$messenger->assign_vars(array(
$jabber->assign_vars([
'BOARD_CONTACT' => phpbb_get_board_contact($config, $phpEx),
'FROM_USERNAME' => html_entity_decode($user->data['username'], ENT_COMPAT),
'TO_USERNAME' => html_entity_decode($row['username'], ENT_COMPAT),
'MESSAGE' => html_entity_decode($message, ENT_COMPAT))
);
'MESSAGE' => html_entity_decode($message, ENT_COMPAT),
]);
$messenger->send(NOTIFY_IM);
$jabber->send();
$s_select = 'S_SENT_JABBER';
}
@@ -903,10 +901,7 @@ switch ($mode)
case 'contactadmin':
case 'email':
if (!class_exists('messenger'))
{
include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
}
$messenger = $phpbb_container->get('messenger.method_collection');
$user_id = $request->variable('u', 0);
$topic_id = $request->variable('t', 0);
@@ -940,7 +935,6 @@ switch ($mode)
if ($request->is_set_post('submit'))
{
$messenger = new messenger(false);
$form->submit($messenger);
}