A bit more progress on refactoring access checks.

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

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 9f3e0a902bb18724a90975d95ac0837b227071a9..5aeee2196347dd24be377948a595d846d022a0d0 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -85,7 +85,7 @@ class ttTeamHelper {
     while ($val = $res->fetchRow()) {
       // Localize top manager role name, as it is not localized in db.
       if ($val['rank'] == 512)
     while ($val = $res->fetchRow()) {
       // Localize top manager role name, as it is not localized in db.
       if ($val['rank'] == 512)

-        $val['role_name'] = $i18n->getKey('role.top_manager.label');
+        $val['role_name'] = $i18n->get('role.top_manager.label');

       $user_list[] = $val;
     }
 
       $user_list[] = $val;
     }
 


@@ -116,14 +116,16 @@ class ttTeamHelper {
     if (!$val['id'] || !$val['role_id'])
       return false;
 
     if (!$val['id'] || !$val['role_id'])
       return false;
 

+    $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id);
+

     // Promote user.
     // Promote user.

-    $sql = "update tt_users set role_id = $user->role_id where id = $user_id and team_id = $user->team_id";
+    $sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and team_id = $user->team_id";

     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Demote self.
     $role_id = $val['role_id'];
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     // Demote self.
     $role_id = $val['role_id'];

-    $sql = "update tt_users set role_id = $role_id where id = $user->id and team_id = $user->team_id";
+    $sql = "update tt_users set role_id = $role_id".$modified_part." where id = $user->id and team_id = $user->team_id";

     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 


@@ -141,7 +143,7 @@ class ttTeamHelper {
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {

-      $isClient = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have data entry right.
+      $isClient = in_array('track_own_time', explode(',', $val['rights'])) ? 0 : 1; // Clients do not have track_own_time right.

       if ($isClient)
         continue; // Skip adding clients.
       $user_list[] = $val;
       if ($isClient)
         continue; // Skip adding clients.
       $user_list[] = $val;