X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_edit.php;h=25970bddfccd0aa78ec319e9e464523017fa3e36;hb=6c7a98f61e74aeae700b523729abb49ff19d3704;hp=b665e6dcb0ce5701758db83ccaf5fd098eadf187;hpb=5402d18abe68d10b0b5f500fee4d9ca31d6a7ab0;p=timetracker.git

diff --git a/role_edit.php b/role_edit.php
index b665e6dc..25970bdd 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -33,7 +33,7 @@ import('ttTaskHelper'); // TODO: remove this?
 import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -44,7 +44,7 @@ if (!$role) {
   exit();
 }
 $assigned_rights = explode(',', $role['rights']);
-$available_rights = array_diff($user->rights_array, $assigned_rights);
+$available_rights = array_diff($user->rights, $assigned_rights);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -62,8 +62,7 @@ $form = new Form('roleForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
 $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,'value'=>$cl_rank));
@@ -124,7 +123,7 @@ if ($request->isPost()) {
        $rights = str_replace($right_to_add, '', $rights);
        $rights = str_replace(',,',',', $rights);
        // Add the right only if we have it ourselves.
-       if (in_array($right_to_add, $user->rights_array))
+       if (in_array($right_to_add, $user->rights))
          $rights .= ','.$right_to_add;
      }
      $rights = trim($rights, ',');