From e87387c956b8009a215bd068b7518829ee28f100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 4 Sep 2012 12:19:01 +0300 Subject: Update settings/users.php respect coding style --- settings/users.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'settings/users.php') diff --git a/settings/users.php b/settings/users.php index b04f0c99e8f..f176977ade1 100644 --- a/settings/users.php +++ b/settings/users.php @@ -5,7 +5,7 @@ * See the COPYING-README file. */ -require_once('../lib/base.php'); +require_once '../lib/base.php'; OC_Util::checkSubAdminUser(); // We have some javascript foo! @@ -18,8 +18,8 @@ OC_App::setActiveNavigationEntry( 'core_users' ); $users = array(); $groups = array(); -$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false; -if($isadmin){ +$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false; +if($isadmin) { $accessiblegroups = OC_Group::getGroups(); $accessibleusers = OC_User::getUsers('', 30); $subadmins = OC_SubAdmin::getAllSubAdmins(); @@ -30,20 +30,24 @@ if($isadmin){ } 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 ){ // Do some more work here soon $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); foreach($quotaPreset as &$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->assign( "users", $users ); -- cgit v1.2.3