Populating org_id in tt_cron table.

[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 e726b92fba6eb8c28d39100401cddb8883cd9045..b861e669e7d30c096726be9725add9cf85ccaf7f 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -28,35 +28,22 @@
 
 import('ttUserHelper');
 import('DateAndTime');
 
 import('ttUserHelper');
 import('DateAndTime');

+import('ttInvoiceHelper');

 
 

-// Class ttTeamHelper - contains helper functions that operate with teams.
+// Class ttTeamHelper - contains helper functions that operate with groups.

 class ttTeamHelper {
 
 class ttTeamHelper {
 

-  // The getUserCount function returns number of people in team.
-  static function getUserCount($team_id) {
-    $mdb2 = getConnection();
-
-    $sql = "select count(id) as cnt from tt_users where team_id = $team_id and status = 1";
-    $res = $mdb2->query($sql);
-
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val['cnt'];
-    }
-    return false;
-  }
-
-  // The getUsersForClient obtains all active and inactive users in a team that are relevant to a client.
+  // The getUsersForClient obtains all active and inactive users in a group that are relevant to a client.

   static function getUsersForClient() {
     global $user;
     $mdb2 = getConnection();
 
   static function getUsersForClient() {
     global $user;
     $mdb2 = getConnection();
 

-    $sql = "select u.id, u.name from tt_user_project_binds upb
-      inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)
-      inner join tt_users u on (u.id = upb.user_id)
-      where (u.status = 1 or u.status = 0)
-      group by u.id
-      order by upper(u.name)";
+    $sql = "select u.id, u.name from tt_user_project_binds upb".
+      " inner join tt_client_project_binds cpb on (upb.project_id = cpb.project_id and cpb.client_id = $user->client_id)".
+      " inner join tt_users u on (u.id = upb.user_id)".
+      " where (u.status = 1 or u.status = 0)".
+      " group by u.id".
+      " order by upper(u.name)";

     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))


@@ -67,20 +54,24 @@ class ttTeamHelper {
     return $user_list;
   }
 
     return $user_list;
   }
 

