Internal: Correct user group filtering and unassignment in URL edit - refs BT#22643

Author: christianbeeznest

public/main/admin/access_url_edit_usergroup_to_url.php

@@ -53,7 +53,7 @@
     }
 }
 
-$noUserGroupList = $userGroup->getUserGroupNotInList(array_keys($userGroupList));
+$noUserGroupList = $userGroup->getUserGroupNotInList(array_keys($userGroupList), $access_url_id);
 $url_list        = UrlManager::get_url_data();
 
 $totalGroups         = count($userGroupList) + count($noUserGroupList);

public/main/inc/lib/usergroup.lib.php

@@ -1514,23 +1514,18 @@ public function filterByFirstLetter($firstLetter, $limit = 0)
 
     /**
      * Select user group not in list.
-     *
-     * @param array $list
-     *
-     * @return array
      */
-    public function getUserGroupNotInList(array $list): array
+    public function getUserGroupNotInList(array $list, int $accessUrlId): array
     {
-        $urlId = api_get_current_access_url_id();
         $params = [];
 
         $sql = "SELECT g.*
-            FROM $this->table g";
+            FROM {$this->table} g";
 
         if ($this->getUseMultipleUrl()) {
-            $sql .= " LEFT JOIN $this->access_url_rel_usergroup a
-                    ON (g.id = a.usergroup_id AND a.access_url_id = ?)";
-            $params[] = $urlId;
+            $sql .= " LEFT JOIN {$this->access_url_rel_usergroup} a
+                  ON (g.id = a.usergroup_id AND a.access_url_id = ?)";
+            $params[] = $accessUrlId;
             $sql .= " WHERE a.usergroup_id IS NULL";
         } else {
             $sql .= " WHERE 1=1";
@@ -1544,9 +1539,9 @@ public function getUserGroupNotInList(array $list): array
 
         $sql .= " ORDER BY g.title";
 
-        $result = Database::getManager()->getConnection()->executeQuery($sql, $params);
+        $stmt = Database::getManager()->getConnection()->executeQuery($sql, $params);
 
-        return Database::store_result($result, 'ASSOC');
+        return Database::store_result($stmt, 'ASSOC');
     }
 
     /**