Refactoring.

[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 1c9e30fd18621218dda26cf0a491795983b3159e..0d10a84f02a2a6a17c5215c783249adc0b12b937 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -85,7 +85,7 @@ class ttTeamHelper {
     while ($val = $res->fetchRow()) {
       // Localize top manager role name, as it is not localized in db.
       if ($val['rank'] == 512)
     while ($val = $res->fetchRow()) {
       // Localize top manager role name, as it is not localized in db.
       if ($val['rank'] == 512)

-        $val['role_name'] = $i18n->getKey('role.top_manager.label');
+        $val['role_name'] = $i18n->get('role.top_manager.label');

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


@@ -898,8 +898,8 @@ class ttTeamHelper {
 
     // Get all team ids for teams created or modified more than 8 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));
 
     // Get all team ids for teams created or modified more than 8 months ago.
     // $ts = date('Y-m-d', strtotime('-1 year'));

-    $ts = date('Y-m-d', strtotime('-8 month'));
-    $sql =  "select id from tt_teams where timestamp < '$ts' order by id";
+    $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;
     $res = $mdb2->query($sql);
 
     $count = 0;


@@ -935,7 +935,7 @@ class ttTeamHelper {
 
     $count = 0;
     $ts = date('Y-m-d', strtotime('-2 years'));
 
     $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'";
+    $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()) {


@@ -950,7 +950,7 @@ class ttTeamHelper {
       // 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'));
       // 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'";
+      $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()) {