X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_add.php;h=bd9f3e46f12074a87715cf826a6d148c3f06821d;hb=074e8daef75c2b729e75f350b52935a6b7ecfba8;hp=b44304be37aeada3398a0df24ea949c59faf012c;hpb=5402d18abe68d10b0b5f500fee4d9ca31d6a7ab0;p=timetracker.git

diff --git a/role_add.php b/role_add.php
index b44304be..bd9f3e46 100644
--- a/role_add.php
+++ b/role_add.php
@@ -32,7 +32,7 @@ import('ttTeamHelper');
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -46,8 +46,7 @@ if ($request->isPost()) {
 $form = new Form('roleForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
-for ($i = 0; $i < $user->role; $i++) {
-  $existing_role_name = null;
+for ($i = 0; $i < $user->rank; $i++) {
   $rank_data[] = $i;
 }
 $form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data));
@@ -59,7 +58,7 @@ if ($request->isPost()) {
   if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
 
   if ($err->no()) {
-    $existing_role = ttRoleHelper::getRoleByRank($cl_rank);
+    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->team_id);
     if (!$existing_role) {
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(
@@ -67,7 +66,7 @@ if ($request->isPost()) {
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,
-          'rights' => 'data_entry,view_own_data,manage_own_settings,view_users', // Default user rights.
+          'rights' => 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users', // Default user rights.
           'status' => ACTIVE))) {
           header('Location: roles.php');
           exit();