From d577adf7943be6c134d7a1505312cdc40308a22c Mon Sep 17 00:00:00 2001 From: Helios Ciancio Date: Tue, 13 Aug 2019 09:22:36 +0200 Subject: [PATCH 1/4] notify only unblocked super users --- administrator/components/com_messages/models/message.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php index c94c2ce0f2b88..1d4c891b25607 100644 --- a/administrator/components/com_messages/models/message.php +++ b/administrator/components/com_messages/models/message.php @@ -465,7 +465,8 @@ public function notifySuperUsers($subject, $message, $fromUser = null) $query = $db->getQuery(true) ->select($db->quoteName('user_id')) ->from($db->quoteName('#__user_usergroup_map')) - ->where($db->quoteName('group_id') . ' IN(' . implode(',', $groups) . ')'); + ->where($db->quoteName('group_id') . ' IN(' . implode(',', $groups) . ')') + ->where($db->quoteName('block') . ' = 0'); $userIDs = $db->setQuery($query)->loadColumn(0); From 21f7589de718fdd4014e0390983988a6d705ec73 Mon Sep 17 00:00:00 2001 From: Helios Ciancio Date: Tue, 13 Aug 2019 10:21:09 +0200 Subject: [PATCH 2/4] Update message.php --- administrator/components/com_messages/models/message.php | 1 + 1 file changed, 1 insertion(+) diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php index 1d4c891b25607..b2ae1c9d4dfc3 100644 --- a/administrator/components/com_messages/models/message.php +++ b/administrator/components/com_messages/models/message.php @@ -466,6 +466,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null) ->select($db->quoteName('user_id')) ->from($db->quoteName('#__user_usergroup_map')) ->where($db->quoteName('group_id') . ' IN(' . implode(',', $groups) . ')') + ->where($db->quoteName('sendEmail') . ' = 1') ->where($db->quoteName('block') . ' = 0'); $userIDs = $db->setQuery($query)->loadColumn(0); From 6bb4a7d623cb65be692acd43b6e34bbb9485f102 Mon Sep 17 00:00:00 2001 From: Helios Ciancio Date: Wed, 14 Aug 2019 20:48:25 +0200 Subject: [PATCH 3/4] Update message.php --- administrator/components/com_messages/models/message.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php index b2ae1c9d4dfc3..7e7a45d68fdef 100644 --- a/administrator/components/com_messages/models/message.php +++ b/administrator/components/com_messages/models/message.php @@ -464,10 +464,11 @@ public function notifySuperUsers($subject, $message, $fromUser = null) $query = $db->getQuery(true) ->select($db->quoteName('user_id')) - ->from($db->quoteName('#__user_usergroup_map')) - ->where($db->quoteName('group_id') . ' IN(' . implode(',', $groups) . ')') - ->where($db->quoteName('sendEmail') . ' = 1') - ->where($db->quoteName('block') . ' = 0'); + ->from($db->quoteName('#__user_usergroup_map', 'map')) + ->join('LEFT', $db->quoteName('#__users', 'u') . ' ON ' . $db->quoteName('u.id') . ' = ' . $db->quoteName('map.user_id')) + ->where($db->quoteName('map.group_id') . ' IN(' . implode(',', $groups) . ')') + ->where($db->quoteName('u.block') . ' = 0') + ->where($db->quoteName('u.sendEmail') . ' = 1'); $userIDs = $db->setQuery($query)->loadColumn(0); From aa3cedcf88c935b00cb142bd58bc082dc47f6d29 Mon Sep 17 00:00:00 2001 From: Helios Ciancio Date: Wed, 14 Aug 2019 20:51:56 +0200 Subject: [PATCH 4/4] Update message.php --- administrator/components/com_messages/models/message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php index 7e7a45d68fdef..573340333e49d 100644 --- a/administrator/components/com_messages/models/message.php +++ b/administrator/components/com_messages/models/message.php @@ -463,7 +463,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null) } $query = $db->getQuery(true) - ->select($db->quoteName('user_id')) + ->select($db->quoteName('map.user_id')) ->from($db->quoteName('#__user_usergroup_map', 'map')) ->join('LEFT', $db->quoteName('#__users', 'u') . ' ON ' . $db->quoteName('u.id') . ' = ' . $db->quoteName('map.user_id')) ->where($db->quoteName('map.group_id') . ' IN(' . implode(',', $groups) . ')')