X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttOrgHelper.class.php;h=8b3f95ff00f1b2062df22fbf2c140b664920ef04;hb=109089e858e28200e714a790883c236230b3922f;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..8b3f95ff 100644
--- a/WEB-INF/lib/ttOrgHelper.class.php
+++ b/WEB-INF/lib/ttOrgHelper.class.php
@@ -84,22 +84,39 @@ 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_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;
   }
 }