@@ -48,18 +48,18 @@ discard block |
||
| 48 | 48 | $config = \OC::$server->getConfig(); |
| 49 | 49 | |
| 50 | 50 | if ($config->getSystemValue('sort_groups_by_name', false)) { |
| 51 | - $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 51 | + $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 52 | 52 | } else { |
| 53 | - $isLDAPUsed = false; |
|
| 54 | - if (\OC_App::isEnabled('user_ldap')) { |
|
| 55 | - $isLDAPUsed = |
|
| 56 | - $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') |
|
| 57 | - || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); |
|
| 58 | - if ($isLDAPUsed) { |
|
| 59 | - // LDAP user count can be slow, so we sort by group name here |
|
| 60 | - $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 61 | - } |
|
| 62 | - } |
|
| 53 | + $isLDAPUsed = false; |
|
| 54 | + if (\OC_App::isEnabled('user_ldap')) { |
|
| 55 | + $isLDAPUsed = |
|
| 56 | + $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') |
|
| 57 | + || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); |
|
| 58 | + if ($isLDAPUsed) { |
|
| 59 | + // LDAP user count can be slow, so we sort by group name here |
|
| 60 | + $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | $isAdmin = OC_User::isAdminUser(OC_User::getUser()); |
@@ -67,58 +67,58 @@ discard block |
||
| 67 | 67 | $isDisabled = !OC_User::isEnabled(OC_User::getUser()); |
| 68 | 68 | |
| 69 | 69 | $groupsInfo = new \OC\Group\MetaData( |
| 70 | - OC_User::getUser(), |
|
| 71 | - $isAdmin, |
|
| 72 | - $groupManager, |
|
| 73 | - \OC::$server->getUserSession() |
|
| 70 | + OC_User::getUser(), |
|
| 71 | + $isAdmin, |
|
| 72 | + $groupManager, |
|
| 73 | + \OC::$server->getUserSession() |
|
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | 76 | $groupsInfo->setSorting($sortGroupsBy); |
| 77 | 77 | list($adminGroup, $groups) = $groupsInfo->get(); |
| 78 | 78 | |
| 79 | 79 | $recoveryAdminEnabled = OC_App::isEnabled('encryption') && |
| 80 | - $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0'); |
|
| 80 | + $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0'); |
|
| 81 | 81 | |
| 82 | 82 | if($isAdmin) { |
| 83 | - $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins(); |
|
| 84 | - // New class returns IUser[] so convert back |
|
| 85 | - $result = []; |
|
| 86 | - foreach ($subAdmins as $subAdmin) { |
|
| 87 | - $result[] = [ |
|
| 88 | - 'gid' => $subAdmin['group']->getGID(), |
|
| 89 | - 'uid' => $subAdmin['user']->getUID(), |
|
| 90 | - ]; |
|
| 91 | - } |
|
| 92 | - $subAdmins = $result; |
|
| 83 | + $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins(); |
|
| 84 | + // New class returns IUser[] so convert back |
|
| 85 | + $result = []; |
|
| 86 | + foreach ($subAdmins as $subAdmin) { |
|
| 87 | + $result[] = [ |
|
| 88 | + 'gid' => $subAdmin['group']->getGID(), |
|
| 89 | + 'uid' => $subAdmin['user']->getUID(), |
|
| 90 | + ]; |
|
| 91 | + } |
|
| 92 | + $subAdmins = $result; |
|
| 93 | 93 | }else{ |
| 94 | - /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
|
| 95 | - $gids = array(); |
|
| 96 | - foreach($groups as $group) { |
|
| 97 | - if (isset($group['id'])) { |
|
| 98 | - $gids[] = $group['id']; |
|
| 99 | - } |
|
| 100 | - } |
|
| 101 | - $subAdmins = false; |
|
| 94 | + /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
|
| 95 | + $gids = array(); |
|
| 96 | + foreach($groups as $group) { |
|
| 97 | + if (isset($group['id'])) { |
|
| 98 | + $gids[] = $group['id']; |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | + $subAdmins = false; |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | $disabledUsers = $isLDAPUsed ? 0 : $userManager->countDisabledUsers(); |
| 105 | 105 | $disabledUsersGroup = [ |
| 106 | - 'id' => '_disabledUsers', |
|
| 107 | - 'name' => '_disabledUsers', |
|
| 108 | - 'usercount' => $disabledUsers |
|
| 106 | + 'id' => '_disabledUsers', |
|
| 107 | + 'name' => '_disabledUsers', |
|
| 108 | + 'usercount' => $disabledUsers |
|
| 109 | 109 | ]; |
| 110 | 110 | |
| 111 | 111 | // load preset quotas |
| 112 | 112 | $quotaPreset=$config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'); |
| 113 | 113 | $quotaPreset=explode(',', $quotaPreset); |
| 114 | 114 | foreach($quotaPreset as &$preset) { |
| 115 | - $preset=trim($preset); |
|
| 115 | + $preset=trim($preset); |
|
| 116 | 116 | } |
| 117 | 117 | $quotaPreset=array_diff($quotaPreset, array('default', 'none')); |
| 118 | 118 | |
| 119 | 119 | $defaultQuota=$config->getAppValue('files', 'default_quota', 'none'); |
| 120 | 120 | $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false |
| 121 | - && array_search($defaultQuota, array('none', 'default'))===false; |
|
| 121 | + && array_search($defaultQuota, array('none', 'default'))===false; |
|
| 122 | 122 | |
| 123 | 123 | \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts'); |
| 124 | 124 | |