-  // The getActiveUsers obtains all active users in a given team.
+  // The getActiveUsers obtains all active users in a given group.

   static function getActiveUsers($options = null) {
     global $user;
   static function getActiveUsers($options = null) {
     global $user;

+    global $i18n;

     $mdb2 = getConnection();
 
     if (isset($options['getAllFields']))
     $mdb2 = getConnection();
 
     if (isset($options['getAllFields']))

-      $sql = "select * from tt_users where team_id = $user->team_id and status = 1 order by upper(name)";
+      $sql = "select u.*, r.name as role_name, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id and u.status = 1 order by upper(u.name)";

     else
     else

-      $sql = "select id, name from tt_users where team_id = $user->team_id and status = 1 order by upper(name)";
+      $sql = "select id, name from tt_users where group_id = $user->group_id and status = 1 order by upper(name)";

     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {

+      // Localize top manager role name, as it is not localized in db.
+      if ($val['rank'] == 512)
+        $val['role_name'] = $i18n->get('role.top_manager.label');

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


@@ -98,31 +89,79 @@ class ttTeamHelper {
     return $user_list;
   }
 
     return $user_list;
   }
 

-  // The getUsers obtains all active and inactive (but not deleted) users in a given team.
-  static function getUsers() {
+  // The swapRolesWith swaps existing user role with that of another user.
+  static function swapRolesWith($user_id) {
+    global $user;
+    $mdb2 = getConnection();
+
+    // Obtain role id for the user we are swapping ourselves with.
+    $sql = "select u.id, u.role_id from tt_users u left join tt_roles r on (u.role_id = r.id) where u.id = $user_id and u.group_id = $user->group_id and u.status = 1 and r.rank < $user->rank";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    $val = $res->fetchRow();
+    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.
+    $sql = "update tt_users set role_id = $user->role_id".$modified_part." where id = $user_id and group_id = $user->group_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".$modified_part." where id = $user->id and group_id = $user->group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    return true;
+  }
+
+  // The getUsersForSwap obtains all users a current user can swap roles with.
+  static function getUsersForSwap() {

     global $user;
     $mdb2 = getConnection();
 
     global $user;
     $mdb2 = getConnection();
 

-    $sql = "select id, name from tt_users where team_id = $user->team_id and (status = 1 or status = 0) order by upper(name)";
+    $sql = "select u.id, u.name, r.rank, r.rights from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id and u.status = 1 and r.rank < $user->rank order by upper(u.name)";

     $res = $mdb2->query($sql);
     $user_list = array();
     if (is_a($res, 'PEAR_Error'))
       return false;
     while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     $user_list = array();
     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 track_own_time right.
+      if ($isClient)
+        continue; // Skip adding clients.

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

-  // The getInactiveUsers obtains all inactive users in a given team.
-  static function getInactiveUsers($team_id, $all_fields = false) {
+  // The getUsers obtains all active and inactive (but not deleted) users in a group.
+  static function getUsers() {
+    global $user;
+    $mdb2 = getConnection();
+    $sql = "select id, name from tt_users where group_id = $user->group_id and (status = 1 or status = 0) order by upper(name)";
+    $res = $mdb2->query($sql);
+    $user_list = array();
+    if (is_a($res, 'PEAR_Error'))
+      return false;
+    while ($val = $res->fetchRow()) {
+      $user_list[] = $val;
+    }
+    return $user_list;
+  }
+
+  // The getInactiveUsers obtains all inactive users in a group.
+  static function getInactiveUsers($group_id, $all_fields = false) {

     $mdb2 = getConnection();
 
     if ($all_fields)
     $mdb2 = getConnection();
 
     if ($all_fields)

-      $sql = "select * from tt_users where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select u.*, r.name as role_name from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $group_id and u.status = 0 order by upper(u.name)";

     else
     else

-      $sql = "select id, name from tt_users where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select id, name from tt_users where group_id = $group_id and status = 0 order by upper(name)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -134,14 +173,50 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The getAllUsers obtains all users in a given team.
-  static function getAllUsers($team_id, $all_fields = false) {
+  // getActiveProjects - returns an array of active projects for a group.
+  static function getActiveProjects($group_id)
+  {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select id, name, description, tasks from tt_projects
+      where group_id = $group_id and status = 1 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // getInactiveProjects - returns an array of inactive projects for a group.
+  static function getInactiveProjects($group_id)
+  {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select id, name, description, tasks from tt_projects
+      where group_id = $group_id and status = 0 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // The getAllProjects obtains all projects in a group.
+  static function getAllProjects($group_id, $all_fields = false) {

     $mdb2 = getConnection();
 
     if ($all_fields)
     $mdb2 = getConnection();
 
     if ($all_fields)

-      $sql = "select * from tt_users where team_id = $team_id order by upper(name)";
+      $sql = "select * from tt_projects where group_id = $group_id order by status, upper(name)";

     else
     else

-      $sql = "select id, name from tt_users where team_id = $team_id order by upper(name)";
+      $sql = "select id, name from tt_projects where group_id = $group_id order by status, upper(name)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -153,14 +228,13 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getActiveProjects - returns an array of active projects for team.
-  static function getActiveProjects($team_id)
+  // getActiveTasks - returns an array of active tasks for a group.
+  static function getActiveTasks($group_id)

   {
     $result = array();
     $mdb2 = getConnection();
 
   {
     $result = array();
     $mdb2 = getConnection();
 

-    $sql = "select id, name, description, tasks from tt_projects
-      where team_id = $team_id and status = 1 order by upper(name)";
+    $sql = "select id, name, description from tt_tasks where group_id = $group_id and status = 1 order by upper(name)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -171,14 +245,14 @@ class ttTeamHelper {
     return $result;
   }
 
     return $result;
   }
 

-  // getInactiveProjects - returns an array of inactive projects for team.
-  static function getInactiveProjects($team_id)
+  // getInactiveTasks - returns an array of inactive tasks for a group.
+  static function getInactiveTasks($group_id)

   {
     $result = array();
     $mdb2 = getConnection();
 
   {
     $result = array();
     $mdb2 = getConnection();
 

-    $sql = "select id, name, description, tasks from tt_projects
-      where team_id = $team_id and status = 0 order by upper(name)";
+    $sql = "select id, name, description from tt_tasks
+      where group_id = $group_id and status = 0 order by upper(name)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -189,14 +263,14 @@ class ttTeamHelper {
     return $result;
   }
 
     return $result;
   }
 

-  // The getAllProjects obtains all projects in a given team.
-  static function getAllProjects($team_id, $all_fields = false) {
+  // The getAllTasks obtains all tasks in a group.
+  static function getAllTasks($group_id, $all_fields = false) {

     $mdb2 = getConnection();
 
     if ($all_fields)
     $mdb2 = getConnection();
 
     if ($all_fields)

-      $sql = "select * from tt_projects where team_id = $team_id order by status, upper(name)";
+      $sql = "select * from tt_tasks where group_id = $group_id order by status, upper(name)";

     else
     else

-      $sql = "select id, name from tt_projects where team_id = $team_id order by status, upper(name)";
+      $sql = "select id, name from tt_tasks where group_id = $group_id order by status, upper(name)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -208,70 +282,96 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getActiveTasks - returns an array of active tasks for team.
-  static function getActiveTasks($team_id)
+  // getActiveRolesForUser - 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 getActiveRolesForUser()

   {
   {

+    global $user;

     $result = array();
     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 

-    $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by upper(name)";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and org_id = $user->org_id and rank < $user->rank and status = 1 order by rank";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $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;
   }
 
         $result[] = $val;
       }
     }
     return $result;
   }
 

-  // getInactiveTasks - returns an array of inactive tasks for team.
-  static function getInactiveTasks($team_id)
+  // getActiveRoles - returns an array of active roles for a group.
+  static function getActiveRoles($group_id)

   {
     $result = array();
     $mdb2 = getConnection();
 
   {
     $result = array();
     $mdb2 = getConnection();
 

-    $sql = "select id, name, description from tt_tasks
-      where team_id = $team_id and status = 0 order by upper(name)";
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $group_id and status = 1 order by rank";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $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 track_own_time right.

         $result[] = $val;
       }
     }
     return $result;
   }
 
         $result[] = $val;
       }
     }
     return $result;
   }
 

-  // The getAllTasks obtains all tasks in a given team.
-  static function getAllTasks($team_id, $all_fields = false) {
+  // getInactiveRoles - returns an array of inactive roles for a group.
+  static function getInactiveRoles($group_id)
+  {
+    $result = array();

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

-    if ($all_fields)
-      $sql = "select * from tt_tasks where team_id = $team_id order by status, upper(name)";
-    else
-      $sql = "select id, name from tt_tasks where team_id = $team_id order by status, upper(name)";
+    $sql = "select id, name, rank, description from tt_roles
+      where group_id = $group_id and status = 0 order by rank";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
         $result[] = $val;
       }
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
         $result[] = $val;
       }

-      return $result;

     }
     }

-    return false;
+    return $result;
+  }
+
+  // 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();
+
+    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and org_id = $user->org_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;

   }
 
   }
 

-  // The getActiveClients returns an array of active clients for team.
-  static function getActiveClients($team_id, $all_fields = false)
+  // The getActiveClients returns an array of active clients for a group.
+  static function getActiveClients($group_id, $all_fields = false)

   {
     $result = array();
     $mdb2 = getConnection();
 
     if ($all_fields)
   {
     $result = array();
     $mdb2 = getConnection();
 
     if ($all_fields)

-      $sql = "select * from tt_clients where team_id = $team_id and status = 1 order by upper(name)";
+      $sql = "select * from tt_clients where group_id = $group_id and status = 1 order by upper(name)";

     else
     else

-      $sql = "select id, name from tt_clients where team_id = $team_id and status = 1 order by upper(name)";
+      $sql = "select id, name from tt_clients where group_id = $group_id and status = 1 order by upper(name)";

 
     $res = $mdb2->query($sql);
     $result = array();
 
     $res = $mdb2->query($sql);
     $result = array();


@@ -283,16 +383,16 @@ class ttTeamHelper {
     return $result;
   }
 
     return $result;
   }
 

-  // The getInactiveClients returns an array of inactive clients for team.
-  static function getInactiveClients($team_id, $all_fields = false)
+  // The getInactiveClients returns an array of inactive clients for a group.
+  static function getInactiveClients($group_id, $all_fields = false)

   {
     $result = array();
     $mdb2 = getConnection();
 
     if ($all_fields)
   {
     $result = array();
     $mdb2 = getConnection();
 
     if ($all_fields)

-      $sql = "select * from tt_clients where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select * from tt_clients where group_id = $group_id and status = 0 order by upper(name)";

     else
     else

-      $sql = "select id, name from tt_clients where team_id = $team_id and status = 0 order by upper(name)";
+      $sql = "select id, name from tt_clients where group_id = $group_id and status = 0 order by upper(name)";

 
     $res = $mdb2->query($sql);
     $result = array();
 
     $res = $mdb2->query($sql);
     $result = array();


@@ -304,14 +404,14 @@ class ttTeamHelper {
     return $result;
   }
 
     return $result;
   }
 

-  // The getAllClients obtains all clients in a given team.
-  static function getAllClients($team_id, $all_fields = false) {
+  // The getAllClients obtains all clients in a group.
+  static function getAllClients($group_id, $all_fields = false) {

     $mdb2 = getConnection();
 
     if ($all_fields)
     $mdb2 = getConnection();
 
     if ($all_fields)

-      $sql = "select * from tt_clients where team_id = $team_id order by status, upper(name)";
+      $sql = "select * from tt_clients where group_id = $group_id order by status, upper(name)";

     else
     else

-      $sql = "select id, name from tt_clients where team_id = $team_id order by status, upper(name)";
+      $sql = "select id, name from tt_clients where group_id = $group_id order by status, upper(name)";

 
     $res = $mdb2->query($sql);
     $result = array();
 
     $res = $mdb2->query($sql);
     $result = array();


@@ -324,20 +424,21 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The getActiveInvoices returns an array of active invoices for team.
+  // The getActiveInvoices returns an array of active invoices for a group.

   static function getActiveInvoices($localizeDates = true)
   {
     global $user;
   static function getActiveInvoices($localizeDates = true)
   {
     global $user;

+    $addPaidStatus = $user->isPluginEnabled('ps');

 
     $result = array();
     $mdb2 = getConnection();
 
 
     $result = array();
     $mdb2 = getConnection();
 

-    if (ROLE_CLIENT == $user->role && $user->client_id)
+    if ($user->isClient())

       $client_part = " and i.client_id = $user->client_id";
 
     $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i
       left join tt_clients c on (c.id = i.client_id)
       $client_part = " and i.client_id = $user->client_id";
 
     $sql = "select i.id, i.name, i.date, i.client_id, i.status, c.name as client_name from tt_invoices i
       left join tt_clients c on (c.id = i.client_id)

-      where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name";
+      where i.status = 1 and i.group_id = $user->group_id $client_part order by i.name";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -347,13 +448,15 @@ class ttTeamHelper {
           $dt->parseVal($val['date']);
           $val['date'] = $dt->toString($user->date_format);
         }
           $dt->parseVal($val['date']);
           $val['date'] = $dt->toString($user->date_format);
         }

+        if ($addPaidStatus)
+          $val['paid'] = ttInvoiceHelper::isPaid($val['id']);

         $result[] = $val;
       }
     }
     return $result;
   }
 
         $result[] = $val;
       }
     }
     return $result;
   }
 

