X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=users.php;h=2fbcb5d20e61e779b5f7f7db52f7af3d7ad559dd;hb=HEAD;hp=cd60b893b4c3e76781d3facb6046926ba872516b;hpb=23ab58c659b527891568a385d8762bf3e6561adf;p=timetracker.git diff --git a/users.php b/users.php index cd60b893..2fbcb5d2 100644 --- a/users.php +++ b/users.php @@ -28,33 +28,42 @@ require_once('initialize.php'); import('form.Form'); -import('ttTeamHelper'); import('ttTimeHelper'); +import('ttRoleHelper'); -// Access check. -if (!ttAccessCheck(right_data_entry)) { +// Access checks. +if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) { header('Location: access_denied.php'); exit(); } +// End of access checks. -// Get users. -$active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true)); -if($user->canManageTeam()) { - $can_delete_manager = (1 == count($active_users)); - $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true); +// Prepare a list of active users. +$rank = $user->getMaxRankForGroup($user->getGroup()); +if ($user->can('view_users')) + $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true); +else /* if ($user->can('manage_users')) */ + $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true); +$active_users = $user->getUsers($options); + +// Prepare a list of inactive users. +if($user->can('manage_users')) { + $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true); + $inactive_users = $user->getUsers($options); } -// Check each active user if they have an uncompleted time entry. -foreach ($active_users as $key => $user) { - // Turn value from database into boolean. - $has_uncompleted_entry = (bool) ttTimeHelper::getUncompleted($user['id']); - // Add to current user in $active_users array. - $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry; +$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators'); +if ($uncompleted_indicators) { + // Check each active user if they have an uncompleted time entry. + foreach ($active_users as $key => $active_user) { + $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']); + } + $smarty->assign('uncompleted_indicators', true); } $smarty->assign('active_users', $active_users); $smarty->assign('inactive_users', $inactive_users); -$smarty->assign('can_delete_manager', $can_delete_manager); -$smarty->assign('title', $i18n->getKey('title.users')); +$smarty->assign('show_quota', $user->isPluginEnabled('mq')); +$smarty->assign('title', $i18n->get('title.users')); $smarty->assign('content_page_name', 'users.tpl'); $smarty->display('index.tpl');