X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_edit.php;h=972d4540cb2e3e9d2f392a640e3d1a00663f664e;hb=9c1005341a3db52333fcb732960acbdf03fbe4e7;hp=94d47e609024ec15412d239c2199d25ed8eba124;hpb=9ad84bfb6ed27f1a98820b810c0d5fcf630eba79;p=timetracker.git

diff --git a/role_edit.php b/role_edit.php
index 94d47e60..972d4540 100644
--- a/role_edit.php
+++ b/role_edit.php
@@ -28,26 +28,33 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper'); // TODO: remove this?
-import('ttTaskHelper'); // TODO: remove this?
 import('ttRoleHelper');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// Access checks.
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
-
 $cl_role_id = (int)$request->getParameter('id');
+$role = ttRoleHelper::get($cl_role_id);
+if (!$role) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$assigned_rights = explode(',', $role['rights']);
+$available_rights = array_diff($user->rights, $assigned_rights);
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
+  $cl_rank = $request->getParameter('rank');
   $cl_status = $request->getParameter('status');
 } else {
-  $role = ttRoleHelper::get($cl_role_id);
   $cl_name = $role['name'];
   $cl_description = $role['description'];
+  $cl_rank = $role['rank'];
   $cl_status = $role['status'];
 }
 
@@ -55,34 +62,82 @@ $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->rank; $i++) {
+  $rank_data[] = $i;
+}
+$form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+// Multiple select controls for assigned and available rights.
+$form->addInput(array('type'=>'combobox','name'=>'assigned_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$assigned_rights));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));
+$form->addInput(array('type'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
 
 if ($request->isPost()) {
-  // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+    if ($request->getParameter('btn_save')) {
+    // Validate user input.
+    if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+    if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+    if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
 
-  if ($err->no()) {
-    $existing_role = ttRoleHelper::getRoleByName($cl_name);
-    if (!$existing_role || ($cl_role_id == $existing_role['id'])) {
-      // Update role information.
-      if (ttRoleHelper::update(array(
-        'id' => $cl_role_id,
-        'name' => $cl_name,
-        'description' => $cl_description,
-        'status' => $cl_status))) {
-        header('Location: roles.php');
-        exit();
+    if ($err->no()) {
+      $existing_role = ttRoleHelper::getRoleByName($cl_name);
+      if (!$existing_role || ($cl_role_id == $existing_role['id'])) {
+        // Update role information.
+        if (ttRoleHelper::update(array(
+          'id' => $cl_role_id,
+          'name' => $cl_name,
+          'rank' => $cl_rank,
+          'description' => $cl_description,
+          'status' => $cl_status))) {
+          header('Location: roles.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->getKey('error.db'));
-    } else
-      $err->add($i18n->getKey('error.object_exists'));
+        $err->add($i18n->get('error.object_exists'));
+    }
+  }
+  if ($request->getParameter('btn_delete') && $request->getParameter('assigned_rights')) {
+     $rights = $role['rights'];
+     $to_delete = $request->getParameter('assigned_rights');
+     foreach($to_delete as $index) {
+       $right_to_delete = $assigned_rights[$index];
+       $rights = str_replace($right_to_delete, '', $rights);
+       $rights = str_replace(',,',',', $rights);
+     }
+     $rights = trim($rights, ',');
+     if (ttRoleHelper::update(array('id' => $cl_role_id,'rights'=> $rights))) {
+       header('Location: role_edit.php?id='.$role['id']);
+       exit();
+     } else
+       $err->add($i18n->get('error.db'));
+  }
+  if ($request->getParameter('btn_add') && $request->getParameter('available_rights')) {
+     $rights = $role['rights'];
+     $to_add = $request->getParameter('available_rights');
+     foreach($to_add as $index) {
+       $right_to_add = $available_rights[$index];
+       // Just in case remove it.
+       $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))
+         $rights .= ','.$right_to_add;
+     }
+     $rights = trim($rights, ',');
+     if (ttRoleHelper::update(array('id' => $cl_role_id,'rights'=> $rights))) {
+       header('Location: role_edit.php?id='.$role['id']);
+       exit();
+     } else
+       $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_role'));
+$smarty->assign('title', $i18n->get('title.edit_role'));
 $smarty->assign('content_page_name', 'role_edit.tpl');
 $smarty->display('index.tpl');