mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Fix code flaws

Browse Source 
PHPBB-17135
This commit is contained in:
rxu
2024-06-23 14:55:01 +07:00
parent 3fddff240c
commit 0c720eaf7c
13 changed files with 249 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/acp/acp_email.php
View File

@@ -217,7 +217,8 @@ class acp_email
);
extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars)));
$messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection');
/** @var \phpbb\di\service_collection */
$messenger = $phpbb_container->get('messenger.method_collection');
$messenger_collection_iterator = $messenger->getIterator();
for ($i = 0, $size = count($email_list); $i < $size; $i++)
{

4
phpBB/includes/acp/acp_inactive.php
View File

@@ -198,7 +198,9 @@ class acp_inactive
{
// Send the messages
$usernames = $user_ids = array();
$messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection');
/** @var \phpbb\di\service_collection */
$messenger = $phpbb_container->get('messenger.method_collection');
$messenger_collection_iterator = $messenger->getIterator();
do

2
phpBB/includes/ucp/ucp_activate.php
View File

@@ -131,7 +131,7 @@ class ucp_activate
$phpbb_notifications = $phpbb_container->get('notification_manager');
$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);
$messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection');
$messenger = $phpbb_container->get('messenger.method_collection');
$messenger_collection_iterator = $messenger->getIterator();
foreach ($messenger_collection_iterator as $messenger_method)
{

6
phpBB/includes/ucp/ucp_register.php
View File

@@ -458,6 +458,7 @@ class ucp_register
if ($config['email_enable'])
{
/** var \phpbb\messenger\method\email */
$email_method = $phpbb_container->get('messenger.method.email');
$email_method->set_use_queue(false);
$email_method->template($email_template, $data['lang']);
@@ -490,8 +491,9 @@ class ucp_register
* @var string server_url Server URL
* @var int user_id New user ID
* @var string user_actkey User activation key
* @var messenger messenger phpBB Messenger
* @var \phpbb\messenger\method\email email_method phpBB email notification method
* @since 3.2.4-RC1
* @changed 4.0.0-a1 Added vars: email_method. Removed vars: messenger.
*/
$vars = array(
'user_row',
@@ -501,7 +503,7 @@ class ucp_register
'server_url',
'user_id',
'user_actkey',
'messenger',
'email_method',
);
extract($phpbb_dispatcher->trigger_event('core.ucp_register_welcome_email_before', compact($vars)));