Fixed time.php for subgroup support in high rank situations.

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 968a1f1..82a3195 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -479,19 +479,23 @@ class ttUser {
     return $groups;
   }
 
-  // getUser function is used to manage users in group and returns user details.
+  // getUserDetails function is used to manage users in group and returns user details.
   // At the moment, the function is used for user edits and deletes.
-  function getUser($user_id) {
+  function getUserDetails($user_id) {
     if (!$this->can('manage_users')) return false;
 
     $mdb2 = getConnection();
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
+    // Determine max rank. If we are searching in on behalf group
+    // then rank restriction does not apply.
+    $max_rank = $this->behalfGroup ? MAX_RANK : $this->rank;
+
     $sql =  "select u.id, u.name, u.login, u.role_id, u.client_id, u.status, u.rate, u.email from tt_users u".
       " left join tt_roles r on (u.role_id = r.id)".
       " where u.id = $user_id and u.group_id = $group_id and u.org_id = $org_id and u.status is not null".
-      " and (r.rank < $this->rank or (r.rank = $this->rank and u.id = $this->id))"; // Users with lesser roles or self.
+      " and (r.rank < $max_rank or (r.rank = $max_rank and u.id = $this->id))"; // Users with lesser roles or self.
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
@@ -608,7 +612,7 @@ class ttUser {
       return false;
 
     // Make sure we operate on a legit user.
-    $user_details = $this->getUser($user_id);
+    $user_details = $this->getUserDetails($user_id);
     if (!$user_details) return false;
 
     $mdb2 = getConnection();
@@ -671,14 +675,7 @@ class ttUser {
   function isUserValid($user_id) {
     if ($user_id == $this->id)
       return true;
-
-    $user_details = $this->getUser($user_id); // TODO: this will probably not work for higher ranks.
-                                              // In this case we'll need another function.
-                                              // Or adjust getUser for max rank.
-    if (!$user_details)
-      return false;
-
-    return true;
+    return ($this->getUserDetails($user_id) != null);
   }
 
   // isGroupValid determines if a group is valid for user.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6e62d6e..1f6329b 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.28.4529 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.28.4530 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/mobile/user_delete.php b/mobile/user_delete.php
index ac6c7c8..e44483e 100644 (file)
--- a/mobile/user_delete.php
+++ b/mobile/user_delete.php
@@ -36,7 +36,7 @@ if (!ttAccessAllowed('manage_users')) {
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();

diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index 46646bc..c9b4af8 100644 (file)
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -40,7 +40,7 @@ if (!ttAccessAllowed('manage_users')) {
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();

diff --git a/swap_roles.php b/swap_roles.php
index 0548501..1652ae2 100644 (file)
--- a/swap_roles.php
+++ b/swap_roles.php
@@ -42,7 +42,7 @@ if (!is_array($users_for_swap) || sizeof($users_for_swap) == 0) {
 }
 if ($request->isPost()) {
   $user_id = (int)$request->getParameter('swap_with');
-  $user_details = $user->getUser($user_id);
+  $user_details = $user->getUserDetails($user_id);
   if (!$user_details) {
     header('Location: access_denied.php');
     exit();

diff --git a/time.php b/time.php
index 33768d4..782c347 100644 (file)
--- a/time.php
+++ b/time.php
@@ -56,7 +56,7 @@ if ($request->isPost()) {
   }
   $userChanged = $request->getParameter('user_changed'); // Reused in multiple places below.
   if ($userChanged && !($user->can('track_time') && $user->isUserValid($request->getParameter('user')))) {
-    header('Location: access_denied.php'); // Group changed, but no rght or wrong group id.
+    header('Location: access_denied.php'); // Group changed, but no rght or wrong user id.
     exit();
   }
 }

diff --git a/user_delete.php b/user_delete.php
index 13b5ed0..38d4f54 100644 (file)
--- a/user_delete.php
+++ b/user_delete.php
@@ -36,7 +36,7 @@ if (!ttAccessAllowed('manage_users')) {
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();

diff --git a/user_edit.php b/user_edit.php
index c1c9e6c..8a4e421 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -41,7 +41,7 @@ if (!ttAccessAllowed('manage_users')) {
   exit();
 }
 $user_id = (int)$request->getParameter('id');
-$user_details = $user->getUser($user_id);
+$user_details = $user->getUserDetails($user_id);
 if (!$user_details) {
   header('Location: access_denied.php');
   exit();