Another fix for negative hours.

[timetracker.git] / role_edit.php

diff --git a/role_edit.php b/role_edit.php
index 25970bddfccd0aa78ec319e9e464523017fa3e36..972d4540cb2e3e9d2f392a640e3d1a00663f664e 100644 (file)
--- a/role_edit.php
+++ b/role_edit.php
@@ -28,11 +28,9 @@
 
 require_once('initialize.php');
 import('form.Form');
 
 require_once('initialize.php');
 import('form.Form');

-import('ttTeamHelper'); // TODO: remove this?
-import('ttTaskHelper'); // TODO: remove this?

 import('ttRoleHelper');
 
 import('ttRoleHelper');
 

-// Access check.
+// Access checks.

 if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();


@@ -43,6 +41,8 @@ if (!$role) {
   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }

+// End of access checks.
+

 $assigned_rights = explode(',', $role['rights']);
 $available_rights = array_diff($user->rights, $assigned_rights);
 
 $assigned_rights = explode(',', $role['rights']);
 $available_rights = array_diff($user->rights, $assigned_rights);
 


@@ -67,20 +67,21 @@ for ($i = 0; $i < $user->rank; $i++) {
 }
 $form->addInput(array('type'=>'combobox','name'=>'rank','data'=>$rank_data,'value'=>$cl_rank));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
 }
 $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));
 
 // 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->getKey('button.delete')));
+$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'=>'combobox','name'=>'available_rights','style'=>'width: 250px;','multiple'=>true,'data'=>$available_rights));

-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));

 
 if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
     // Validate user input.
 
 if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
     // 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 (!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 ($err->no()) {
       $existing_role = ttRoleHelper::getRoleByName($cl_name);


@@ -89,14 +90,15 @@ if ($request->isPost()) {
         if (ttRoleHelper::update(array(
           'id' => $cl_role_id,
           'name' => $cl_name,
         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
           'description' => $cl_description,
           'status' => $cl_status))) {
           header('Location: roles.php');
           exit();
         } else

-          $err->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));

       } else
       } else

-        $err->add($i18n->getKey('error.object_exists'));
+        $err->add($i18n->get('error.object_exists'));

     }
   }
   if ($request->getParameter('btn_delete') && $request->getParameter('assigned_rights')) {
     }
   }
   if ($request->getParameter('btn_delete') && $request->getParameter('assigned_rights')) {


@@ -112,7 +114,7 @@ if ($request->isPost()) {
        header('Location: role_edit.php?id='.$role['id']);
        exit();
      } else
        header('Location: role_edit.php?id='.$role['id']);
        exit();
      } else

-       $err->add($i18n->getKey('error.db'));
+       $err->add($i18n->get('error.db'));

   }
   if ($request->getParameter('btn_add') && $request->getParameter('available_rights')) {
      $rights = $role['rights'];
   }
   if ($request->getParameter('btn_add') && $request->getParameter('available_rights')) {
      $rights = $role['rights'];


@@ -131,11 +133,11 @@ if ($request->isPost()) {
        header('Location: role_edit.php?id='.$role['id']);
        exit();
      } else
        header('Location: role_edit.php?id='.$role['id']);
        exit();
      } else

-       $err->add($i18n->getKey('error.db'));
+       $err->add($i18n->get('error.db'));

   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
   }
 } // 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');
 $smarty->assign('content_page_name', 'role_edit.tpl');
 $smarty->display('index.tpl');