X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/1e8bced6189bad0604be29c28bdabaf8c3e7442b..5f8dbb1200edc65ce3aed3fb1bc2fde0a4d3a156:/WEB-INF/lib/ttTeamHelper.class.php

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b30b9ccd..60be9b53 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -142,7 +142,6 @@ class ttTeamHelper {
   // The getAllUsers obtains all users in a given team.
   static function getAllUsers($team_id, $all_fields = false) {
     $mdb2 = getConnection();
-
     if ($all_fields)
       $sql = "select * from tt_users where team_id = $team_id order by upper(name)";
     else
@@ -325,21 +324,26 @@ class ttTeamHelper {
     return $result;
   }
 
-  // getAllRoles - obtains all roles defined for team.
-  static function getAllRoles($team_id) {
+  // getInactiveRolesForUser - returns an array of relevant active roles for user with rank less than self.
+  // "Relevant" means that client roles are filtered out if Client plugin is disabled.
+  static function getInactiveRolesForUser()
+  {
+    global $user;
+    $result = array();
     $mdb2 = getConnection();
 
-    $result = array();
-    $sql = "select * from tt_roles where team_id = $team_id";
+    $sql = "select id, name, description, rank, rights from tt_roles where team_id = $user->team_id and rank < $user->rank and status = 0 order by rank";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
+        $val['is_client'] = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have data entry right.
+        if ($val['is_client'] && !$user->isPluginEnabled('cl'))
+          continue; // Skip adding a client role.
         $result[] = $val;
       }
-      return $result;
     }
-    return false;
+    return $result;
   }
 
   // The getActiveClients returns an array of active clients for team.
@@ -671,6 +675,11 @@ class ttTeamHelper {
 
     $mdb2 = getConnection();
 
+    // Mark roles deleted.
+    $sql = "update tt_roles set status = NULL where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
     // Mark projects deleted.
     $sql = "update tt_projects set status = NULL where team_id = $team_id";
     $affected = $mdb2->exec($sql);