diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SQL queries to include group_level

Browse Source
This commit is contained in:
FusionPBX
2026-05-29 20:13:21 +00:00
committed by GitHub
parent a85f24c771
commit 17e63e2622
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/groups/groups.php
+10 -2
View File
@@ -86,7 +86,10 @@
//get the count //get the count
$sql = "select count(*) from view_groups \n"; $sql = "select count(*) from view_groups \n";
$sql .= "where true \n"; $sql .= "where ( ";
$sql .= " group_level <= :group_level ";
$sql .= " or group_level is null ";
$sql .= ") ";
if ($show == 'all' && permission_exists('group_all')) { if ($show == 'all' && permission_exists('group_all')) {
$sql .= "and (domain_uuid is not null or domain_uuid is null) "; $sql .= "and (domain_uuid is not null or domain_uuid is null) ";
} }
@@ -101,6 +104,7 @@
$sql .= ") \n"; $sql .= ") \n";
$parameters['search'] = '%'.$search.'%'; $parameters['search'] = '%'.$search.'%';
} }
$parameters['group_level'] = $_SESSION['user']['group_level'];
$num_rows = $database->select($sql, $parameters ?? [], 'column'); $num_rows = $database->select($sql, $parameters ?? [], 'column');
//prepare to page the results //prepare to page the results
@@ -124,7 +128,10 @@
$sql .= "group_level, "; $sql .= "group_level, ";
$sql .= "group_description "; $sql .= "group_description ";
$sql .= "from view_groups "; $sql .= "from view_groups ";
$sql .= "where true \n"; $sql .= "where ( ";
$sql .= " group_level <= :group_level ";
$sql .= " or group_level is null ";
$sql .= ") ";
if ($show == 'all' && permission_exists('group_all')) { if ($show == 'all' && permission_exists('group_all')) {
$sql .= "and (domain_uuid is not null or domain_uuid is null) "; $sql .= "and (domain_uuid is not null or domain_uuid is null) ";
} }
@@ -141,6 +148,7 @@
} }
$sql .= order_by($order_by, $order, 'group_name', 'asc'); $sql .= order_by($order_by, $order, 'group_name', 'asc');
$sql .= limit_offset($rows_per_page, $offset); $sql .= limit_offset($rows_per_page, $offset);
$parameters['group_level'] = $_SESSION['user']['group_level'];
$groups = $database->select($sql, $parameters ?? [], 'all'); $groups = $database->select($sql, $parameters ?? [], 'all');
unset($sql, $parameters); unset($sql, $parameters);