A bit of ongoing cleanup after roles revamp.

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

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 583049bd75d3270d3cad4a4595f14dd9950e048a..848c9539563a7b14f4c9e3cdf5b781751d00b008 100644 (file)
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -31,21 +31,6 @@ import('ttTeamHelper');
 // Class ttUserHelper contains helper functions for operations with users.
 class ttUserHelper {
 
 // Class ttUserHelper contains helper functions for operations with users.
 class ttUserHelper {
 

-  // The getUserDetails function returns user details.
-  static function getUserDetails($user_id) {
-    global $user;
-    $mdb2 = getConnection();
-
-    $sql =  "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.team_id = $user->team_id and u.status is not null";
-    $res = $mdb2->query($sql);
-
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val;
-    }
-    return false;
-  }
-

   // The getUserName function returns user name.
   static function getUserName($user_id) {
     $mdb2 = getConnection();
   // The getUserName function returns user name.
   static function getUserName($user_id) {
     $mdb2 = getConnection();


@@ -116,7 +101,7 @@ class ttUserHelper {
     if($hash)
       $password = 'md5('.$password.')';
     $email = isset($fields['email']) ? $fields['email'] : '';
     if($hash)
       $password = 'md5('.$password.')';
     $email = isset($fields['email']) ? $fields['email'] : '';

-    $team_id = (int) $fields['team_id'];
+    $group_id = (int) $fields['group_id'];

     $rate = str_replace(',', '.', isset($fields['rate']) ? $fields['rate'] : 0);
     if($rate == '')
       $rate = 0;
     $rate = str_replace(',', '.', isset($fields['rate']) ? $fields['rate'] : 0);
     if($rate == '')
       $rate = 0;


@@ -127,9 +112,9 @@ class ttUserHelper {
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by_v = ', '.$mdb2->quote($user->id);
 
     $created_ip_v = ', '.$mdb2->quote($_SERVER['REMOTE_ADDR']);
     $created_by_v = ', '.$mdb2->quote($user->id);
 

-    $sql = "insert into tt_users (name, login, password, team_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".
+    $sql = "insert into tt_users (name, login, password, group_id, role_id, client_id, rate, email, created, created_ip, created_by $status_f) values (".

       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).
       $mdb2->quote($fields['name']).", ".$mdb2->quote($fields['login']).

-      ", $password, $team_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";
+      ", $password, $group_id, ".$mdb2->quote($fields['role_id']).", ".$mdb2->quote($fields['client_id']).", $rate, ".$mdb2->quote($email).", now() $created_ip_v $created_by_v $status_v)";

     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.
     $affected = $mdb2->exec($sql);
 
     // Now deal with project assignment.


@@ -206,7 +191,7 @@ class ttUserHelper {
       // otherwise de-activate the bind (set its status to inactive). This will keep the bind
       // and its rate in database for reporting.
 
       // otherwise de-activate the bind (set its status to inactive). This will keep the bind
       // and its rate in database for reporting.
 

-      $all_projects = ttTeamHelper::getAllProjects($user->team_id);
+      $all_projects = ttTeamHelper::getAllProjects($user->group_id);

       $assigned_projects = isset($fields['projects']) ? $fields['projects'] : array();
 
       foreach($all_projects as $p) {
       $assigned_projects = isset($fields['projects']) ? $fields['projects'] : array();
 
       foreach($all_projects as $p) {


@@ -255,35 +240,16 @@ class ttUserHelper {
     $mdb2 = getConnection();
     global $user;
 
     $mdb2 = getConnection();
     global $user;
 

-    // Preliminary checks. Only managers, co-managers, and admin can do this.
-    if (!$user->canManageTeam() && !$user->isAdmin())
+    // Preliminary checks. Only managers and co-managers can do this.
+    if (!$user->canManageTeam())

       return false;
 
     // Tho logic is different depending on who is doing the operation.
       return false;
 
     // Tho logic is different depending on who is doing the operation.

-    // Co-manager and admin - mark user deleted.
-    // Manager - mark user deleted. If manager is the only account in team, mark team items deleted.
-
-    // admin part.
-    if ($user->isAdmin()) {
-      // Mark user binds as deleted.
-      $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark favorite reports as deleted.
-      $sql = "update tt_fav_reports set status = NULL where user_id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
-
-      // Mark user as deleted.
-      $sql = "update tt_users set status = NULL where id = $user_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error'))
-        return false;
+    // Co-manager - mark user deleted.
+    // Manager - mark user deleted. If manager is the only account in group, mark group items deleted.

 
 

-    } elseif ($user->isCoManager()) {
+    // Co-manager part.
+    if ($user->isCoManager()) {

       // Mark user binds as deleted.
       $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
       $affected = $mdb2->exec($sql);
       // Mark user binds as deleted.
       $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id";
       $affected = $mdb2->exec($sql);


@@ -297,13 +263,13 @@ class ttUserHelper {
         return false;
 
       // Mark user as deleted.
         return false;
 
       // Mark user as deleted.

-      $sql = "update tt_users set status = NULL where id = $user_id and team_id = ".$user->team_id;
+      $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$user->group_id;

       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
 
     } elseif ($user->isManager()) {
       $affected = $mdb2->exec($sql);
       if (is_a($affected, 'PEAR_Error'))
         return false;
 
     } elseif ($user->isManager()) {

-      $user_count = ttTeamHelper::getUserCount($user->team_id);
+      $user_count = ttTeamHelper::getUserCount($user->group_id);

 
       // Marking deleted a manager with active users is not allowed.
        if (($user_id == $user->id) && ($user_count > 1))
 
       // Marking deleted a manager with active users is not allowed.
        if (($user_id == $user->id) && ($user_count > 1))


@@ -311,29 +277,29 @@ class ttUserHelper {
 
       if (1 == $user_count) {
         // Mark tasks deleted.
 
       if (1 == $user_count) {
         // Mark tasks deleted.

-        if (!ttTeamHelper::markTasksDeleted($user->team_id))
+        if (!ttTeamHelper::markTasksDeleted($user->group_id))

           return false;
 
         // Mark projects deleted.
           return false;
 
         // Mark projects deleted.

-        $sql = "update tt_projects set status = NULL where team_id = $user->team_id";
+        $sql = "update tt_projects set status = NULL where group_id = $user->group_id";

         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
 
         // Mark clients deleted.
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
 
         // Mark clients deleted.

-        $sql = "update tt_clients set status = NULL where team_id = $user->team_id";
+        $sql = "update tt_clients set status = NULL where group_id = $user->group_id";

         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
 
         // Mark custom fields deleted.
         $affected = $mdb2->exec($sql);
         if (is_a($affected, 'PEAR_Error'))
           return false;
 
         // Mark custom fields deleted.

-        $sql = "update tt_custom_fields set status = NULL where team_id = $user->team_id";
+        $sql = "update tt_custom_fields set status = NULL where group_id = $user->group_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;
  

-        // Mark team deleted.
-        $sql = "update tt_teams set status = NULL where id = $user->team_id";
+        // Mark group deleted.
+        $sql = "update tt_groups set status = NULL where id = $user->group_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;


@@ -352,7 +318,7 @@ class ttUserHelper {
         return false;
 
       // Mark user as deleted.
         return false;
 
       // Mark user as deleted.

-      $sql = "update tt_users set status = NULL where id = $user_id and team_id = ".$user->team_id;
+      $sql = "update tt_users set status = NULL where id = $user_id and group_id = ".$user->group_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;