Introduced view_projects right.

[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 5b25174bc5855f251757f90d57349f8ffb42844f..2aff793bcc7ae93251c8ec76912ce2e6a3645ec9 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -28,14 +28,15 @@
 
 import('ttUserHelper');
 import('DateAndTime');
 
 import('ttUserHelper');
 import('DateAndTime');

+import('ttInvoiceHelper');

 
 // Class ttTeamHelper - contains helper functions that operate with teams.
 class ttTeamHelper {
 
 // Class ttTeamHelper - contains helper functions that operate with teams.
 class ttTeamHelper {

-       
+

   // The getUserCount function returns number of people in team.
   static function getUserCount($team_id) {
   // The getUserCount function returns number of people in team.
   static function getUserCount($team_id) {

-       $mdb2 = getConnection();
-    
+    $mdb2 = getConnection();
+

     $sql = "select count(id) as cnt from tt_users where team_id = $team_id and status = 1";
     $res = $mdb2->query($sql);
 
     $sql = "select count(id) as cnt from tt_users where team_id = $team_id and status = 1";
     $res = $mdb2->query($sql);
 


@@ -45,18 +46,18 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+

   // The getUsersForClient obtains all active and inactive users in a team that are relevant to a client.
   static function getUsersForClient() {
     global $user;
     $mdb2 = getConnection();
   // The getUsersForClient obtains all active and inactive users in a team that are relevant to a client.
   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
     $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 u.name";
+      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'))


@@ -65,22 +66,26 @@ class ttTeamHelper {
       $user_list[] = $val;
     }
     return $user_list;
       $user_list[] = $val;
     }
     return $user_list;

-  }  
+  }

 
   // The getActiveUsers obtains all active users in a given team.
   static function getActiveUsers($options = null) {
 
   // The getActiveUsers obtains all active users in a given team.
   static function getActiveUsers($options = null) {

-       global $user;
+    global $user;
+    global $i18n;

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

-    
+

     if (isset($options['getAllFields']))
     if (isset($options['getAllFields']))

-      $sql = "select * from tt_users where team_id = $user->team_id and status = 1 order by 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.team_id = $user->team_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 name";
+      $sql = "select id, name from tt_users where team_id = $user->team_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;
     }
 


@@ -94,37 +99,83 @@ class ttTeamHelper {
           array_splice($user_list, $i+1, 1); // Remove duplicate.
         }
       }
           array_splice($user_list, $i+1, 1); // Remove duplicate.
         }
       }

-    }      
+    }

     return $user_list;
   }
     return $user_list;
   }

