X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=users.php;h=47ec0145aea1204e7d697573f6e6bc3d49066ebb;hb=aeb30899d6ec142220d83b34fd8f6c68c05e8e90;hp=b7a6606ca5a61df2b808a6a88002ed00c604840a;hpb=de05f61301a897661c702f03c1b45dd3ab5c0e8a;p=timetracker.git diff --git a/users.php b/users.php index b7a6606c..47ec0145 100644 --- a/users.php +++ b/users.php @@ -36,8 +36,37 @@ if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) { header('Location: access_denied.php'); exit(); } +if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) { + header('Location: access_denied.php'); // Wrong group id in post. + exit(); +} +// Note: we don't use "manage_subgroups" in access check, because when user cannot +// "manage_users" or "view_users" they do not belong here. // End of access checks. +if ($request->isPost()) { + $group_id = $request->getParameter('group'); + $user->setOnBehalfGroup($group_id); +} else { + $group_id = $user->getGroup(); +} +$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators'); + +$form = new Form('usersForm'); +if ($user->can('manage_subgroups')) { + $groups = $user->getGroupsForDropdown(); + if (count($groups) > 1) { + $form->addInput(array('type'=>'combobox', + 'onchange'=>'this.form.submit();', + 'name'=>'group', + 'style'=>'width: 250px;', + 'value'=>$group_id, + 'data'=>$groups, + 'datakeys'=>array('id','name'))); + $smarty->assign('group_dropdown', 1); + } +} + // Prepare a list of active users. if ($user->can('view_users')) $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true); @@ -51,14 +80,15 @@ if($user->can('manage_users')) { $inactive_users = $user->getUsers($options); } -// Check if the group is set to show indicators for uncompleted time entries. -if ($user->uncompleted_indicators) { +if ($uncompleted_indicators) { // Check each active user if they have an uncompleted time entry. foreach ($active_users as $key => $user) { $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']); } + $smarty->assign('uncompleted_indicators', true); } +$smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('active_users', $active_users); $smarty->assign('inactive_users', $inactive_users); $smarty->assign('title', $i18n->get('title.users'));