-  // The getAllInvoices returns an array of all invoices for team.
+  // The getAllInvoices returns an array of all invoices for a group.

   static function getAllInvoices()
   {
     global $user;
   static function getAllInvoices()
   {
     global $user;


@@ -361,7 +464,7 @@ class ttTeamHelper {
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 

-    $sql = "select * from tt_invoices where team_id = $user->team_id";
+    $sql = "select * from tt_invoices where group_id = $user->group_id";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -374,7 +477,7 @@ class ttTeamHelper {
   }
 
   // The getRecentInvoices returns an array of recent invoices (max 3) for a client.
   }
 
   // The getRecentInvoices returns an array of recent invoices (max 3) for a client.

-  static function getRecentInvoices($team_id, $client_id)
+  static function getRecentInvoices($group_id, $client_id)

   {
     global $user;
 
   {
     global $user;
 


@@ -383,7 +486,7 @@ class ttTeamHelper {
 
     $sql = "select i.id, i.name from tt_invoices i
       left join tt_clients c on (c.id = i.client_id)
 
     $sql = "select i.id, i.name from tt_invoices i
       left join tt_clients c on (c.id = i.client_id)

-      where i.team_id = $team_id and i.status = 1 and c.id = $client_id
+      where i.group_id = $group_id and i.status = 1 and c.id = $client_id

       order by i.id desc limit 3";
     $res = $mdb2->query($sql);
     $result = array();
       order by i.id desc limit 3";
     $res = $mdb2->query($sql);
     $result = array();


@@ -396,12 +499,12 @@ class ttTeamHelper {
     return $result;
   }
 
     return $result;
   }
 

-  // getUserToProjectBinds - obtains all user to project binds for a team.
-  static function getUserToProjectBinds($team_id) {
+  // getUserToProjectBinds - obtains all user to project binds for a group.
+  static function getUserToProjectBinds($group_id) {

     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where team_id = $team_id) order by user_id, status, project_id";
+    $sql = "select * from tt_user_project_binds where user_id in (select id from tt_users where group_id = $group_id) order by user_id, status, project_id";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -413,11 +516,11 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The getAllCustomFields obtains all custom fields in a given team.
-  static function getAllCustomFields($team_id) {
+  // The getAllCustomFields obtains all custom fields in a group.
+  static function getAllCustomFields($group_id) {

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

-    $sql = "select * from tt_custom_fields where team_id = $team_id order by status";
+    $sql = "select * from tt_custom_fields where group_id = $group_id order by status";

 
     $res = $mdb2->query($sql);
     $result = array();
 
     $res = $mdb2->query($sql);
     $result = array();


@@ -430,11 +533,11 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The getAllCustomFieldOptions obtains all custom field options in a given team.
-  static function getAllCustomFieldOptions($team_id) {
+  // The getAllCustomFieldOptions obtains all custom field options in a group.
+  static function getAllCustomFieldOptions($group_id) {

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

-    $sql = "select * from tt_custom_field_options where field_id in (select id from tt_custom_fields where team_id = $team_id) order by id";
+    $sql = "select * from tt_custom_field_options where field_id in (select id from tt_custom_fields where group_id = $group_id) order by id";

 
     $res = $mdb2->query($sql);
     $result = array();
 
     $res = $mdb2->query($sql);
     $result = array();


@@ -447,11 +550,11 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The getCustomFieldLog obtains all custom field log entries for a given team.
-  static function getCustomFieldLog($team_id) {
+  // The getCustomFieldLog obtains all custom field log entries for a group.
+  static function getCustomFieldLog($group_id) {

     $mdb2 = getConnection();
 
     $mdb2 = getConnection();
 

-    $sql = "select * from tt_custom_field_log where field_id in (select id from tt_custom_fields where team_id = $team_id) order by id";
+    $sql = "select * from tt_custom_field_log where field_id in (select id from tt_custom_fields where group_id = $group_id) order by id";

 
     $res = $mdb2->query($sql);
     $result = array();
 
     $res = $mdb2->query($sql);
     $result = array();


@@ -464,12 +567,12 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getFavReports - obtains all favorite reports for all users in team.
-  static function getFavReports($team_id) {
+  // getFavReports - obtains all favorite reports for all users in a group.
+  static function getFavReports($group_id) {

     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select * from tt_fav_reports where user_id in (select id from tt_users where team_id = $team_id)";
+    $sql = "select * from tt_fav_reports where user_id in (select id from tt_users where group_id = $group_id)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -481,12 +584,12 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getExpenseItems - obtains all expense items for all users in team.
-  static function getExpenseItems($team_id) {
+  // getExpenseItems - obtains all expense items for all users in a group.
+  static function getExpenseItems($group_id) {

     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select * from tt_expense_items where user_id in (select id from tt_users where team_id = $team_id)";
+    $sql = "select * from tt_expense_items where user_id in (select id from tt_users where group_id = $group_id)";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -498,16 +601,21 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getPredefinedExpenses - obtains predefined expenses for team.
-  static function getPredefinedExpenses($team_id) {
+  // getPredefinedExpenses - obtains predefined expenses for a group.
+  static function getPredefinedExpenses($group_id) {
+    global $user;
+    $replaceDecimalMark = ('.' != $user->decimal_mark);
+

     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select id, name, cost from tt_predefined_expenses where team_id = $team_id";
+    $sql = "select id, name, cost from tt_predefined_expenses where group_id = $group_id";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {

+        if ($replaceDecimalMark)
+          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);

         $result[] = $val;
       }
       return $result;
         $result[] = $val;
       }
       return $result;


@@ -515,14 +623,14 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getNotifications - obtains notification descriptions for team.
-  static function getNotifications($team_id) {
+  // getNotifications - obtains notification descriptions for a group.
+  static function getNotifications($group_id) {

     $mdb2 = getConnection();
 
     $result = array();
     $sql = "select c.id, c.cron_spec, c.email, c.report_condition, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)
     $mdb2 = getConnection();
 
     $result = array();
     $sql = "select c.id, c.cron_spec, c.email, c.report_condition, fr.name from tt_cron c
       left join tt_fav_reports fr on (fr.id = c.report_id)

-      where c.team_id = $team_id and c.status = 1 and fr.status = 1";
+      where c.group_id = $group_id and c.status = 1 and fr.status = 1";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -534,34 +642,16 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // getMonthlyQuotas - obtains monthly quotas for team.
-  static function getMonthlyQuotas($team_id) {
+  // getMonthlyQuotas - obtains monthly quotas for a group.
+  static function getMonthlyQuotas($group_id) {

     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select year, month, quota from tt_monthly_quotas where team_id = $team_id";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
-  // The getTeams function returns an array of all active teams on the server.
-  static function getTeams() {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $sql =  "select id, name, lang, timestamp from tt_teams where status = 1 order by id desc";
+    $sql = "select year, month, minutes from tt_monthly_quotas where group_id = $group_id";

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {

-       $val['date'] = substr($val['timestamp'], 0, 10); // Strip the time.

         $result[] = $val;
       }
       return $result;
         $result[] = $val;
       }
       return $result;


@@ -569,320 +659,12 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The markDeleted function marks the team and everything in it as deleted.
-  static function markDeleted($team_id) {
-
-    // Iterate through team users and mark them as deleted.
-    $users = ttTeamHelper::getAllUsers($team_id);
-    foreach ($users as $one_user) {
-      if (!ttUserHelper::markDeleted($one_user['id'])) return false;
-    }
-
-    // Mark tasks deleted.
-    if (!ttTeamHelper::markTasksDeleted($team_id)) return false;
-
-    $mdb2 = getConnection();
-
-    // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where team_id = $team_id";
-    $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 = $team_id";
-    $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 = $team_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark team deleted.
-    $sql = "update tt_teams set status = NULL where id = $team_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return true;
-  }
-
-  // The getTeamDetails function returns team details.
-  static function getTeamDetails($team_id) {
-    $result = array();
-    $mdb2 = getConnection();
-
-    $role_manager = ROLE_MANAGER;
-    $sql = "select t.name as team_name, u.id as manager_id, u.name as manager_name, u.login as manager_login, u.email as manager_email
-      from tt_teams t
-      inner join tt_users u on (u.team_id = t.id and u.role = $role_manager)
-      where t.id = $team_id";
-
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      $val = $res->fetchRow();
-      return $val;
-    }
-
-    return false;
-  }
-
-  // The insert function creates a new team.
-  static function insert($fields) {
-
-    $mdb2 = getConnection();
-
-    $lock_spec = $fields['lock_spec'];
-    if ($lock_spec !== null) {
-      $lockspec_f = ', lock_spec';
-      $lockspec_v = ', ' . $mdb2->quote($lock_spec);
-    } else {
-      $lockspec_f = '';
-      $lockspec_v = '';
-    }
-
-    $lang = $fields['lang'];
-    if (!$lang) {
-      global $i18n;
-      $lang = $i18n->lang;
-    }
-
-    $decimal_mark = $fields['decimal_mark'];
-    if ($decimal_mark !== null) {
-      $decimal_mark_f = ', decimal_mark';
-      $decimal_mark_v = ', ' . $mdb2->quote($decimal_mark);
-    } else {
-      $decimal_mark_f = '';
-      $decimal_mark_v = '';
-    }
-
-    $date_format = $fields['date_format'];
-    if ($date_format !== null) {
-      $date_format_f = ', date_format';
-      $date_format_v = ', ' . $mdb2->quote($date_format);
-    } elseif (defined('DATE_FORMAT_DEFAULT')) {
-      $date_format_f = ', date_format';
-      $date_format_v = ', ' . $mdb2->quote(DATE_FORMAT_DEFAULT);
-    } else {
-      $date_format_f = '';
-      $date_format_v = '';
-    }
-
-    $time_format = $fields['time_format'];
-    if ($time_format !== null) {
-      $time_format_f = ', time_format';
-      $time_format_v = ', ' . $mdb2->quote($time_format);
-    } elseif (defined('TIME_FORMAT_DEFAULT')) {
-      $time_format_f = ', time_format';
-      $time_format_v = ', ' . $mdb2->quote(TIME_FORMAT_DEFAULT);
-    } else {
-      $time_format_f = '';
-      $time_format_v = '';
-    }
-
-    $week_start = $fields['week_start'];
-    if ($week_start !== null) {
-      $week_start_f = ', week_start';
-      $week_start_v = ', ' . (int)$week_start;
-    } elseif (defined('WEEK_START_DEFAULT')) {
-      $week_start_f = ', week_start';
-      $week_start_v = ', ' . (int)WEEK_START_DEFAULT;
-    } else {
-      $week_start_f = '';
-      $week_start_v = '';
-    }
-
-    $plugins = $fields['plugins'];
-    if ($plugins !== null) {
-      $plugins_f = ', plugins';
-      $plugins_v = ', ' . $mdb2->quote($plugins);
-    } else {
-      $plugins_f = '';
-      $plugins_v = '';
-    }
-
-    $tracking_mode = $fields['tracking_mode'];
-    if ($tracking_mode !== null) {
-      $tracking_mode_f = ', tracking_mode';
-      $tracking_mode_v = ', ' . (int)$tracking_mode;
-    } else {
-      $tracking_mode_f = '';
-      $tracking_mode_v = '';
-    }
-
-    $task_required = $fields['task_required'];
-    if ($task_required !== null) {
-      $task_required_f = ', task_required';
-      $task_required_v = ', ' . (int)$task_required;
-    } else {
-      $task_required_f = '';
-      $task_required_v = '';
-    }
-
-    $record_type = $fields['record_type'];
-    if ($record_type !== null) {
-      $record_type_f = ', record_type';
-      $record_type_v = ', ' . (int)$record_type;
-    } else {
-      $record_type_f = '';
-      $record_type_v = '';
-    }
-
-    $uncompleted_indicators = $fields['uncompleted_indicators'];
-    if ($uncompleted_indicators !== null) {
-      $uncompleted_indicators_f = ', uncompleted_indicators';
-      $uncompleted_indicators_v = ', ' . (int)$uncompleted_indicators;
-    } else {
-      $uncompleted_indicators_f = '';
-      $uncompleted_indicators_v = '';
-    }
-
-    $workday_hours = $fields['workday_hours'];
-    if ($workday_hours !== null) {
-      $workday_hours_f = ', workday_hours';
-      $workday_hours_v = ', ' . (int)$workday_hours;
-    } else {
-      $workday_hours_f = '';
-      $workday_hours_v = '';
-    }
-
-    $sql = "insert into tt_teams (name, address, currency $lockspec_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $task_required_f $record_type_f $uncompleted_indicators_f $workday_hours_f)
-      values(".$mdb2->quote(trim($fields['name'])).
-      ", ".$mdb2->quote(trim($fields['address'])).
-      ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v, ".$mdb2->quote($lang).
-      "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $task_required_v $record_type_v $uncompleted_indicators_v $workday_hours_v)";
-    $affected = $mdb2->exec($sql);
-
-    if (!is_a($affected, 'PEAR_Error')) {
-      $team_id = $mdb2->lastInsertID('tt_teams', 'id');
-      return $team_id;
-    }
-
-    return false;
-  }
-
-  // The update function updates team information.
-  static function update($team_id, $fields)
-  {
-    $mdb2 = getConnection();
-    $name_part = 'name = '.$mdb2->quote($fields['name']);
-    $currency_part = '';
-    $addr_part = '';
-    $lang_part = '';
-    $decimal_mark_part = '';
-    $date_format_part = '';
-    $time_format_part = '';
-    $week_start_part = '';
-    $tracking_mode_part = '';
-    $task_required_part = ' , task_required = '.intval($fields['task_required']);
-    $record_type_part = '';
-    $uncompleted_indicators_part = '';
-    $bcc_email_part = '';
-    $plugins_part = '';
-    $lock_spec_part = '';
-    $workday_hours_part = '';
-
-    if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
-    if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
-    if (isset($fields['lang'])) $lang_part = ', lang = '.$mdb2->quote($fields['lang']);
-    if (isset($fields['decimal_mark'])) $decimal_mark_part = ', decimal_mark = '.$mdb2->quote($fields['decimal_mark']);
-    if (isset($fields['date_format'])) $date_format_part = ', date_format = '.$mdb2->quote($fields['date_format']);
-    if (isset($fields['time_format'])) $time_format_part = ', time_format = '.$mdb2->quote($fields['time_format']);
-    if (isset($fields['week_start'])) $week_start_part = ', week_start = '.intval($fields['week_start']);
-    if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.intval($fields['tracking_mode']);
-    if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
-    if (isset($fields['uncompleted_indicators'])) $uncompleted_indicators_part = ', uncompleted_indicators = '.intval($fields['uncompleted_indicators']);
-    if (!empty($fields['bcc_email'])) $bcc_email_part = ', bcc_email = '.$mdb2->quote($fields['bcc_email']);
-    if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
-    if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
-    if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);
-
-    $sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
-      $date_format_part $time_format_part $week_start_part $tracking_mode_part $task_required_part $record_type_part
-      $uncompleted_indicators_part $bcc_email_part $plugins_part $lock_spec_part $workday_hours_part where id = $team_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return true;
-  }
-
-  // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 50).
-  static function getInactiveTeams() {
-    $inactive_teams = array();
-    $mdb2 = getConnection();
-
-    // Get all team ids for teams created or modified more than 1 year ago.
-    // $ts = date('Y-m-d', strtotime('-1 year'));
-    $ts = date('Y-m-d', strtotime('-4 month'));
-    $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
-    $res = $mdb2->query($sql);
-
-    $count = 0;
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $team_id = $val['id'];
-        if (ttTeamHelper::isTeamActive($team_id) == false) {
-          $count++;
-          $inactive_teams[] = $team_id;
-          // Limit the array size for perfomance by allowing this operation on small chunks only.
-          if ($count >= 50) break;
-        }
-      }
-      return $inactive_teams;
-    }
-    return false;
-  }
-
-  // The isTeamActive determines if a team is using Time Tracker or abandoned it.
-  static function isTeamActive($team_id) {
-    $users = array();
-
-    $mdb2 = getConnection();
-    $sql = "select id from tt_users where team_id = $team_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) die($res->getMessage());
-    while ($val = $res->fetchRow()) {
-      $users[] = $val['id'];
-    }
-    $user_list = implode(',', $users); // This is a comma-separated list of user ids.
-    if (!$user_list)
-      return false; // No users in team.
-
-    $count = 0;
-    $ts = date('Y-m-d', strtotime('-2 years'));
-    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      if ($val = $res->fetchRow()) {
-        $count = $val['cnt'];
-      }
-    }
-
-    if ($count == 0)
-      return false;  // No time entries for the last 2 years.
-
-    if ($count <= 5) {
-      // We will consider a team inactive if it has 5 or less time entries made more than 1 year ago.
-      $count_last_year = 0;
-      $ts = date('Y-m-d', strtotime('-1 year'));
-      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and timestamp > '$ts'";
-      $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        if ($val = $res->fetchRow()) {
-          $count_last_year = $val['cnt'];
-        }
-        if ($count_last_year == 0)
-          return false;  // No time entries for the last year and only a few entries before that.
-      }
-    }
-    return true;
-  }
-
-  // The delete function permanently deletes all data for a team.
-  static function delete($team_id) {
+  // The delete function permanently deletes all data for a group.
+  static function delete($group_id) {

     $mdb2 = getConnection();
 
     // Delete users.
     $mdb2 = getConnection();
 
     // Delete users.

-    $sql = "select id from tt_users where team_id = $team_id";
+    $sql = "select id from tt_users where group_id = $group_id";

     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
     while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
     while ($val = $res->fetchRow()) {


@@ -891,67 +673,63 @@ class ttTeamHelper {
     }
 
     // Delete tasks.
     }
 
     // Delete tasks.

-    if (!ttTeamHelper::deleteTasks($team_id)) return false;
+    if (!ttTeamHelper::deleteTasks($group_id)) return false;

 
     // Delete client to project binds.
 
     // Delete client to project binds.

-    $sql = "delete from tt_client_project_binds where client_id in (select id from tt_clients where team_id = $team_id)";
+    $sql = "delete from tt_client_project_binds where client_id in (select id from tt_clients where group_id = $group_id)";

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

-    $sql = "delete from tt_projects where team_id = $team_id";
+    $sql = "delete from tt_projects where group_id = $group_id";

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

-    $sql = "delete from tt_clients where team_id = $team_id";
+    $sql = "delete from tt_clients where group_id = $group_id";

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

-    $sql = "delete from tt_invoices where team_id = $team_id";
+    $sql = "delete from tt_invoices where group_id = $group_id";

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

-    if (!ttTeamHelper::deleteCustomFields($team_id)) return false;
+    if (!ttTeamHelper::deleteCustomFields($group_id)) return false;

 
 

-    // Delete team.
-    $sql = "delete from tt_teams where id = $team_id";
+    // Delete roles.
+    $sql = "delete from tt_roles where group_id = $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;
 

-    return true;
-  }
-
-  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a team.
-  static function markTasksDeleted($team_id) {
-    $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where team_id = $team_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error')) return false;
+    // Delete cron entries.
+    $sql = "delete from tt_cron where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;

 
 

-    while ($val = $res->fetchRow()) {
+    // Delete predefined expenses.
+    $sql = "delete from tt_predefined_expenses where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;

 
 

-      // Delete task binds.
-      $task_id = $val['id'];
-      $sql = "delete from tt_project_task_binds where task_id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error')) return false;
+    // Delete monthly quotas.
+    $sql = "delete from tt_monthly_quotas where group_id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;

 
 

-      // Mark task as deleted.
-      $sql = "update tt_tasks set status = NULL where id = $task_id";
-      $affected = $mdb2->exec($sql);
-      if (is_a($affected, 'PEAR_Error')) return false;
-    }
+    // Delete group.
+    $sql = "delete from tt_groups where id = $group_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;

 
     return true;
   }
 
 
     return true;
   }
 

-  // The deleteTasks deletes all tasks and task binds for an inactive team.
-  static function deleteTasks($team_id) {
+  // The deleteTasks deletes all tasks and task binds for an inactive group.
+  static function deleteTasks($group_id) {

     $mdb2 = getConnection();
     $mdb2 = getConnection();

-    $sql = "select id from tt_tasks where team_id = $team_id";
+    $sql = "select id from tt_tasks where group_id = $group_id";

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


@@ -972,10 +750,10 @@ class ttTeamHelper {
     return true;
   }
 
     return true;
   }
 

-  // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive team.
-  static function deleteCustomFields($team_id) {
+  // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive group.
+  static function deleteCustomFields($group_id) {

     $mdb2 = getConnection();
     $mdb2 = getConnection();

-    $sql = "select id from tt_custom_fields where team_id = $team_id";
+    $sql = "select id from tt_custom_fields where group_id = $group_id";

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