X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=bbd188fcc9b8b629e27ed5bee65ccc74b5809c2e;hb=a83b2420a2de428f82c8cc64343bd1fdb8ff4a5e;hp=b30b9ccda5bcfb7b71ecb97ab36c373b18cdc023;hpb=1e8bced6189bad0604be29c28bdabaf8c3e7442b;p=timetracker.git

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index b30b9ccd..bbd188fc 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.