-  
-  
-  // The getUsers obtains all active and inactive (but not deleted) users in a given team.
-  static function getUsers() {
-       global $user;
+
+  // The swapRolesWith swaps existing user role with that of another user.
+  static function swapRolesWith($user_id) {
+    global $user;

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

-    
-    $sql = "select id, name from tt_users where team_id = $user->team_id and (status = 1 or status = 0) order by name";
+
+    // 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.team_id = $user->team_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 team_id = $user->team_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 team_id = $user->team_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();
+
+    $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.team_id = $user->team_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 getUsers obtains all active and inactive (but not deleted) users in a given team.
+  static function getUsers() {
+    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)";
+    $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 given team.
   static function getInactiveUsers($team_id, $all_fields = false) {
     $mdb2 = getConnection();
 
   // The getInactiveUsers obtains all inactive users in a given team.
   static function getInactiveUsers($team_id, $all_fields = false) {
     $mdb2 = getConnection();

-    
+

     if ($all_fields)
     if ($all_fields)

-      $sql = "select * from tt_users where team_id = $team_id and status = 0 order by 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.team_id = $team_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 name";
+      $sql = "select id, name from tt_users where team_id = $team_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')) {


@@ -135,15 +186,14 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+

   // The getAllUsers obtains all users in a given team.
   static function getAllUsers($team_id, $all_fields = false) {
     $mdb2 = getConnection();
   // The getAllUsers obtains all users in a given team.
   static function getAllUsers($team_id, $all_fields = false) {
     $mdb2 = getConnection();

-    

     if ($all_fields)
     if ($all_fields)

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

     else
     else

-      $sql = "select id, name from tt_users where team_id = $team_id order by name";
+      $sql = "select id, name from tt_users where team_id = $team_id 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')) {


@@ -154,15 +204,15 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+

   // getActiveProjects - returns an array of active projects for team.
   static function getActiveProjects($team_id)
   {
   // getActiveProjects - returns an array of active projects for team.
   static function getActiveProjects($team_id)
   {

-       $result = array();
+    $result = array();

     $mdb2 = getConnection();
 
     $sql = "select id, name, description, tasks from tt_projects
     $mdb2 = getConnection();
 
     $sql = "select id, name, description, tasks from tt_projects

-      where team_id = $team_id and status = 1 order by name";          
+      where team_id = $team_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')) {


@@ -172,15 +222,15 @@ class ttTeamHelper {
     }
     return $result;
   }
     }
     return $result;
   }

-  
+

   // getInactiveProjects - returns an array of inactive projects for team.
   static function getInactiveProjects($team_id)
   {
   // getInactiveProjects - returns an array of inactive projects for team.
   static function getInactiveProjects($team_id)
   {

-       $result = array();
+    $result = array();

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

-    
+

     $sql = "select id, name, description, tasks from tt_projects
     $sql = "select id, name, description, tasks from tt_projects

-      where team_id = $team_id and status = 0 order by name";          
+      where team_id = $team_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')) {


@@ -190,15 +240,15 @@ class ttTeamHelper {
     }
     return $result;
   }
     }
     return $result;
   }

-  
+

   // The getAllProjects obtains all projects in a given team.
   static function getAllProjects($team_id, $all_fields = false) {
     $mdb2 = getConnection();
   // The getAllProjects obtains all projects in a given team.
   static function getAllProjects($team_id, $all_fields = false) {
     $mdb2 = getConnection();

-    
+

     if ($all_fields)
     if ($all_fields)

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

     else
     else

-      $sql = "select id, name from tt_projects where team_id = $team_id order by status, name";
+      $sql = "select id, name from tt_projects where team_id = $team_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')) {


@@ -213,10 +263,10 @@ class ttTeamHelper {
   // getActiveTasks - returns an array of active tasks for team.
   static function getActiveTasks($team_id)
   {
   // getActiveTasks - returns an array of active tasks for team.
   static function getActiveTasks($team_id)
   {

-       $result = array();
+    $result = array();

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

-    $sql = "select id, name, description from tt_tasks where team_id = $team_id and status = 1 order by name";         
+    $sql = "select id, name, description from tt_tasks where team_id = $team_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')) {


@@ -226,15 +276,15 @@ class ttTeamHelper {
     }
     return $result;
   }
     }
     return $result;
   }

-  
+

   // getInactiveTasks - returns an array of inactive tasks for team.
   static function getInactiveTasks($team_id)
   {
   // getInactiveTasks - returns an array of inactive tasks for team.
   static function getInactiveTasks($team_id)
   {

-       $result = array();
+    $result = array();

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

-    
+

     $sql = "select id, name, description from tt_tasks
     $sql = "select id, name, description from tt_tasks

-      where team_id = $team_id and status = 0 order by name";          
+      where team_id = $team_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')) {


@@ -244,15 +294,15 @@ class ttTeamHelper {
     }
     return $result;
   }
     }
     return $result;
   }

-    
+

   // The getAllTasks obtains all tasks in a given team.
   static function getAllTasks($team_id, $all_fields = false) {
     $mdb2 = getConnection();
   // The getAllTasks obtains all tasks in a given team.
   static function getAllTasks($team_id, $all_fields = false) {
     $mdb2 = getConnection();

-    
+

     if ($all_fields)
     if ($all_fields)

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

     else
     else

-      $sql = "select id, name from tt_tasks where team_id = $team_id order by status, name";
+      $sql = "select id, name from tt_tasks where team_id = $team_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')) {


@@ -263,55 +313,138 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+
+  // 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();
+
+    $sql = "select id, name, description, rank, rights from tt_roles where team_id = $user->team_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()) {
+        $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;
+  }
+
+  // getActiveRoles - returns an array of active roles for team.
+  static function getActiveRoles($team_id)
+  {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select id, name, description, rank, rights from tt_roles where team_id = $team_id and status = 1 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.
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // getInactiveRoles - returns an array of inactive roles for team.
+  static function getInactiveRoles($team_id)
+  {
+    $result = array();
+    $mdb2 = getConnection();
+
+    $sql = "select id, name, rank, description from tt_roles
+      where team_id = $team_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;
+      }
+    }
+    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 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;
+  }
+

   // The getActiveClients returns an array of active clients for team.
   static function getActiveClients($team_id, $all_fields = false)
   {
     $result = array();
   // The getActiveClients returns an array of active clients for team.
   static function getActiveClients($team_id, $all_fields = false)
   {
     $result = array();

-       $mdb2 = getConnection();
-    
-       if ($all_fields)
-      $sql = "select * from tt_clients where team_id = $team_id and status = 1 order by name";
+    $mdb2 = getConnection();
+
+    if ($all_fields)
+      $sql = "select * from tt_clients where team_id = $team_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 name";
-       $res = $mdb2->query($sql);
-       $result = array();
-       if (!is_a($res, 'PEAR_Error')) {
+      $sql = "select id, name from tt_clients where team_id = $team_id and status = 1 order by upper(name)";
+
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {

       while ($val = $res->fetchRow()) {
       while ($val = $res->fetchRow()) {

-       $result[] = $val;
+        $result[] = $val;

       }
     }
     return $result;
   }
       }
     }
     return $result;
   }

-  
+

   // The getInactiveClients returns an array of inactive clients for team.
   static function getInactiveClients($team_id, $all_fields = false)
   {
     $result = array();
   // The getInactiveClients returns an array of inactive clients for team.
   static function getInactiveClients($team_id, $all_fields = false)
   {
     $result = array();

-       $mdb2 = getConnection();
-    
-       if ($all_fields)
-      $sql = "select * from tt_clients where team_id = $team_id and status = 0 order by name";
+    $mdb2 = getConnection();
+
+    if ($all_fields)
+      $sql = "select * from tt_clients where team_id = $team_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 name";
-       $res = $mdb2->query($sql);
+      $sql = "select id, name from tt_clients where team_id = $team_id and status = 0 order by upper(name)";
+
+    $res = $mdb2->query($sql);

     $result = array();
     $result = array();

-       if (!is_a($res, 'PEAR_Error')) {
+    if (!is_a($res, 'PEAR_Error')) {

       while ($val = $res->fetchRow()) {
        $result[] = $val;
       }
     }
     return $result;
   }
       while ($val = $res->fetchRow()) {
        $result[] = $val;
       }
     }
     return $result;
   }

-  
+

   // The getAllClients obtains all clients in a given team.
   static function getAllClients($team_id, $all_fields = false) {
     $mdb2 = getConnection();
   // The getAllClients obtains all clients in a given team.
   static function getAllClients($team_id, $all_fields = false) {
     $mdb2 = getConnection();

-    
+

     if ($all_fields)
     if ($all_fields)

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

     else
     else

-      $sql = "select id, name from tt_clients where team_id = $team_id order by status, name";
+      $sql = "select id, name from tt_clients where team_id = $team_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')) {


@@ -326,79 +459,82 @@ class ttTeamHelper {
   // The getActiveInvoices returns an array of active invoices for team.
   static function getActiveInvoices($localizeDates = true)
   {
   // The getActiveInvoices returns an array of active invoices for team.
   static function getActiveInvoices($localizeDates = true)
   {

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

     $result = array();
     $result = array();

-       $mdb2 = getConnection();
-       
-       if (ROLE_CLIENT == $user->role && $user->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";
+    $mdb2 = getConnection();
+
+    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)
+      where i.status = 1 and i.team_id = $user->team_id $client_part order by i.name";

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

-       if ($localizeDates) {
-                 $dt->parseVal($val['date']);
+        if ($localizeDates) {
+          $dt->parseVal($val['date']);

           $val['date'] = $dt->toString($user->date_format);
           $val['date'] = $dt->toString($user->date_format);

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

       }
     }
     return $result;
   }
       }
     }
     return $result;
   }

-  
+

   // The getAllInvoices returns an array of all invoices for team.
   static function getAllInvoices()
   {
   // The getAllInvoices returns an array of all invoices for team.
   static function getAllInvoices()
   {

-       global $user;
-       
+    global $user;
+

     $result = array();
     $result = array();

-       $mdb2 = getConnection();
-       
-       $sql = "select * from tt_invoices where team_id = $user->team_id";
+    $mdb2 = getConnection();
+
+    $sql = "select * from tt_invoices where team_id = $user->team_id";

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

-       $result[] = $val;
+        $result[] = $val;

       }
     }
     return $result;
   }
       }
     }
     return $result;
   }

-  
+

   // The getRecentInvoices returns an array of recent invoices (max 3) for a client.
   static function getRecentInvoices($team_id, $client_id)
   {
   // The getRecentInvoices returns an array of recent invoices (max 3) for a client.
   static function getRecentInvoices($team_id, $client_id)
   {

-       global $user;
-       
+    global $user;
+

     $result = array();
     $result = array();

-       $mdb2 = getConnection();
-    
-       $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
-         order by i.id desc limit 3";
+    $mdb2 = getConnection();
+
+    $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
+      order by i.id desc limit 3";

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

-       $result[] = $val;
+        $result[] = $val;

       }
     }
     return $result;
   }
       }
     }
     return $result;
   }

