Some cleanup and refactoring of role_id update.

[timetracker.git] / WEB-INF / lib / ttRoleHelper.class.php

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index bcd6605..329e0a8 100644 (file)
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -129,13 +129,13 @@ class ttRoleHelper {
   }
 
   // getRoleByRank looks up a role by its rank.
-  static function getRoleByRank($rank) {
+  static function getRoleByRank($rank, $team_id) {
     global $user;
     $mdb2 = getConnection();
 
     $rank = (int) $rank; // Cast to int just in case for better security.
 
-    $sql = "select id from tt_roles where team_id = $user->team_id and rank = $rank and (status = 1 or status = 0)";
+    $sql = "select id from tt_roles where team_id = $team_id and rank = $rank and (status = 1 or status = 0)";
     $res = $mdb2->query($sql);
 
     if (!is_a($res, 'PEAR_Error')) {
@@ -195,22 +195,6 @@ class ttRoleHelper {
     return true;
   }
 
-  // rolesExist - checks whether roles for team already exist.
-  static function rolesExist()
-  {
-    $mdb2 = getConnection();
-    global $user;
-
-    $sql = "select count(*) as count from tt_roles where team_id = $user->team_id";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      if ($val['count'] > 0)
-        return true; // Roles for team exist.
-    }
-    return false;
-  }
-
   // createPredefinedRoles - creates a set of predefined roles for the team to use.
   static function createPredefinedRoles($team_id, $lang)
   {
@@ -223,7 +207,7 @@ class ttRoleHelper {
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';
 
@@ -281,7 +265,7 @@ class ttRoleHelper {
 
     $rights_client = 'view_own_reports,view_own_charts,view_own_invoices,manage_own_settings';
     $rights_user = 'track_own_time,track_own_expenses,view_own_reports,view_own_charts,manage_own_settings,view_users';
-    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,swap_roles,approve_timesheets';
+    $rights_supervisor = $rights_user.',track_time,track_expenses,view_reports,view_charts,override_punch_mode,override_date_lock,swap_roles,approve_timesheets';
     $rights_comanager = $rights_supervisor.',manage_users,manage_projects,manage_tasks,manage_custom_fields,manage_clients,manage_invoices';
     $rights_manager = $rights_comanager.',manage_features,manage_basic_settings,manage_advanced_settings,manage_roles,export_data,manage_subgroups';