dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update users.php

Browse Source
This commit is contained in:
FusionPBX
2019-02-09 08:20:33 -07:00
committed by GitHub
parent 1bb4acfe34
commit 9f49cbfbb3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/users/users.php
+5 -5
View File
@@ -57,18 +57,18 @@
//get the user group(s) from the database //get the user group(s) from the database
$sql = "select "; $sql = "select ";
$sql .= " gu.*, g.domain_uuid as group_domain_uuid "; $sql .= " ug.*, g.domain_uuid as group_domain_uuid ";
$sql .= "from "; $sql .= "from ";
$sql .= " v_group_users as gu, "; $sql .= " v_user_groups as ug, ";
$sql .= " v_groups as g "; $sql .= " v_groups as g ";
$sql .= "where "; $sql .= "where ";
$sql .= " gu.group_uuid = g.group_uuid "; $sql .= " ug.group_uuid = g.group_uuid ";
if (!(permission_exists('user_all') && $_GET['show'] == 'all')) { if (!(permission_exists('user_all') && $_GET['show'] == 'all')) {
$sql .= " and ("; $sql .= " and (";
$sql .= " g.domain_uuid = '".$domain_uuid."' "; $sql .= " g.domain_uuid = '".$domain_uuid."' ";
$sql .= " or g.domain_uuid is null "; $sql .= " or g.domain_uuid is null ";
$sql .= " ) "; $sql .= " ) ";
$sql .= " and gu.domain_uuid = '".$domain_uuid."' "; $sql .= " and ug.domain_uuid = '".$domain_uuid."' ";
} }
$sql .= "order by "; $sql .= "order by ";
$sql .= " g.domain_uuid desc, "; $sql .= " g.domain_uuid desc, ";
@@ -76,7 +76,7 @@
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
if (count($result) > 0) { if (is_array($result)) {
foreach($result as $row) { foreach($result as $row) {
$user_groups[$row['user_uuid']][] = $row['group_name'].(($row['group_domain_uuid'] != '') ? "@".$_SESSION['domains'][$row['group_domain_uuid']]['domain_name'] : null); $user_groups[$row['user_uuid']][] = $row['group_name'].(($row['group_domain_uuid'] != '') ? "@".$_SESSION['domains'][$row['group_domain_uuid']]['domain_name'] : null);
} }