-  
+

   // getUserToProjectBinds - obtains all user to project binds for a team.
   static function getUserToProjectBinds($team_id) {
     $mdb2 = getConnection();
   // getUserToProjectBinds - obtains all user to project binds for a team.
   static function getUserToProjectBinds($team_id) {
     $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";
     $res = $mdb2->query($sql);
     $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";
     $res = $mdb2->query($sql);


@@ -411,7 +547,7 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+

   // The getAllCustomFields obtains all custom fields in a given team.
   static function getAllCustomFields($team_id) {
     $mdb2 = getConnection();
   // The getAllCustomFields obtains all custom fields in a given team.
   static function getAllCustomFields($team_id) {
     $mdb2 = getConnection();


@@ -445,7 +581,7 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+

   // The getCustomFieldLog obtains all custom field log entries for a given team.
   static function getCustomFieldLog($team_id) {
     $mdb2 = getConnection();
   // The getCustomFieldLog obtains all custom field log entries for a given team.
   static function getCustomFieldLog($team_id) {
     $mdb2 = getConnection();


@@ -462,7 +598,7 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-    
+

   // getFavReports - obtains all favorite reports for all users in team.
   static function getFavReports($team_id) {
     $mdb2 = getConnection();
   // getFavReports - obtains all favorite reports for all users in team.
   static function getFavReports($team_id) {
     $mdb2 = getConnection();


@@ -479,7 +615,7 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+

   // getExpenseItems - obtains all expense items for all users in team.
   static function getExpenseItems($team_id) {
     $mdb2 = getConnection();
   // getExpenseItems - obtains all expense items for all users in team.
   static function getExpenseItems($team_id) {
     $mdb2 = getConnection();


@@ -496,15 +632,37 @@ class ttTeamHelper {
     }
     return false;
   }
     }
     return false;
   }

-  
+
+  // getPredefinedExpenses - obtains predefined expenses for team.
+  static function getPredefinedExpenses($team_id) {
+    global $user;
+    $replaceDecimalMark = ('.' != $user->decimal_mark);
+
+    $mdb2 = getConnection();
+
+    $result = array();
+    $sql = "select id, name, cost from tt_predefined_expenses where team_id = $team_id";
+    $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;
+    }
+    return false;
+  }
+

   // getNotifications - obtains notification descriptions for team.
   static function getNotifications($team_id) {
     $mdb2 = getConnection();
 
     $result = array();
   // getNotifications - obtains notification descriptions for team.
   static function getNotifications($team_id) {
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select c.id, c.cron_spec, c.email, fr.name from tt_cron c
+    $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)
       left join tt_fav_reports fr on (fr.id = c.report_id)

-      where c.team_id = $team_id and c.status is not null"; 
+      where c.team_id = $team_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')) {


@@ -516,78 +674,76 @@ class ttTeamHelper {
     return false;
   }
 
     return false;
   }
 

-  // The getTeams function returns an array of all active teams on the server.
-  static function getTeams() {
-    $result = array();
+  // getMonthlyQuotas - obtains monthly quotas for team.
+  static function getMonthlyQuotas($team_id) {

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

-    
-    $sql =  "select id, name, lang, timestamp from tt_teams where status = 1 order by id desc";
+
+    $result = array();
+    $sql = "select year, month, minutes 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()) {
     $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;
     }
     return false;
   }
         $result[] = $val;
       }
       return $result;
     }
     return false;
   }

-  
+

   // The markDeleted function marks the team and everything in it as deleted.
   static function markDeleted($team_id) {
   // 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;
-       }
-       
+
+    // 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.
     // Mark tasks deleted.

-    if (!ttTeamHelper::markTasksDeleted($team_id))
-      return false;
-      
-       $mdb2 = getConnection();
-       
-       // Mark projects deleted.
+    if (!ttTeamHelper::markTasksDeleted($team_id)) return false;
+
+    $mdb2 = getConnection();
+
+    // Mark roles deleted.
+    $sql = "update tt_roles set status = NULL where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark projects deleted.

     $sql = "update tt_projects set status = NULL where team_id = $team_id";
     $affected = $mdb2->exec($sql);
     $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.
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Mark clients deleted.

     $sql = "update tt_clients set status = NULL where team_id = $team_id";
     $sql = "update tt_clients set status = NULL where team_id = $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;

 
 

-       // Mark custom fields deleted.
+    // Mark custom fields deleted.

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

   }
 
   // The getTeamDetails function returns team details.
   static function getTeamDetails($team_id) {
     $result = array();
     $mdb2 = getConnection();
   }
 
   // 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
     $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"; 
-    
+      inner join tt_users u on (u.team_id = t.id)
+      inner join tt_roles r on (r.id = u.role_id and r.rank = 512)
+      where t.id = $team_id";
+

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


@@ -596,113 +752,97 @@ class ttTeamHelper {
 
     return false;
   }
 
     return false;
   }

-  
-  // The insert function creates a new team. 
+
+  // The insert function creates a new team.

   static function insert($fields) {
 
   static function insert($fields) {
 

+    global $user;

     $mdb2 = getConnection();
     $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 = '';
-    }

 
 

-    if ($fields['lock_interval'] !== null) {
-      $locktime_f = ', locktime';
-      $locktime_v = ", " . (int)$fields['lock_interval'];
-    } else {
-      $locktime_f = '';
-      $locktime_v = '';
+    // Start with team name and currency.
+    $columns = 'name, currency';
+    $values = $mdb2->quote(trim($fields['name'])).', '.$mdb2->quote(trim($fields['currency']));
+
+    if ($fields['decimal_mark']) {
+      $columns .= ', decimal_mark';
+      $values .= ', '.$mdb2->quote($fields['decimal_mark']);

     }
     }

-    
+

     $lang = $fields['lang'];
     if (!$lang) {
       global $i18n;
       $lang = $i18n->lang;
     }
     $lang = $fields['lang'];
     if (!$lang) {
       global $i18n;
       $lang = $i18n->lang;
     }

+    $columns .= ', lang';
+    $values .= ', '.$mdb2->quote($lang);
+
+    if ($fields['date_format'] || defined('DATE_FORMAT_DEFAULT')) {
+      $date_format = $fields['date_format'] ? $fields['date_format'] : DATE_FORMAT_DEFAULT;
+      $columns .= ', date_format';
+      $values .= ', '.$mdb2->quote($date_format);
+    }
+
+    if ($fields['time_format'] || defined('TIME_FORMAT_DEFAULT')) {
+      $time_format = $fields['time_format'] ? $fields['time_format'] : TIME_FORMAT_DEFAULT;
+      $columns .= ', time_format';
+      $values .= ', '.$mdb2->quote($time_format);
+    }
+
+    if ($fields['week_start'] || defined('WEEK_START_DEFAULT')) {
+      $week_start = $fields['week_start'] ? $fields['week_start'] : WEEK_START_DEFAULT;
+      $columns .= ', week_start';
+      $values .= ', '.(int)$week_start;
+    }
+
+    if ($fields['tracking_mode']) {
+      $columns .= ', tracking_mode';
+      $values .= ', '.(int)$fields['tracking_mode'];
+    }
+
+    if ($fields['project_required']) {
+      $columns .= ', project_required';
+      $values .= ', '.(int)$fields['project_required'];
+    }
+
+    if ($fields['task_required']) {
+      $columns .= ', task_required';
+      $values .= ', '.(int)$fields['task_required'];
+    }
+
+    if ($fields['record_type']) {
+      $columns .= ', record_type';
+      $values .= ', '.(int)$fields['record_type'];
+    }
+
+    if ($fields['bcc_email']) {
+      $columns .= ', bcc_email';
+      $values .= ', '.$mdb2->quote($fields['bcc_email']);
+    }
+
+    if ($fields['plugins']) {
+      $columns .= ', plugins';
+      $values .= ', '.$mdb2->quote($fields['plugins']);
+    }
+
+    if ($fields['lock_spec']) {
+      $columns .= ', lock_spec';
+      $values .= ', '.$mdb2->quote($fields['lock_spec']);
+    }
+
+    if ($fields['workday_minutes']) {
+      $columns .= ', workday_minutes';
+      $values .= ', '.(int)$fields['workday_minutes'];
+    }
+
+    if ($fields['config']) {
+      $columns .= ', config';
+      $values .= ', '.$mdb2->quote($fields['config']);
+    }
+
+    $columns .= ', created, created_ip, created_by';
+    $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);

 
 

-    $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 = '';           
-    }
-    
-    $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 = '';     
-    }
-    
-    $sql = "insert into tt_teams (name, address, currency $lockspec_f $locktime_f, lang $decimal_mark_f $date_format_f $time_format_f $week_start_f $plugins_f $tracking_mode_f $record_type_f)
-      values(".
-      $mdb2->quote(trim($fields['name'])).
-      ", ".$mdb2->quote(trim($fields['address'])).
-      ", ".$mdb2->quote(trim($fields['currency']))." $lockspec_v $locktime_v, ".$mdb2->quote($lang).
-      "$decimal_mark_v $date_format_v $time_format_v $week_start_v $plugins_v $tracking_mode_v $record_type_v)";
+    $sql = "insert into tt_teams ($columns) values($values)";

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


@@ -714,82 +854,82 @@ class ttTeamHelper {
   }
 
   // The update function updates team information.
   }
 
   // The update function updates team information.

