Some cleanup and refactoring of role_id update.

[timetracker.git] / user_delete.php

diff --git a/user_delete.php b/user_delete.php
index aed2746..f30ec8a 100644 (file)
--- a/user_delete.php
+++ b/user_delete.php
@@ -31,7 +31,7 @@ import('form.Form');
 import('ttUserHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_users')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -50,20 +50,20 @@ if ($ok_to_go) $ok_to_go = $ok_to_go && ($user->team_id == $user_details['team_i
 if ($ok_to_go && $user->isCoManager() && (ROLE_COMANAGER == $user_details['role']))
   $ok_to_go = ($user->id == $user_details['id']); // Comanager is not allowed to delete other comanagers.
 if ($ok_to_go && $user->isCoManager() && (ROLE_MANAGER == $user_details['role']))
-  $ok_to_go = false; // Comanager is not allowed to delete a manager.  
+  $ok_to_go = false; // Comanager is not allowed to delete a manager.
 
 if (!$ok_to_go)
   die ($i18n->getKey('error.sys'));
 else
-  $smarty->assign('user_to_delete', $user_details['name']." (".$user_details['login'].")");    
+  $smarty->assign('user_to_delete', $user_details['name']." (".$user_details['login'].")");
 
 // Create confirmation form.
 $form = new Form('userDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
-       
-if ($request->getMethod() == 'POST') {
+
+if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
     if (ttUserHelper::markDeleted($user_id)) {
       // If we deleted the "on behalf" user reset its info in session.
@@ -73,28 +73,27 @@ if ($request->getMethod() == 'POST') {
       }
       // If we deleted our own account, do housekeeping and logout.
       if ($user->id == $user_id) {
-       // Remove tt_login cookie that stores login name.
-       unset($_COOKIE['tt_login']);
-       setcookie('tt_login', NULL, -1);
-               
+        // Remove tt_login cookie that stores login name.
+        unset($_COOKIE['tt_login']);
+        setcookie('tt_login', NULL, -1);
+
         $auth->doLogout();
         header('Location: login.php');
       } else {
-       header('Location: users.php');
+        header('Location: users.php');
       }
       exit();
     } else {
-      $errors->add($i18n->getKey('error.db'));
+      $err->add($i18n->getKey('error.db'));
     }
   }
   if ($request->getParameter('btn_cancel')) {
     header('Location: users.php');
     exit();
   }
-}
+} // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->getKey('title.delete_user'));
 $smarty->assign('content_page_name', 'user_delete.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file