Improved getUserDetails to not return info for deleted users.

[timetracker.git] / user_edit.php

diff --git a/user_edit.php b/user_edit.php
index 75d89e5064d5d007e43bb32e2e9f91f6bd7f7119..5ceac373e91140f876568345a0f50b3db10e6c97 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -35,26 +35,23 @@ import('form.Table');
 import('form.TableColumn');
 import('ttRoleHelper');
 
 import('form.TableColumn');
 import('ttRoleHelper');
 

-// 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 editing from the request.
 $user_id = (int) $request->getParameter('id');
 // Get user details.
 $user_details = ttUserHelper::getUserDetails($user_id);
 // Get user id we are editing from the request.
 $user_id = (int) $request->getParameter('id');
 // Get user details.
 $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.

 
 if ($user->isPluginEnabled('cl'))
   $clients = ttTeamHelper::getActiveClients($user->team_id);
 
 if ($user->isPluginEnabled('cl'))
   $clients = ttTeamHelper::getActiveClients($user->team_id);