Internal: #fix commit de5623b to show last 10 registered users in user group and session pages to show only user from the current URL - refs BT#22048 BT#22439

Author: NicoDucou

main/admin/add_users_to_usergroup.php

@@ -175,11 +175,16 @@ function showLastTenUsers() {
     $excludedUsers = isset($_POST['excludedUsers']) ? $_POST['excludedUsers'] : [];
     $id = isset($_POST['id']) ? intval($_POST['id']) : 0;
 
+    $accessUrlId = api_get_current_access_url_id();
     $excludedIds = !empty($excludedUsers) ? implode(",", array_map('intval', $excludedUsers)) : '0';
     $sql = 'SELECT id, username, firstname, lastname
             FROM user
             WHERE status != '.ANONYMOUS.'
             AND id NOT IN ('.$excludedIds.')
+            AND u.id IN (
+                SELECT user_id
+                FROM access_url_rel_user
+                WHERE access_url_id ='.$accessUrlId.')
             ORDER BY id DESC
             LIMIT 10';
 

main/session/add_users_to_session.php

@@ -72,13 +72,18 @@
     $excludedUsers = isset($_POST['excludedUsers']) ? $_POST['excludedUsers'] : [];
 
     $excludedUsersList = count($excludedUsers) > 0 ? implode(",", array_map('intval', $excludedUsers)) : '0';
+    $accessUrlId = api_get_current_access_url_id();
 
     if ($_POST['action'] == 'get_last_ten_users') {
         $sql = "SELECT u.id, u.username, u.firstname, u.lastname
                 FROM $tbl_user u
                 LEFT JOIN $tbl_session_rel_user sru ON (u.id = sru.user_id AND sru.session_id = $id_session)
                 WHERE sru.user_id IS NULL
                 AND u.id NOT IN ($excludedUsersList)
+                AND u.id IN (
+                    SELECT user_id
+                    FROM access_url_rel_user
+                    WHERE access_url_id ='$accessUrlId')
                 ORDER BY u.id DESC
                 LIMIT 10";
     } elseif ($_POST['action'] == 'get_all_users') {
@@ -87,6 +92,10 @@
                 LEFT JOIN $tbl_session_rel_user sru ON (u.id = sru.user_id AND sru.session_id = $id_session)
                 WHERE sru.user_id IS NULL
                 AND u.id NOT IN ($excludedUsersList)
+                AND u.id IN (
+                    SELECT user_id
+                    FROM access_url_rel_user
+                    WHERE access_url_id ='$accessUrlId')
                 ORDER BY u.lastname ASC, u.firstname ASC";
     }