global $i18n;
$mdb2 = getConnection();
- $group_id = $user->getActiveGroup();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
if (isset($options['getAllFields']))
if (!$val['id'] || !$val['role_id'])
return false;
- $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+ $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$user->id;
// Promote user.
$sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and group_id = $user->group_id";
$result = array();
$mdb2 = getConnection();
- $group_id = $user->getActiveGroup();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
- $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 1 order by rank";
+ // Determine max rank. If we are working in on behalf group
+ // then rank restriction does not apply.
+ $max_rank = $user->behalfGroup ? MAX_RANK : $user->rank;
+
+ $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $max_rank and status = 1 order by rank";
$res = $mdb2->query($sql);
$result = array();
if (!is_a($res, 'PEAR_Error')) {
$result = array();
$mdb2 = getConnection();
- $group_id = $user->getActiveGroup();
+ $group_id = $user->getGroup();
$org_id = $user->org_id;
- $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $user->rank and status = 0 order by rank";
+ // Determine max rank. If we are working in on behalf group
+ // then rank restriction does not apply.
+ $max_rank = $user->behalfGroup ? MAX_RANK : $user->rank;
+
+ $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and org_id = $org_id and rank < $max_rank and status = 0 order by rank";
$res = $mdb2->query($sql);
$result = array();
if (!is_a($res, 'PEAR_Error')) {