From 32173f5d1d4c523d9f3223489651049cafad9a5e Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sat, 17 Nov 2018 11:29:56 +0000 Subject: [PATCH] Removed no longer used maintenance code. --- WEB-INF/lib/ttOrgHelper.class.php | 9 +++++ WEB-INF/lib/ttTeamHelper.class.php | 60 ------------------------------ WEB-INF/templates/footer.tpl | 2 +- 3 files changed, 10 insertions(+), 61 deletions(-) diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php index d93e2591..4a322f07 100644 --- a/WEB-INF/lib/ttOrgHelper.class.php +++ b/WEB-INF/lib/ttOrgHelper.class.php @@ -82,4 +82,13 @@ class ttOrgHelper { } return false; } + + // deleteOrg deletes data for the entire organization from database permanently. + static function deleteOrg() { + return false; // Work in progress, currently not implemented. + + // We shall do it in a straightforward way by a delete operation from all tables by org_id. + // However, at this time not all tables have org_id. + // So, we need to add the field as we write code here. + } } diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index 8b9d7ed6..40da2720 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -659,66 +659,6 @@ class ttTeamHelper { return false; } - // The getInactiveGroups is a maintenance function that returns an array of inactive group ids (max 100). - static function getInactiveGroups() { - $inactive_groups = array(); - $mdb2 = getConnection(); - - // 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); - - $count = 0; - if (!is_a($res, 'PEAR_Error')) { - while ($val = $res->fetchRow()) { - $group_id = $val['id']; - if (ttTeamHelper::isGroupActive($group_id) == false) { - $count++; - $inactive_groups[] = $group_id; - // Limit the array size for perfomance by allowing this operation on small chunks only. - if ($count >= 100) break; - } - } - return $inactive_groups; - } - return false; - } - - // The isGroupActive determines if a group is using Time Tracker or abandoned it. - static function isGroupActive($group_id) { - $mdb2 = getConnection(); - - $count = 0; - $ts = date('Y-m-d', strtotime('-2 years')); - $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()) { - $count = $val['cnt']; - } - } - - if ($count == 0) - return false; // No time entries for the last 2 years. - - if ($count <= 5) { - // 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 group_id = $group_id 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 group. static function delete($group_id) { $mdb2 = getConnection(); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 62661085..ab54bf61 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.14.4434 | Copyright © Anuko | +  Anuko Time Tracker 1.18.14.4435 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1