Skip to content

Commit

Permalink
Fix for Group Assignment of User when dealing with inherited groups
Browse files Browse the repository at this point in the history 
Makes sure inherited groups of user when saved stay inherited. Before
inherited groups would become actual groups the user belongs to. Fix for
#803
  • Loading branch information
@eSilverStrike
eSilverStrike committed Sep 18, 2017
1 parent e6f9fb8 commit b2182b0
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 48 deletions.
61 changes: 31 additions & 30 deletions system/lib-admin.php
View file
Expand Up @@ -1558,48 +1558,49 @@ function ADMIN_getListField_trackback($fieldName, $fieldValue, $A, $icon_arr, $t
* @param string $selected
* @return string
*/
function ADMIN_getListField_usergroups($fieldName, $fieldValue, $A, $icon_arr, $selected = '')
function ADMIN_getListField_usergroups($fieldname, $fieldvalue, $A, $icon_arr, $selected = '')
{
global $thisUsersGroups;
global $thisUsersGroups, $_USER_MAINGROUPS;

$retval = false;

if (!is_array($thisUsersGroups)) {
if(!is_array($thisUsersGroups)) {
$thisUsersGroups = SEC_getUserGroups();
}

if (in_array($A['grp_id'], $thisUsersGroups) ||
SEC_groupIsRemoteUserAndHaveAccess($A['grp_id'], $thisUsersGroups)
) {
switch ($fieldName) {
case 'checkbox':
$checked = '';
if (is_array($selected) && in_array($A['grp_id'], $selected)) {
$checked = ' checked="checked"';
}
if (($A['grp_name'] === 'All Users') ||
($A['grp_name'] === 'Logged-in Users') ||
($A['grp_name'] === 'Remote Users')
) {
$retval = '<input type="checkbox" disabled="disabled"'
if (in_array($A['grp_id'], $thisUsersGroups ) ||
SEC_groupIsRemoteUserAndHaveAccess($A['grp_id'], $thisUsersGroups)) {
switch($fieldname) {
case 'checkbox':
$checked = '';
if (is_array($selected) && in_array($A['grp_id'], $selected)) {
$checked = ' checked="checked"';
}
if (($A['grp_name'] == 'All Users') ||
($A['grp_name'] == 'Logged-in Users') ||
($A['grp_name'] == 'Remote Users')) {
$retval = '<input type="checkbox" disabled="disabled"'
. $checked . XHTML . '>';
if (!empty($checked)) {
$retval .= '<input type="hidden" name="groups[]" value="'
if (!empty($checked)) {
$retval .= '<input type="hidden" name="groups[]" value="'
. $A['grp_id'] . '"' . $checked . XHTML . '>';
}
} else {
$retval = '<input type="checkbox" name="groups[]" value="'
. $A['grp_id'] . '"' . $checked . XHTML . '>';
}
break;
} elseif (!empty($checked) && (! in_array($A['grp_id'], $_USER_MAINGROUPS ))) {
$retval = '<input type="checkbox" disabled="disabled"'
. $checked . XHTML . '>';
} else {
$retval = '<input type="checkbox" name="groups[]" value="'
. $A['grp_id'] . '"' . $checked . XHTML . '>';
}
break;

case 'grp_name':
$retval = ucwords($fieldValue);
break;
case 'grp_name':
$retval = ucwords($fieldvalue);
break;

default:
$retval = $fieldValue;
break;
default:
$retval = $fieldvalue;
break;
}
}

Expand Down
43 changes: 25 additions & 18 deletions system/lib-security.php
View file
Expand Up @@ -74,23 +74,26 @@
}

/**
* Returns the groups a user belongs to
* This is part of the GL security implementation. This function returns
* all the groups a user belongs to. This function is called recursively
* as groups can belong to other groups
* Note: this is an expensive function -- if you are concerned about speed it should only
* be used once at the beginning of a page. The resulting array $_GROUPS can then be
* used through out the page.
*
* @param int $uid User ID to get information for. If empty current user.
* @return array Associative Array grp_name -> ug_main_grp_id of group ID's user belongs to
*/
function SEC_getUserGroups($uid = '')
* Returns the groups a user belongs to
*
* This is part of the GL security implementation. This function returns
* all the groups a user belongs to. This function is called recursively
* as groups can belong to other groups
*
* Note: this is an expensive function -- if you are concerned about speed it should only
* be used once at the beginning of a page. The resulting array $_GROUPS can then be
* used through out the page.
*
* @param int $uid User ID to get information for. If empty current user.
* @return array Associative Array grp_name -> ug_main_grp_id of group ID's user belongs to
*
*/
function SEC_getUserGroups($uid='')
{
global $_TABLES, $_USER, $_SEC_VERBOSE;
global $_TABLES, $_USER, $_SEC_VERBOSE, $_USER_MAINGROUPS;

if ($_SEC_VERBOSE) {
COM_errorLog("****************in getusergroups(uid=$uid)***************", 1);
COM_errorLog("****************in getusergroups(uid=$uid,usergroups=$usergroups,cur_grp_id=$cur_grp_id)***************",1);
}

$groups = array();
Expand All @@ -101,10 +104,13 @@ function SEC_getUserGroups($uid = '')
} else {
$uid = $_USER['uid'];
}
} else {
$_USER_MAINGROUPS = array();
$tuid = $uid;
}

$result = DB_query("SELECT ug_main_grp_id,grp_name FROM {$_TABLES["group_assignments"]},{$_TABLES["groups"]}"
. " WHERE grp_id = ug_main_grp_id AND ug_uid = $uid", 1);
. " WHERE grp_id = ug_main_grp_id AND ug_uid = $uid", 1);

if ($result === false) {
return $groups;
Expand All @@ -113,7 +119,7 @@ function SEC_getUserGroups($uid = '')
$nrows = DB_numRows($result);

if ($_SEC_VERBOSE) {
COM_errorLog("got $nrows rows", 1);
COM_errorLog("got $nrows rows",1);
}

while ($nrows > 0) {
Expand All @@ -132,9 +138,10 @@ function SEC_getUserGroups($uid = '')
}

if (count($cgroups) > 0) {
if (empty($_USER_MAINGROUPS) && !empty($tuid)) { $_USER_MAINGROUPS = $cgroups; }
$glist = implode(',', $cgroups);
$result = DB_query("SELECT ug_main_grp_id,grp_name FROM {$_TABLES["group_assignments"]},{$_TABLES["groups"]}"
. " WHERE grp_id = ug_main_grp_id AND ug_grp_id IN ($glist)", 1);
. " WHERE grp_id = ug_main_grp_id AND ug_grp_id IN ($glist)", 1);
$nrows = DB_numRows($result);
} else {
$nrows = 0;
Expand All @@ -144,7 +151,7 @@ function SEC_getUserGroups($uid = '')
uksort($groups, 'strcasecmp');

if ($_SEC_VERBOSE) {
COM_errorLog("****************leaving getusergroups(uid=$uid)***************", 1);
COM_errorLog("****************leaving getusergroups(uid=$uid)***************",1);
}

return $groups;
Expand Down

0 comments on commit b2182b0

Please sign in to comment.