X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTeamHelper.class.php;h=eafc9167c06d4c862218c83af86501e70f2b7b13;hb=9e5dbe1bb51fef6af2a8e3a1dc0160086d723cfb;hp=8d788cf3622369f499d3c4963761210c05e5c9a8;hpb=cfc5b5586771bea46106c54215884da6bc0ede6d;p=timetracker.git

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 8d788cf3..eafc9167 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;
@@ -678,9 +664,8 @@ class ttTeamHelper {
     $inactive_groups = array();
     $mdb2 = getConnection();
 
-    // Get all group ids for groups 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')));
+    // Get all group ids for groups created or modified more than 1 year ago.
+    $ts = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql =  "select id from tt_groups where created < $ts and (modified is null or modified < $ts) order by id";
     $res = $mdb2->query($sql);
 
@@ -702,22 +687,11 @@ class ttTeamHelper {
 
   // The isGroupActive determines if a group is using Time Tracker or abandoned it.
   static function isGroupActive($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 group.
 
     $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'";
+    $sql = "select count(*) as cnt from tt_log where group_id = $group_id and created > '$ts'";
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       if ($val = $res->fetchRow()) {
@@ -732,7 +706,7 @@ class ttTeamHelper {
       // We will consider a group 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'";
+      $sql = "select count(*) as cnt from tt_log where group_id = $group_id and created > '$ts'";
       $res = $mdb2->query($sql);
       if (!is_a($res, 'PEAR_Error')) {
         if ($val = $res->fetchRow()) {