Improved getUserDetails to not return info for deleted users.

[timetracker.git] / user_delete.php

diff --git a/user_delete.php b/user_delete.php
index 97b255725298e6b8e65a7df26e31b21160cc923b..b8ec5e9add3fafd9d02eab22684bc414455d1711 100644 (file)
--- a/user_delete.php
+++ b/user_delete.php
@@ -30,35 +30,32 @@ require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
 
 import('form.Form');
 import('ttUserHelper');
 

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

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

-
-// Get user id we are deleting from the request.
+// Get user id we are deleting.

 // A cast to int is for safety against manipulation of request parameter (sql injection). 
 $user_id = (int) $request->getParameter('id');
 // We need user name and login to display.
 $user_details = ttUserHelper::getUserDetails($user_id);
 // A cast to int is for safety against manipulation of request parameter (sql injection). 
 $user_id = (int) $request->getParameter('id');
 // We need user name and login to display.
 $user_details = ttUserHelper::getUserDetails($user_id);

-
-// Security checks.

 if (!$user_details || // No details.
 if (!$user_details || // No details.

-     $user_details['team_id'] <> $user->team_id || // User not in team.

      $user_details['rank'] > $user->rank || // User has a bigger rank.
      ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
    ) {
   header('Location: access_denied.php');
   exit();
 }
      $user_details['rank'] > $user->rank || // User has a bigger rank.
      ($user_details['rank'] == $user->rank && $user_details['id'] <> $user->id) // Same rank but not us.
    ) {
   header('Location: access_denied.php');
   exit();
 }

+// End of access checks.

 
 $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));
 
 $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')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));

 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {


@@ -81,7 +78,7 @@ if ($request->isPost()) {
       }
       exit();
     } else {
       }
       exit();
     } else {

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

     }
   }
   if ($request->getParameter('btn_cancel')) {
     }
   }
   if ($request->getParameter('btn_cancel')) {


@@ -91,6 +88,6 @@ if ($request->isPost()) {
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-$smarty->assign('title', $i18n->getKey('title.delete_user'));
+$smarty->assign('title', $i18n->get('title.delete_user'));

 $smarty->assign('content_page_name', 'user_delete.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('content_page_name', 'user_delete.tpl');
 $smarty->display('index.tpl');