mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Fix code review issues

Browse Source 
PHPBB-17135
This commit is contained in:
rxu
2024-06-23 13:26:43 +07:00
parent 51fae82718
commit 499464e1d3
24 changed files with 353 additions and 1782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,19 +114,18 @@ class acp_inactive
if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users))
{
$messenger = $phpbb_container->get('messenger.method_collection');
$email = $messenger->offsetGet('messenger.method.email');
$email->set_use_queue(false);
$email_method = $phpbb_container->get('messenger.method.email');
$email_method->set_use_queue(false);
foreach ($inactive_users as $row)
{
$email->template('admin_welcome_activated', $row['user_lang']);
$email->set_addresses($row);
$email->anti_abuse_headers($config, $user);
$email->assign_vars([
$email_method->template('admin_welcome_activated', $row['user_lang']);
$email_method->set_addresses($row);
$email_method->anti_abuse_headers($config, $user);
$email_method->assign_vars([
'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT),
]);
$email->send();
$email_method->send();
}
}
@@ -199,14 +198,13 @@ class acp_inactive
{
// Send the messages
$usernames = $user_ids = array();
$messenger = $phpbb_container->get('messenger.method_collection');
$messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection');
$messenger_collection_iterator = $messenger->getIterator();
do
{
while ($messenger_collection_iterator->valid())
foreach ($messenger_collection_iterator as $messenger_method)
{
$messenger_method = $messenger_collection_iterator->current();
if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH)
{
$messenger_method->template('user_remind_inactive', $row['user_lang']);
@@ -221,7 +219,6 @@ class acp_inactive
$messenger_method->send();
$messenger_method->save_queue();
}
$messenger_collection_iterator->next();
}
$usernames[] = $row['username'];