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

Users - Edit: Fix assigned and available Groups when cross-domain editing (via Show All feature).

This commit is contained in:
Nate 2020-04-13 13:57:31 -06:00
parent e6d95893ee
commit e86ee77d5c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/users/user_edit.php
View File

@ -508,7 +508,7 @@
$p->add("user_setting_edit", "temp"); $p->add("user_setting_edit", "temp");
$p->add("user_edit", "temp"); $p->add("user_edit", "temp");
$p->add('user_group_add', 'temp'); $p->add('user_group_add', 'temp');
//save the data //save the data
$database = new database; $database = new database;
$database->app_name = 'users'; $database->app_name = 'users';
@ -555,14 +555,7 @@
else { else {
message::add($text['message-add'],'positive'); message::add($text['message-add'],'positive');
} }
if ($domain_uuid == $_SESSION['domain_uuid']) { header("Location: user_edit.php?id=".urlencode($user_uuid));
//same domain, edit user
header("Location: user_edit.php?id=".urldecode($user_uuid));
}
else {
//different domain, return to list
header('Location: users.php');
}
exit; exit;
} }
@ -928,7 +921,7 @@
$sql .= "order by "; $sql .= "order by ";
$sql .= " g.domain_uuid desc, "; $sql .= " g.domain_uuid desc, ";
$sql .= " g.group_name asc "; $sql .= " g.group_name asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['domain_uuid'] = $domain_uuid;
$parameters['user_uuid'] = $user_uuid; $parameters['user_uuid'] = $user_uuid;
$database = new database; $database = new database;
$user_groups = $database->select($sql, $parameters, 'all'); $user_groups = $database->select($sql, $parameters, 'all');
@ -961,7 +954,7 @@
$sql .= "and group_uuid not in ('".implode("','",$assigned_groups)."') "; $sql .= "and group_uuid not in ('".implode("','",$assigned_groups)."') ";
} }
$sql .= "order by domain_uuid desc, group_name asc "; $sql .= "order by domain_uuid desc, group_name asc ";
$parameters['domain_uuid'] = $_SESSION['domain_uuid']; $parameters['domain_uuid'] = $domain_uuid;
$database = new database; $database = new database;
$groups = $database->select($sql, $parameters, 'all'); $groups = $database->select($sql, $parameters, 'all');
if (is_array($groups)) { if (is_array($groups)) {
@ -1086,4 +1079,4 @@
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>