Update settings/users.php

respect coding style
This commit is contained in:
Thomas Müller 2012-09-04 12:19:01 +03:00
parent 01f5aa1b2d
commit e87387c956
1 changed files with 10 additions and 6 deletions

View File

@ -5,7 +5,7 @@
* See the COPYING-README file. * See the COPYING-README file.
*/ */
require_once('../lib/base.php'); require_once '../lib/base.php';
OC_Util::checkSubAdminUser(); OC_Util::checkSubAdminUser();
// We have some javascript foo! // We have some javascript foo!
@ -18,8 +18,8 @@ OC_App::setActiveNavigationEntry( 'core_users' );
$users = array(); $users = array();
$groups = array(); $groups = array();
$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false; $isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
if($isadmin){ if($isadmin) {
$accessiblegroups = OC_Group::getGroups(); $accessiblegroups = OC_Group::getGroups();
$accessibleusers = OC_User::getUsers('', 30); $accessibleusers = OC_User::getUsers('', 30);
$subadmins = OC_SubAdmin::getAllSubAdmins(); $subadmins = OC_SubAdmin::getAllSubAdmins();
@ -30,20 +30,24 @@ if($isadmin){
} }
foreach($accessibleusers as $i){ foreach($accessibleusers as $i){
$users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),'quota'=>OC_Preferences::getValue($i,'files','quota','default'),'subadmin'=>implode(', ',OC_SubAdmin::getSubAdminsGroups($i))); $users[] = array(
"name" => $i,
"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'),
'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
} }
foreach( $accessiblegroups as $i ){ foreach( $accessiblegroups as $i ){
// Do some more work here soon // Do some more work here soon
$groups[] = array( "name" => $i ); $groups[] = array( "name" => $i );
} }
$quotaPreset=OC_Appconfig::getValue('files','quota_preset','default,none,1 GB, 5 GB, 10 GB'); $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
$quotaPreset=explode(',',$quotaPreset); $quotaPreset=explode(',',$quotaPreset);
foreach($quotaPreset as &$preset){ foreach($quotaPreset as &$preset){
$preset=trim($preset); $preset=trim($preset);
} }
$defaultQuota=OC_Appconfig::getValue('files','default_quota','none'); $defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
$tmpl = new OC_Template( "settings", "users", "user" ); $tmpl = new OC_Template( "settings", "users", "user" );
$tmpl->assign( "users", $users ); $tmpl->assign( "users", $users );