X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=b861e669e7d30c096726be9725add9cf85ccaf7f;hb=d6a5ffec0f76b9ab5b1ee4f8e69ecdb2afd7c0ff;hp=092c737ab530643efc60933f24d3bf451389ff1c;hpb=89fb789af54e5842342ef676fab13da4ab0b1098;p=timetracker.git

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 092c737a..b861e669 100644
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -33,20 +33,6 @@ import('ttInvoiceHelper');
 // Class ttTeamHelper - contains helper functions that operate with groups.
 class ttTeamHelper {
 
-  // The getUserCount function returns number of active users in a group.
-  static function getUserCount($group_id) {
-    $mdb2 = getConnection();
-
-    $sql = "select count(id) as cnt from tt_users where group_id = $group_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 group that are relevant to a client.
   static function getUsersForClient() {
     global $user;
@@ -187,24 +173,6 @@ class ttTeamHelper {
     return false;
   }
 
-  // The getAllUsers obtains all users in a group.
-  static function getAllUsers($group_id, $all_fields = false) {
-    $mdb2 = getConnection();
-    if ($all_fields)
-      $sql = "select * from tt_users where group_id = $group_id order by upper(name)";
-    else
-      $sql = "select id, name from tt_users where group_id = $group_id order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-      return $result;
-    }
-    return false;
-  }
-
   // getActiveProjects - returns an array of active projects for a group.
   static function getActiveProjects($group_id)
   {
@@ -322,7 +290,7 @@ class ttTeamHelper {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and rank < $user->rank and status = 1 order by rank";
+    $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')) {
@@ -354,7 +322,7 @@ class ttTeamHelper {
     return $result;
   }
 
-  // getInactiveRoles - returns an array of inactive roles for team.
+  // getInactiveRoles - returns an array of inactive roles for a group.
   static function getInactiveRoles($group_id)
   {
     $result = array();
@@ -380,7 +348,7 @@ class ttTeamHelper {
     $result = array();
     $mdb2 = getConnection();
 
-    $sql = "select id, name, description, rank, rights from tt_roles where group_id = $user->group_id and rank < $user->rank and status = 0 order by rank";
+    $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')) {
@@ -691,221 +659,7 @@ class ttTeamHelper {
     return false;
   }
 
-  // The markDeleted function marks the group and everything in it as deleted.
-  static function markDeleted($group_id) {
-
-    // Iterate through group users and mark them as deleted.
-    $users = ttTeamHelper::getAllUsers($group_id);
-    foreach ($users as $one_user) {
-      if (!ttUserHelper::markDeleted($one_user['id'])) return false;
-    }
-
-    // Mark tasks deleted.
-    if (!ttTeamHelper::markTasksDeleted($group_id)) return false;
-
-    $mdb2 = getConnection();
-
-    // Mark roles deleted.
-    $sql = "update tt_roles set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark projects deleted.
-    $sql = "update tt_projects set status = NULL where group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark clients deleted.
-    $sql = "update tt_clients set status = NULL where group_id = $group_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 group_id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Mark group deleted.
-    $sql = "update tt_groups set status = NULL where id = $group_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    return true;
-  }
-
-  // The insert function creates a new group.
-  static function insert($fields) {
-
-    global $user;
-    $mdb2 = getConnection();
-
-    // Start with group 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;
-    }
-    $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);
-
-    $sql = "insert into tt_groups ($columns) values($values)";
-    $affected = $mdb2->exec($sql);
-
-    if (!is_a($affected, 'PEAR_Error')) {
-      $group_id = $mdb2->lastInsertID('tt_groups', 'id');
-      return $group_id;
-    }
-
-    return false;
-  }
-
-  // The getInactiveTeams is a maintenance function that returns an array of inactive group ids (max 100).
-  static function getInactiveTeams() {
-    $inactive_teams = array();
-    $mdb2 = getConnection();
-
-    // 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_groups 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()) {
-        $group_id = $val['id'];
-        if (ttTeamHelper::isTeamActive($group_id) == false) {
-          $count++;
-          $inactive_teams[] = $group_id;
-          // Limit the array size for perfomance by allowing this operation on small chunks only.
-          if ($count >= 100) break;
-        }
-      }
-      return $inactive_teams;
-    }
-    return false;
-  }
-
-  // The isTeamActive determines if a team is using Time Tracker or abandoned it.
-  static function isTeamActive($group_id) {
-    $users = array();
-
-    $mdb2 = getConnection();
-    $sql = "select id from tt_users where group_id = $group_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 created > '$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 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)
-          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.
+  // The delete function permanently deletes all data for a group.
   static function delete($group_id) {
     $mdb2 = getConnection();
 
@@ -949,39 +703,30 @@ class ttTeamHelper {
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
-    // Delete group.
-    $sql = "delete from tt_groups where id = $group_id";
+    // 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;
 
-    return true;
-  }
-
-  // The markTasksDeleted deletes task binds and marks the tasks as deleted for a team.
-  static function markTasksDeleted($group_id) {
-    $mdb2 = getConnection();
-    $sql = "select id from tt_tasks where group_id = $group_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, '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;
   }
 
-  // The deleteTasks deletes all tasks and task binds for an inactive team.
+  // The deleteTasks deletes all tasks and task binds for an inactive group.
   static function deleteTasks($group_id) {
     $mdb2 = getConnection();
     $sql = "select id from tt_tasks where group_id = $group_id";
@@ -1005,7 +750,7 @@ class ttTeamHelper {
     return true;
   }
 
-  // The deleteCustomFields cleans up tt_custom_field_log, tt_custom_field_options and tt_custom_fields tables for an inactive team.
+  // 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();
     $sql = "select id from tt_custom_fields where group_id = $group_id";