Merge branch 'cherry-pick-d7e352d4' into '1.3-fixes'

Merge branch '5983-write-acl-on-user-userroles-...' into '1.3-fixes'

See merge request fusiondirectory/fd!586

plugins/admin/groups/class_ogroup.inc

@@ -368,12 +368,12 @@ class ogroup extends simplePlugin
       $addingMembers    = array_diff($userMembers, $savedMembers);
       $removingMembers  = array_diff($savedMembers, $userMembers);
       foreach ($addingMembers as $dn) {
-        if (strpos($ui->get_permissions($dn, 'user/user', 'groupsMembership', $this->acl_skip_write()), 'w') === FALSE) {
+        if (strpos($ui->get_permissions($dn, 'user/userRoles', 'groupsMembership', $this->acl_skip_write()), 'w') === FALSE) {
           $errors[] = msgPool::permModify($dn, 'groupsMembership');
         }
       }
       foreach ($removingMembers as $dn) {
-        if (strpos($ui->get_permissions($dn, 'user/user', 'groupsMembership', $this->acl_skip_write()), 'w') === FALSE) {
+        if (strpos($ui->get_permissions($dn, 'user/userRoles', 'groupsMembership', $this->acl_skip_write()), 'w') === FALSE) {
           $errors[] = msgPool::permModify($dn, 'groupsMembership');
         }
       }

plugins/admin/groups/class_roleGeneric.inc

@@ -124,12 +124,12 @@ class roleGeneric extends simplePlugin
       $addingOccupants    = array_diff($this->roleOccupant, $savedOccupants);
       $removingOccupants  = array_diff($savedOccupants, $this->roleOccupant);
       foreach ($addingOccupants as $dn) {
-        if (strpos($ui->get_permissions($dn, 'user/user', 'rolesMembership', $this->acl_skip_write()), 'w') === FALSE) {
+        if (strpos($ui->get_permissions($dn, 'user/userRoles', 'rolesMembership', $this->acl_skip_write()), 'w') === FALSE) {
           $errors[] = msgPool::permModify($dn, 'rolesMembership');
         }
       }
       foreach ($removingOccupants as $dn) {
-        if (strpos($ui->get_permissions($dn, 'user/user', 'rolesMembership', $this->acl_skip_write()), 'w') === FALSE) {
+        if (strpos($ui->get_permissions($dn, 'user/userRoles', 'rolesMembership', $this->acl_skip_write()), 'w') === FALSE) {
           $errors[] = msgPool::permModify($dn, 'rolesMembership');
         }
       }

[bmortier]

SonarQube analysis reported 1 issue

• 1 minor

Note: The following issues were found on lines that were not modified in the commit. Because these issues can't be reported as line comments, they are summarized here:

1. Rename class "tabs_configInLdap" to match the regular expression ^[a-zA-Z][a-zA-Z0-9]*$.

By Ghost User on 2019-05-09T12:52:14 (imported from GitLab)

[bmortier]

SonarQube analysis reported 1 issue

• 1 minor

Note: The following issues were found on lines that were not modified in the commit. Because these issues can't be reported as line comments, they are summarized here:

1. Rename class "tabs_configInLdap" to match the regular expression ^[a-zA-Z][a-zA-Z0-9]*$.

By Ghost User on 2019-05-16T14:08:43 (imported from GitLab)