Fix fallback to super users, use filter group_id instead of groups. Simplify field description

Author: chmst

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

@@ -48,21 +48,27 @@ final class NotificationModel extends BaseDatabaseModel
     public function sendNotification($type, $oldVersion, $newVersion): void
     {
         $params = ComponentHelper::getParams('com_joomlaupdate');
-
+		
+		// Superusergroups as fallback
+		$superUserGroups = $this->getSuperUserGroups();
+		
+		if (!\is_array($superUserGroups)) {
+            $emailGroups = ArrayHelper::toInteger(explode(',', $superUserGroups));
+        }
+		
         // User groups from input field
-        $emailGroups = $params->get('automated_updates_email_groups', $this->getSuperUserGroups(), 'array');
+        $emailGroups = $params->get('automated_updates_email_groups', $superUserGroups, 'array');
 
         if (!\is_array($emailGroups)) {
             $emailGroups = ArrayHelper::toInteger(explode(',', $emailGroups));
         }
 
         // Get all users in these groups who can receive emails
         $emailReceivers = $this->getEmailReceivers($emailGroups);
-
-        // If no email receivers are found, we do not send any notification
+		
+        // If no email receivers are found, we use superusergroups as fallback
         if (empty($emailReceivers)) {
-            // Should not happen, as at least one super user must exist in the system
-            return;
+			$emailReceivers  = $this->getEmailReceivers($superUserGroups);
         }
 
         $app        = Factory::getApplication();
@@ -109,39 +115,28 @@ private function getEmailReceivers($emailGroups): array
         // Get the users of all groups in the emailGroups
         $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;
+            }
 
-        $usersModel->setState('filter.groups', $emailGroups);
-        $usersModel->setState('filter.state', (int) 0); // Only enabled users
-
-        $usersInGroup = $usersModel->getItems();
-
-        if (empty($usersInGroup)) {
-            // Cannot happen, as at least one super user must exist in the system
-            return [];
-        }
-
-        // Only users with valid email address who are not blocked can receive the email
-        foreach ($usersInGroup as $user) {
-            if (MailHelper::isEmailAddress($user->email) && $user->sendEmail === 1) {
-                $user->email = strtolower(trim($user->email));
-
-                // Check if the email already exists in the emailReceivers array
-                $exist = false;
-                foreach ($emailReceivers as $rec) {
-                    if ($rec->email === $user->email) {
-                        $exist = true;
-                        break;
-                    }
-                }
-
-                // Add to the list if it is not already in the list
-                if (!$exist) {
+			// Users can be in more than one group. Accept only one entry
+            foreach ($usersInGroup as $user) {
+					
+                if (MailHelper::isEmailAddress($user->email) && $user->sendEmail === 1) {
+                    $user->email = strtolower(trim($user->email));
+					
                     $emailReceivers[] = $user;
                 }
             }
         }
 
-        return $emailReceivers;
+        return \array_unique($emailReceivers);
     }
 
     /**

administrator/language/en-GB/com_joomlaupdate.ini

@@ -16,7 +16,7 @@ COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_DISABLED_LABEL="<span class=\"fa-fw me
 COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_LABEL="Automated Updates"
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_DESC="Automatically update Joomla to the latest version when it is available."
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_LABEL="Automated Update"
-COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_DESCRIPTION="All users in the selected groups will receive the emails if they have the receive system emails option enabled and are active. If no users are found, all super users will receive the emails."
+COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_DESCRIPTION="All users in the selected groups will receive the emails. If no users are found, the emails are sent to all Super Users. Recipients MUST have the Receive System Emails option enabled."
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_LABEL="Send Email to User Groups"
 COM_JOOMLAUPDATE_CONFIG_BACKUPCHECK_DESC="Shows the checkbox to confirm you have taken a backup and you're ready to update in the final step before the update is actually applied."
 COM_JOOMLAUPDATE_CONFIG_BACKUPCHECK_LABEL="Confirm Backup Checkbox"