X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=users.php;h=35fd4168cda8f57789165263f5bb139082e0f807;hb=2ff04a2baeaa449ab30b822e2bb52ff792776753;hp=3fc266775d68ff0d7a487635ec221c26dc4a1620;hpb=fe40891a4ad16b5b70d518e8b5b2596267b684f9;p=timetracker.git

diff --git a/users.php b/users.php
index 3fc26677..35fd4168 100644
--- a/users.php
+++ b/users.php
@@ -33,7 +33,7 @@ import('ttTimeHelper');
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -41,12 +41,6 @@ if (!ttAccessCheck(right_data_entry)) {
 // Get users.
 $active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
 if($user->canManageTeam()) {
-
-  // If there are no roles in team, introduce default ones.
-  if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles(); // TODO: refactor or remove after roles revamp.
-  // This is here temporarily so that we have roles to work with to manage users.
-  // Normally, this should be done during an upgrade step (not yet implemented).
-
   $can_delete_manager = (1 == count($active_users));
   $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
 }
@@ -62,6 +56,6 @@ if ($user->uncompleted_indicators) {
 $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('title', $i18n->get('title.users'));
 $smarty->assign('content_page_name', 'users.tpl');
 $smarty->display('index.tpl');