-  static function update($team_id, $fields)    
+  static function update($team_id, $fields)

   {
   {

-    // We'll require team name to be always set.
-    if (!isset($fields['name'])) return false;
-
+    global $user;

     $mdb2 = getConnection();
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';
     $mdb2 = getConnection();
     $name_part = 'name = '.$mdb2->quote($fields['name']);
     $currency_part = '';

-    $addr_part = '';
-    $locktime_part = '';

     $lang_part = '';
     $decimal_mark_part = '';
     $date_format_part = '';
     $time_format_part = '';
     $week_start_part = '';
     $tracking_mode_part = '';
     $lang_part = '';
     $decimal_mark_part = '';
     $date_format_part = '';
     $time_format_part = '';
     $week_start_part = '';
     $tracking_mode_part = '';

+    $task_required_part = ' , task_required = '.(int) $fields['task_required'];

     $record_type_part = '';
     $record_type_part = '';

+    $bcc_email_part = '';

     $plugins_part = '';
     $plugins_part = '';

+    $config_part = '';

     $lock_spec_part = '';
     $lock_spec_part = '';

-    
-    if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
+    $workday_minutes_part = '';
+

     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);

-    if (isset($fields['locktime'])) $locktime_part = ', locktime = '.intval($fields['locktime']);

     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['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['week_start'])) $week_start_part = ', week_start = '.(int) $fields['week_start'];
+    if (isset($fields['tracking_mode'])) $tracking_mode_part = ', tracking_mode = '.(int) $fields['tracking_mode'];
+    if (isset($fields['record_type'])) $record_type_part = ', record_type = '.(int) $fields['record_type'];
+    if (isset($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['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);

+    if (isset($fields['config'])) $config_part = ', config = '.$mdb2->quote($fields['config']);

     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);

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

 
 

-    $sql = "update tt_teams set $name_part $addr_part $currency_part $locktime_part $lang_part $decimal_mark_part
-      $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part
-      $plugins_part $lock_spec_part where id = $team_id";
+    $sql = "update tt_teams set $name_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
+      $bcc_email_part $plugins_part $config_part $lock_spec_part $workday_minutes_part $modified_part where id = $team_id";

     $affected = $mdb2->exec($sql);
     $affected = $mdb2->exec($sql);

-    
-    if (is_a($affected, 'PEAR_Error')) {
-      return false;
-    }
-    
+    if (is_a($affected, 'PEAR_Error')) return false;
+

     return true;
   }
     return true;
   }

-  
+

   // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100).
   static function getInactiveTeams() {
     $inactive_teams = array();
     $mdb2 = getConnection();
 
   // The getInactiveTeams is a maintenance function that returns an array of inactive team ids (max 100).
   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'));
-    $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
+    // Get all team ids for teams created or modified more than 8 months ago.
+    // $ts = date('Y-m-d', strtotime('-1 year'));
+    $ts = $mdb2->quote(date('Y-m-d', strtotime('-8 month')));
+    $sql =  "select id from tt_teams where created < $ts and (modified is null or modified < $ts) order by id";

     $res = $mdb2->query($sql);
 
     $count = 0;
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $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 >= 25) break;
-       }
+        $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 >= 100) break;
+        }

       }
       return $inactive_teams;
     }
     return false;
   }
       }
       return $inactive_teams;
     }
     return false;
   }

