[5.4] Update notification code improvements (joomla#46071)

* Improve sends update notification code

Author: joomdonation

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

@@ -50,26 +50,29 @@ public function sendNotification($type, $oldVersion, $newVersion): void
     {
         $params = ComponentHelper::getParams('com_joomlaupdate');
 
-        // Superusergroups as fallback
-        $superUserGroups = $this->getSuperUserGroups();
+        // User groups from Send Email to User Groups parameter in Joomla update component
+        $emailGroups = $params->get('automated_updates_email_groups', []);
 
-        if (!\is_array($superUserGroups)) {
-            $emailGroups = ArrayHelper::toInteger(explode(',', $superUserGroups));
+        if (!\is_array($emailGroups)) {
+            $emailGroups = ArrayHelper::toInteger(explode(',', $emailGroups));
         }
 
-        // User groups from input field
-        $emailGroups = $params->get('automated_updates_email_groups', $superUserGroups, 'array');
+        $emailGroups = array_filter($emailGroups);
 
-        if (!\is_array($emailGroups)) {
-            $emailGroups = ArrayHelper::toInteger(explode(',', $emailGroups));
+        /*
+         * If no valid user groups configured in Send Email to User Groups parameter, fallback to Super Users
+         * user group
+         */
+        if ($emailGroups === []) {
+            $emailGroups = $this->getSuperUserGroups();
         }
 
         // Get all users in these groups who can receive emails
         $emailReceivers = $this->getEmailReceivers($emailGroups);
 
-        // If no email receivers are found, we use superusergroups as fallback
-        if (empty($emailReceivers)) {
-            $emailReceivers  = $this->getEmailReceivers($superUserGroups);
+        // Do not process further if no user is configured to receive email
+        if ($emailReceivers === []) {
+            return;
         }
 
         $app      = Factory::getApplication();
@@ -90,6 +93,11 @@ public function sendNotification($type, $oldVersion, $newVersion): void
 
         // Send emails to all receivers
         foreach ($emailReceivers as $receiver) {
+            // If receiver email is invalid for some reason, just ignore it
+            if (!MailHelper::isEmailAddress($receiver->email)) {
+                continue;
+            }
+
             $receiverParams = new Registry($receiver->params);
             $receiverLocale = $receiverParams->get('admin_language', $defaultLocale);
 
@@ -125,48 +133,29 @@ public function sendNotification($type, $oldVersion, $newVersion): void
     /**
      * Returns the email information of receivers. Receiver can be any user who is not disabled.
      *
-     * @param   array $emailGroups A list of usergroups to email
+     * @param   array $emailGroups A list of user groups to email
      *
      * @return  array  The list of email receivers. Can be empty if no users are found.
      *
      * @since   5.4.0
      */
-    private function getEmailReceivers($emailGroups): array
+    private function getEmailReceivers(array $emailGroups): array
     {
-        if (empty($emailGroups)) {
-            return [];
-        }
-
-        $emailReceivers = [];
-
-        // Get the users of all groups in the emailGroups
+        /* @var \Joomla\Component\Users\Administrator\Model\UsersModel $usersModel */
         $usersModel = Factory::getApplication()->bootComponent('com_users')
-            ->getMVCFactory()->createModel('Users', 'Administrator');
-        $usersModel->setState('filter.state', (int) 0); // Only enabled users
-
-        foreach ($emailGroups as $group) {
-            $usersModel->setState('filter.group_id', $group);
-
-            $usersInGroup = $usersModel->getItems();
-            if (empty($usersInGroup)) {
-                continue;
-            }
+            ->getMVCFactory()->createModel('Users', 'Administrator', ['ignore_request' => true]);
 
-            // Users can be in more than one group. Accept only one entry
-            foreach ($usersInGroup as $user) {
-                if (MailHelper::isEmailAddress($user->email) && $user->sendEmail === 1) {
-                    $emailReceivers[$user->id] ??= $user;
-                }
-            }
-        }
+        $usersModel->setState('filter.state', 0); // Only return enabled users
+        $usersModel->setState('filter.receiveSystemEmail', 1); // Only return users who receive system emails set to Yes
+        $usersModel->setState('filter.groups', $emailGroups);
 
-        return $emailReceivers;
+        return $usersModel->getItems() ?: [];
     }
 
     /**
-     * Returns all Super Users
+     * Returns all user groups with Super User right
      *
-     * @return  array  The list of super user groups.
+     * @return  array  The list of user groups have Super User right
      *
      * @since   5.4.0
      */
@@ -175,7 +164,7 @@ private function getSuperUserGroups(): array
         $groups = UserGroupsHelper::getInstance()->getAll();
         $ret    = [];
 
-        // Find groups with core.admin rights (super users)
+        // Find groups with core.admin (Super User) right
         foreach ($groups as $group) {
             if (Access::checkGroup($group->id, 'core.admin')) {
                 $ret[] = $group->id;

administrator/components/com_users/src/Model/UsersModel.php

@@ -360,6 +360,14 @@ protected function getListQuery()
             }
         }
 
+        // If the model is set to check receive system email, add to the query.
+        $receiveSystemEmail = $this->getState('filter.receiveSystemEmail');
+
+        if (is_numeric($receiveSystemEmail)) {
+            $query->where($db->quoteName('a.sendEmail') . ' = :receiveSystemEmail')
+                ->bind(':receiveSystemEmail', $receiveSystemEmail, ParameterType::INTEGER);
+        }
+
         // Filter the items over the group id if set.
         $groupId = $this->getState('filter.group_id');
         $groups  = $this->getState('filter.groups');