@@ -13,7 +13,6 @@ discard block |
||
| 13 | 13 | * $tmpl = new OC_Template('settings', 'settings', 'user'); |
| 14 | 14 | * $tmpl->assign('serverData', $serverData); |
| 15 | 15 | * $tmpl->printPage(); |
| 16 | - |
|
| 17 | 16 | */ |
| 18 | 17 | |
| 19 | 18 | script('settings', 'main'); |
@@ -21,7 +20,7 @@ discard block |
||
| 21 | 20 | |
| 22 | 21 | // Did we have some data to inject ? |
| 23 | 22 | if(is_array($_['serverData'])) { |
| 24 | - $serverData = json_encode($_['serverData']); |
|
| 23 | + $serverData = json_encode($_['serverData']); |
|
| 25 | 24 | ?> |
| 26 | 25 | <span id="serverData" data-server="<?php p($serverData);?>"></span> |
| 27 | 26 | <?php } ?> |
@@ -20,8 +20,8 @@ |
||
| 20 | 20 | style('settings', 'settings'); |
| 21 | 21 | |
| 22 | 22 | // Did we have some data to inject ? |
| 23 | -if(is_array($_['serverData'])) { |
|
| 23 | +if (is_array($_['serverData'])) { |
|
| 24 | 24 | $serverData = json_encode($_['serverData']); |
| 25 | 25 | ?> |
| 26 | -<span id="serverData" data-server="<?php p($serverData);?>"></span> |
|
| 26 | +<span id="serverData" data-server="<?php p($serverData); ?>"></span> |
|
| 27 | 27 | <?php } ?> |
@@ -20,5 +20,5 @@ |
||
| 20 | 20 | * |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | - $tmpl = new OC_Template("settings", "settings", "user"); |
|
| 24 | - $tmpl->printPage(); |
|
| 23 | + $tmpl = new OC_Template("settings", "settings", "user"); |
|
| 24 | + $tmpl->printPage(); |
|
@@ -49,18 +49,18 @@ discard block |
||
| 49 | 49 | $config = \OC::$server->getConfig(); |
| 50 | 50 | |
| 51 | 51 | if ($config->getSystemValue('sort_groups_by_name', false)) { |
| 52 | - $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 52 | + $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 53 | 53 | } else { |
| 54 | - $isLDAPUsed = false; |
|
| 55 | - if ($appManager->isEnabledForUser('user_ldap')) { |
|
| 56 | - $isLDAPUsed = |
|
| 57 | - $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') |
|
| 58 | - || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); |
|
| 59 | - if ($isLDAPUsed) { |
|
| 60 | - // LDAP user count can be slow, so we sort by group name here |
|
| 61 | - $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 62 | - } |
|
| 63 | - } |
|
| 54 | + $isLDAPUsed = false; |
|
| 55 | + if ($appManager->isEnabledForUser('user_ldap')) { |
|
| 56 | + $isLDAPUsed = |
|
| 57 | + $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') |
|
| 58 | + || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); |
|
| 59 | + if ($isLDAPUsed) { |
|
| 60 | + // LDAP user count can be slow, so we sort by group name here |
|
| 61 | + $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $uid = \OC_User::getUser(); |
@@ -69,62 +69,62 @@ discard block |
||
| 69 | 69 | $isDisabled = true; |
| 70 | 70 | $user = $userManager->get($uid); |
| 71 | 71 | if ($user) { |
| 72 | - $isDisabled = !$user->isEnabled(); |
|
| 72 | + $isDisabled = !$user->isEnabled(); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $groupsInfo = new \OC\Group\MetaData( |
| 76 | - $uid, |
|
| 77 | - $isAdmin, |
|
| 78 | - $groupManager, |
|
| 79 | - \OC::$server->getUserSession() |
|
| 76 | + $uid, |
|
| 77 | + $isAdmin, |
|
| 78 | + $groupManager, |
|
| 79 | + \OC::$server->getUserSession() |
|
| 80 | 80 | ); |
| 81 | 81 | |
| 82 | 82 | $groupsInfo->setSorting($sortGroupsBy); |
| 83 | 83 | list($adminGroup, $groups) = $groupsInfo->get(); |
| 84 | 84 | |
| 85 | 85 | $recoveryAdminEnabled = $appManager->isEnabledForUser('encryption') && |
| 86 | - $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0'); |
|
| 86 | + $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0'); |
|
| 87 | 87 | |
| 88 | 88 | if($isAdmin) { |
| 89 | - $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins(); |
|
| 90 | - // New class returns IUser[] so convert back |
|
| 91 | - $result = []; |
|
| 92 | - foreach ($subAdmins as $subAdmin) { |
|
| 93 | - $result[] = [ |
|
| 94 | - 'gid' => $subAdmin['group']->getGID(), |
|
| 95 | - 'uid' => $subAdmin['user']->getUID(), |
|
| 96 | - ]; |
|
| 97 | - } |
|
| 98 | - $subAdmins = $result; |
|
| 89 | + $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins(); |
|
| 90 | + // New class returns IUser[] so convert back |
|
| 91 | + $result = []; |
|
| 92 | + foreach ($subAdmins as $subAdmin) { |
|
| 93 | + $result[] = [ |
|
| 94 | + 'gid' => $subAdmin['group']->getGID(), |
|
| 95 | + 'uid' => $subAdmin['user']->getUID(), |
|
| 96 | + ]; |
|
| 97 | + } |
|
| 98 | + $subAdmins = $result; |
|
| 99 | 99 | }else{ |
| 100 | - /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
|
| 101 | - $gids = array(); |
|
| 102 | - foreach($groups as $group) { |
|
| 103 | - if (isset($group['id'])) { |
|
| 104 | - $gids[] = $group['id']; |
|
| 105 | - } |
|
| 106 | - } |
|
| 107 | - $subAdmins = false; |
|
| 100 | + /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
|
| 101 | + $gids = array(); |
|
| 102 | + foreach($groups as $group) { |
|
| 103 | + if (isset($group['id'])) { |
|
| 104 | + $gids[] = $group['id']; |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | + $subAdmins = false; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $disabledUsers = $isLDAPUsed ? 0 : $userManager->countDisabledUsers(); |
| 111 | 111 | $disabledUsersGroup = [ |
| 112 | - 'id' => '_disabledUsers', |
|
| 113 | - 'name' => 'Disabled users', |
|
| 114 | - 'usercount' => $disabledUsers |
|
| 112 | + 'id' => '_disabledUsers', |
|
| 113 | + 'name' => 'Disabled users', |
|
| 114 | + 'usercount' => $disabledUsers |
|
| 115 | 115 | ]; |
| 116 | 116 | |
| 117 | 117 | // load preset quotas |
| 118 | 118 | $quotaPreset=$config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'); |
| 119 | 119 | $quotaPreset=explode(',', $quotaPreset); |
| 120 | 120 | foreach($quotaPreset as &$preset) { |
| 121 | - $preset=trim($preset); |
|
| 121 | + $preset=trim($preset); |
|
| 122 | 122 | } |
| 123 | 123 | $quotaPreset=array_diff($quotaPreset, array('default', 'none')); |
| 124 | 124 | |
| 125 | 125 | $defaultQuota=$config->getAppValue('files', 'default_quota', 'none'); |
| 126 | 126 | $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false |
| 127 | - && array_search($defaultQuota, array('none', 'default'))===false; |
|
| 127 | + && array_search($defaultQuota, array('none', 'default'))===false; |
|
| 128 | 128 | |
| 129 | 129 | \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts'); |
| 130 | 130 | |
@@ -83,9 +83,9 @@ discard block |
||
| 83 | 83 | list($adminGroup, $groups) = $groupsInfo->get(); |
| 84 | 84 | |
| 85 | 85 | $recoveryAdminEnabled = $appManager->isEnabledForUser('encryption') && |
| 86 | - $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0'); |
|
| 86 | + $config->getAppValue('encryption', 'recoveryAdminEnabled', '0'); |
|
| 87 | 87 | |
| 88 | -if($isAdmin) { |
|
| 88 | +if ($isAdmin) { |
|
| 89 | 89 | $subAdmins = \OC::$server->getGroupManager()->getSubAdmin()->getAllSubAdmins(); |
| 90 | 90 | // New class returns IUser[] so convert back |
| 91 | 91 | $result = []; |
@@ -96,10 +96,10 @@ discard block |
||
| 96 | 96 | ]; |
| 97 | 97 | } |
| 98 | 98 | $subAdmins = $result; |
| 99 | -}else{ |
|
| 99 | +} else { |
|
| 100 | 100 | /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
| 101 | 101 | $gids = array(); |
| 102 | - foreach($groups as $group) { |
|
| 102 | + foreach ($groups as $group) { |
|
| 103 | 103 | if (isset($group['id'])) { |
| 104 | 104 | $gids[] = $group['id']; |
| 105 | 105 | } |
@@ -115,16 +115,16 @@ discard block |
||
| 115 | 115 | ]; |
| 116 | 116 | |
| 117 | 117 | // load preset quotas |
| 118 | -$quotaPreset=$config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'); |
|
| 119 | -$quotaPreset=explode(',', $quotaPreset); |
|
| 120 | -foreach($quotaPreset as &$preset) { |
|
| 121 | - $preset=trim($preset); |
|
| 118 | +$quotaPreset = $config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'); |
|
| 119 | +$quotaPreset = explode(',', $quotaPreset); |
|
| 120 | +foreach ($quotaPreset as &$preset) { |
|
| 121 | + $preset = trim($preset); |
|
| 122 | 122 | } |
| 123 | -$quotaPreset=array_diff($quotaPreset, array('default', 'none')); |
|
| 123 | +$quotaPreset = array_diff($quotaPreset, array('default', 'none')); |
|
| 124 | 124 | |
| 125 | -$defaultQuota=$config->getAppValue('files', 'default_quota', 'none'); |
|
| 126 | -$defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false |
|
| 127 | - && array_search($defaultQuota, array('none', 'default'))===false; |
|
| 125 | +$defaultQuota = $config->getAppValue('files', 'default_quota', 'none'); |
|
| 126 | +$defaultQuotaIsUserDefined = array_search($defaultQuota, $quotaPreset) === false |
|
| 127 | + && array_search($defaultQuota, array('none', 'default')) === false; |
|
| 128 | 128 | |
| 129 | 129 | \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts'); |
| 130 | 130 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $serverData['subadmingroups'] = $groups; |
| 138 | 138 | $serverData['disabledUsersGroup'] = $disabledUsersGroup; |
| 139 | 139 | // Various data |
| 140 | -$serverData['isAdmin'] = (int)$isAdmin; |
|
| 140 | +$serverData['isAdmin'] = (int) $isAdmin; |
|
| 141 | 141 | $serverData['subadmins'] = $subAdmins; |
| 142 | 142 | $serverData['sortGroups'] = $sortGroupsBy; |
| 143 | 143 | $serverData['quotaPreset'] = $quotaPreset; |