Further streamlining of access rights.

[timetracker.git] / WEB-INF / lib / ttOrgHelper.class.php

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 6d7ae67..461c751 100644 (file)
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -63,7 +63,7 @@ class ttOrgHelper {
     return false;
   }
 
-  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 1 for now).
+  // The getInactiveOrgs is a maintenance function that returns an array of inactive organization ids (max 10 for now).
   static function getInactiveOrgs() {
     $inactive_orgs = array();
     $mdb2 = getConnection();
@@ -71,8 +71,8 @@ class ttOrgHelper {
     // Determine inactive organizations by querying the database for max access timestamp for its users.
     $cutoff_timestamp = $mdb2->quote(date('Y-m-d', strtotime('-1 year')));
     $sql = "select org_id from".
-      " (select max(accessed) as last_access, org_id from tt_users group by org_id order by last_access, org_id) as t".
-      " where last_access is null or last_access < $cutoff_timestamp limit 1"; // Max 1 orgs at a time for now...
+      " (select max(accessed) as last_access, org_id from tt_users where org_id > 0 group by org_id order by last_access, org_id) as t".
+      " where last_access is null or last_access < $cutoff_timestamp limit 10"; // Max 10 orgs at a time for now...
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
@@ -101,6 +101,7 @@ class ttOrgHelper {
       'tt_custom_field_options',
       'tt_custom_fields',
       'tt_log',
+      'tt_timesheets', // TODO: check if order is correct. After doing export.
       'tt_invoices',
       'tt_user_project_binds',
       'tt_users',