X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttOrgHelper.class.php;h=461c751def70e4745d2887a1cbf3a7d829dd6794;hb=0eec39b28e4c408f92f9f99ede99e68640ef94d0;hp=3692123915a1c6f4e4c4843eb52efe6cb5f53768;hpb=d906edf1ba6fe68dc39f811cbb6fd6b5e94d9d4c;p=timetracker.git

diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php
index 36921239..461c751d 100644
--- 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 5 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 5"; // Max 5 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()) {
@@ -84,22 +84,40 @@ class ttOrgHelper {
   }
 
   // deleteOrg deletes data for the entire organization from database permanently.
-  // Work in progress, currently not fully implemented.
   static function deleteOrg($org_id) {
-    // 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.
-
-    // Delete predefined expenses.
-    $sql = "delete from tt_predefined_expenses where org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
-
-    // Delete monthly quotas.
-    $sql = "delete from tt_monthly_quotas where org_id = $org_id";
-    $affected = $mdb2->exec($sql);
-    if (is_a($affected, 'PEAR_Error')) return false;
+    // Go one table at a time and remove all records with matching org_id.
+    // The order is backwards to import (see ttOrgImportHelper). Remove groups last.
+    // This leaves us with something partially working if an error occurs.
+    $mdb2 = getConnection();
 
-    return true; // Work in progress, currently not fully implemented.
+    $tables = array(
+      'tt_config',
+      'tt_cron',
+      'tt_fav_reports',
+      'tt_monthly_quotas',
+      'tt_predefined_expenses',
+      'tt_expense_items',
+      'tt_custom_field_log',
+      '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',
+      'tt_client_project_binds',
+      'tt_clients',
+      'tt_project_task_binds',
+      'tt_projects',
+      'tt_tasks',
+      'tt_roles',
+      'tt_groups'
+    );
+    foreach($tables as $table) {
+      $sql = "delete from $table where org_id = $org_id";
+      $affected = $mdb2->exec($sql);
+      if (is_a($affected, 'PEAR_Error')) return false;
+    }
+    return true;
   }
 }