-  
+

   // The isTeamActive determines if a team is using Time Tracker or abandoned it.
   static function isTeamActive($team_id) {
   // The isTeamActive determines if a team is using Time Tracker or abandoned it.
   static function isTeamActive($team_id) {

-       $users = array();
-  
-       $mdb2 = getConnection();
+    $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());
     $sql = "select id from tt_users where team_id = $team_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) die($res->getMessage());


@@ -801,8 +941,8 @@ class ttTeamHelper {
       return false; // No users in team.
 
     $count = 0;
       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'";  
+    $ts = date('Y-m-d', strtotime('-2 years'));
+    $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$ts'";

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


@@ -816,153 +956,173 @@ class ttTeamHelper {
     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;
     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'";  
+      $ts = date('Y-m-d', strtotime('-1 year'));
+      $sql = "select count(*) as cnt from tt_log where user_id in ($user_list) and created > '$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)
       $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 false;  // No time entries for the last year and only a few entries before that.
+      }

     }
     return true;
   }
     }
     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 team.
   static function delete($team_id) {

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

     $sql = "select id from tt_users where team_id = $team_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
     while ($val = $res->fetchRow()) {
       $user_id = $val['id'];
     $sql = "select id from tt_users where team_id = $team_id";
     $res = $mdb2->query($sql);
     if (is_a($res, 'PEAR_Error')) return false;
     while ($val = $res->fetchRow()) {
       $user_id = $val['id'];

-      if (!ttUserHelper::delete($user_id))
-        return false;
+      if (!ttUserHelper::delete($user_id)) return false;

     }
 
     // Delete tasks.
     }
 
     // Delete tasks.

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

     // 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)";
     $affected = $mdb2->exec($sql);
     // 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)";
     $affected = $mdb2->exec($sql);

-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    if (is_a($affected, 'PEAR_Error')) return false;

 
     // Delete projects.
 
     // Delete projects.

-       $sql = "delete from tt_projects where team_id = $team_id";
-       $affected = $mdb2->exec($sql);
-       if (is_a($affected, 'PEAR_Error'))
-         return false;
-
-       // Delete clients.
-       $sql = "delete from tt_clients where team_id = $team_id";
-       $affected = $mdb2->exec($sql);
-       if (is_a($affected, 'PEAR_Error'))
-         return false;
-         
-       // Delete invoices.
-       $sql = "delete from tt_invoices where team_id = $team_id";
-       $affected = $mdb2->exec($sql);
-       if (is_a($affected, 'PEAR_Error'))
-         return false;
-
-       // Delete custom fields.
-       if (!ttTeamHelper::deleteCustomFields($team_id))
-         return false;
-    
+    $sql = "delete from tt_projects where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete clients.
+    $sql = "delete from tt_clients where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete invoices.
+    $sql = "delete from tt_invoices where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+
+    // Delete custom fields.
+    if (!ttTeamHelper::deleteCustomFields($team_id)) return false;
+
+    // Delete roles.
+    $sql = "delete from tt_roles where team_id = $team_id";
+    $affected = $mdb2->exec($sql);
+    if (is_a($affected, 'PEAR_Error')) return false;
+

     // Delete team.
     $sql = "delete from tt_teams where id = $team_id";
     $affected = $mdb2->exec($sql);
     // Delete team.
     $sql = "delete from tt_teams where id = $team_id";
     $affected = $mdb2->exec($sql);

-    if (is_a($affected, 'PEAR_Error'))
-      return false;
+    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) {
 
     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;
-       while ($val = $res->fetchRow()) {
-         
-         // 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;
-         
-         // 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;         
-       }
-       
-       return true;
-  }
-  
+    $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;
+
+    while ($val = $res->fetchRow()) {
+
+      // 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;
+
+      // 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;
+    }
+
+    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 team.
   static function deleteTasks($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;
-       while ($val = $res->fetchRow()) {
-         
-         // 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 task.
-         $sql = "delete from tt_tasks where id = $task_id";
-         $affected = $mdb2->exec($sql);
-         if (is_a($affected, 'PEAR_Error'))
-           return false;         
-       }
-       
-       return true;
-  }
-  
+    $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;
+
+    while ($val = $res->fetchRow()) {
+
+      // 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 task.
+      $sql = "delete from tt_tasks where id = $task_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+
+    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 team.
   static function deleteCustomFields($team_id) {

-       $mdb2 = getConnection();
-       $sql = "select id from tt_custom_fields where team_id = $team_id";
-       $res = $mdb2->query($sql);
-       if (is_a($res, 'PEAR_Error')) return false;
-       while ($val = $res->fetchRow()) {
-         $field_id = $val['id'];
-         
-         // Clean up tt_custom_field_log.
-         $sql = "delete from tt_custom_field_log where field_id = $field_id";
-         $affected = $mdb2->exec($sql);
-         if (is_a($affected, 'PEAR_Error'))
-           return false;
-         
-         // Clean up tt_custom_field_options.
-         $sql = "delete from tt_custom_field_options where field_id = $field_id";
-         $affected = $mdb2->exec($sql);
-         if (is_a($affected, 'PEAR_Error'))
-           return false;
-         
-         // Delete custom field.
-         $sql = "delete from tt_custom_fields where id = $field_id";
-         $affected = $mdb2->exec($sql);
-         if (is_a($affected, 'PEAR_Error'))
-           return false;         
-       }
-       
-       return true;
+    $mdb2 = getConnection();
+    $sql = "select id from tt_custom_fields where team_id = $team_id";
+    $res = $mdb2->query($sql);
+    if (is_a($res, 'PEAR_Error')) return false;
+
+    while ($val = $res->fetchRow()) {
+      $field_id = $val['id'];
+
+      // Clean up tt_custom_field_log.
+      $sql = "delete from tt_custom_field_log where field_id = $field_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Clean up tt_custom_field_options.
+      $sql = "delete from tt_custom_field_options where field_id = $field_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+
+      // Delete custom field.
+      $sql = "delete from tt_custom_fields where id = $field_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+
+    return true;
+  }
+
+  // enablePlugin either enables or disables a specific plugin for team.
+  static function enablePlugin($plugin, $enable = true)
+  {
+    global $user;
+    if (!$user->can('manage_features'))
+      return false;
+
+    $plugin_array = explode(',', $user->plugins);
+    if ($enable && !in_array($plugin, $plugin_array))
+      $plugin_array[] = $plugin; // Add plugin to array.
+
+    if (!$enable && in_array($plugin, $plugin_array)) {
+      $key = array_search($plugin, $plugin_array);
+      if ($key !== false)
+        unset($plugin_array[$key]); // Remove plugin from array.
+    }
+
+    $plugins = implode(',', $plugin_array);
+    if ($plugins != $user->plugins) {
+      if (!ttTeamHelper::update($user->team_id, array('name' => $user->team,'plugins' => $plugins)))
+        return false;
+      $user->plugins = $plugins;
+    }
+
+    return true;

   }
 }
   }
 }