mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename $isadmin to $isAdmin

This commit is contained in:
Lukas Reschke 2014-04-19 23:53:47 +02:00 committed by Arthur Schiwon
parent a9bd416643
commit b56d14260d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/templates/users/part.setquota.php
View File

@ -5,7 +5,7 @@
<div class="quota"> <div class="quota">
<!-- Default storage --> <!-- Default storage -->
<span><?php p($l->t('Default Quota'));?></span> <span><?php p($l->t('Default Quota'));?></span>
<?php if((bool) $_['isadmin']): ?> <?php if((bool) $_['isAdmin']): ?>
<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>"> <select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'> <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
<?php p($l->t('Unlimited'));?> <?php p($l->t('Unlimited'));?>
@ -28,7 +28,7 @@
</option> </option>
</select> </select>
<?php endif; ?> <?php endif; ?>
<?php if((bool) !$_['isadmin']): ?> <?php if((bool) !$_['isAdmin']): ?>
<select class='quota' disabled="disabled"> <select class='quota' disabled="disabled">
<option selected="selected"> <option selected="selected">
<?php p($_['default_quota']);?> <?php p($_['default_quota']);?>

8
settings/users.php
View File

@ -33,16 +33,16 @@ if (isset($_GET['limit'])) {
$limit = 10; $limit = 10;
} }
$isadmin = OC_User::isAdminUser(OC_User::getUser()); $isAdmin = OC_User::isAdminUser(OC_User::getUser());
$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isadmin, $groupManager); $groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager);
$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT); $groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
list($adminGroup, $groups) = $groupsInfo->get(); list($adminGroup, $groups) = $groupsInfo->get();
$recoveryAdminEnabled = OC_App::isEnabled('files_encryption') && $recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
if($isadmin) { if($isAdmin) {
$accessibleusers = OC_User::getDisplayNames('', 30); $accessibleusers = OC_User::getDisplayNames('', 30);
$subadmins = OC_SubAdmin::getAllSubAdmins(); $subadmins = OC_SubAdmin::getAllSubAdmins();
}else{ }else{
@ -90,7 +90,7 @@ $tmpl = new OC_Template( "settings", "users/main", "user" );
$tmpl->assign( 'users', $users ); $tmpl->assign( 'users', $users );
$tmpl->assign( 'groups', $groups ); $tmpl->assign( 'groups', $groups );
$tmpl->assign( 'adminGroup', $adminGroup ); $tmpl->assign( 'adminGroup', $adminGroup );
$tmpl->assign( 'isadmin', (int) $isadmin); $tmpl->assign( 'isAdmin', (int) $isAdmin);
$tmpl->assign( 'subadmins', $subadmins); $tmpl->assign( 'subadmins', $subadmins);
$tmpl->assign( 'numofgroups', count($groups) + count($adminGroup)); $tmpl->assign( 'numofgroups', count($groups) + count($adminGroup));
$tmpl->assign( 'quota_preset', $quotaPreset); $tmpl->assign( 'quota_preset', $quotaPreset);