Skip to content

Commit 85d3e92

Browse files
committed
cs
1 parent 725b24f commit 85d3e92

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

administrator/components/com_joomlaupdate/src/Model/NotificationModel.php

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,28 +47,28 @@ final class NotificationModel extends BaseDatabaseModel
4747
*/
4848
public function sendNotification($type, $oldVersion, $newVersion): void
4949
{
50-
$params = ComponentHelper::getParams('com_joomlaupdate');
51-
52-
// Superusergroups as fallback
53-
$superUserGroups = $this->getSuperUserGroups();
54-
55-
if (!\is_array($superUserGroups)) {
56-
$emailGroups = ArrayHelper::toInteger(explode(',', $superUserGroups));
57-
}
58-
59-
// User groups from input field
60-
$emailGroups = $params->get('automated_updates_email_groups', $superUserGroups, 'array');
50+
$params = ComponentHelper::getParams('com_joomlaupdate');
6151

62-
if (!\is_array($emailGroups)) {
63-
$emailGroups = ArrayHelper::toInteger(explode(',', $emailGroups));
64-
}
52+
// Superusergroups as fallback
53+
$superUserGroups = $this->getSuperUserGroups();
54+
55+
if (!\is_array($superUserGroups)) {
56+
$emailGroups = ArrayHelper::toInteger(explode(',', $superUserGroups));
57+
}
58+
59+
// User groups from input field
60+
$emailGroups = $params->get('automated_updates_email_groups', $superUserGroups, 'array');
61+
62+
if (!\is_array($emailGroups)) {
63+
$emailGroups = ArrayHelper::toInteger(explode(',', $emailGroups));
64+
}
65+
66+
// Get all users in these groups who can receive emails
67+
$emailReceivers = $this->getEmailReceivers($emailGroups);
6568

66-
// Get all users in these groups who can receive emails
67-
$emailReceivers = $this->getEmailReceivers($emailGroups);
68-
6969
// If no email receivers are found, we use superusergroups as fallback
7070
if (empty($emailReceivers)) {
71-
$emailReceivers = $this->getEmailReceivers($superUserGroups);
71+
$emailReceivers = $this->getEmailReceivers($superUserGroups);
7272
}
7373

7474
$app = Factory::getApplication();
@@ -115,22 +115,21 @@ private function getEmailReceivers($emailGroups): array
115115
// Get the users of all groups in the emailGroups
116116
$usersModel = Factory::getApplication()->bootComponent('com_users')
117117
->getMVCFactory()->createModel('Users', 'Administrator');
118-
$usersModel->setState('filter.state', (int) 0); // Only enabled users
119-
120-
foreach ($emailGroups as $group) {
118+
$usersModel->setState('filter.state', (int) 0); // Only enabled users
119+
120+
foreach ($emailGroups as $group) {
121121
$usersModel->setState('filter.group_id', $group);
122122

123123
$usersInGroup = $usersModel->getItems();
124124
if (empty($usersInGroup)) {
125125
continue;
126126
}
127-
128-
// Users can be in more than one group. Accept only one entry
127+
128+
// Users can be in more than one group. Accept only one entry
129129
foreach ($usersInGroup as $user) {
130-
131130
if (MailHelper::isEmailAddress($user->email) && $user->sendEmail === 1) {
132131
$user->email = strtolower(trim($user->email));
133-
132+
134133
$emailReceivers[] = $user;
135134
}
136135
}

0 commit comments

Comments
 (0)