From: Nik Okuntseff Date: Thu, 22 Mar 2018 00:06:41 +0000 (+0000) Subject: Introduced ttAdmin class for admin tasks. X-Git-Tag: timetracker_1.19-1~979 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=73bd55c5aaa9459806ef9fa899cc5a24513727bc;p=timetracker.git Introduced ttAdmin class for admin tasks. --- diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php new file mode 100644 index 00000000..b6b081e9 --- /dev/null +++ b/WEB-INF/lib/ttAdmin.class.php @@ -0,0 +1,179 @@ +query($sql); + $users = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $users[] = $val; + } + } + return $users; + } + + // markUserDeleted marks a user and all things associated with user as deleted. + function markUserDeleted($user_id) { + $mdb2 = getConnection(); + + // Mark user binds as deleted. + $sql = "update tt_user_project_binds set status = NULL where user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + // Mark favorite reports as deleted. + $sql = "update tt_fav_reports set status = NULL where user_id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + // Mark user as deleted. + global $user; + $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id); + $sql = "update tt_users set status = NULL $modified_part where id = $user_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + return true; + } + + // The markTasksDeleted deletes task binds and marks the tasks as deleted for a group. + function markTasksDeleted($group_id) { + $mdb2 = getConnection(); + $sql = "select id from tt_tasks where team_id = $group_id"; + $res = $mdb2->query($sql); + if (is_a($res, 'PEAR_Error')) return false; + + while ($val = $res->fetchRow()) { + // Delete task binds. + $task_id = $val['id']; + $sql = "delete from tt_project_task_binds where task_id = $task_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark task as deleted. + $sql = "update tt_tasks set status = NULL where id = $task_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + } + return true; + } + + // markGroupDeleted marks the group and everything in it as deleted. + function markGroupDeleted($group_id) { + + // Keep the logic simple by returning false on first error. + + // Obtain subgroups and call self recursively on them. + $subgroups = $this->getSubgroups(); + foreach($subgroups as $subgroup) { + if (!$this->markGroupDeleted($subgroup['id'])) + return false; + } + + // Now that we are done with subgroups, handle this group. + $users = $this->getUsers($group_id); + + // Iterate through team users and mark them as deleted. + foreach ($users as $one_user) { + if (!$this->markUserDeleted($one_user['id'])) + return false; + } + + // Mark tasks deleted. + if (!$this->markTasksDeleted($group_id)) return false; + + $mdb2 = getConnection(); + + // Mark roles deleted. + $sql = "update tt_roles set status = NULL where team_id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark projects deleted. + $sql = "update tt_projects set status = NULL where team_id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark clients deleted. + $sql = "update tt_clients set status = NULL where team_id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark invoices deleted. + $sql = "update tt_invoices set status = NULL where team_id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark custom fields deleted. + $sql = "update tt_custom_fields set status = NULL where team_id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Mark notifications deleted. + $sql = "update tt_cron set status = NULL where team_id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + // Note: we don't mark tt_log or tt_expense_items deleted here. + // Reasoning is: + // + // 1) Users may mark some of them deleted during their work. + // If we mark all of them deleted here, we can't recover nicely + // as we'll lose track of what was deleted by user. + // + // 2) DB maintenance script (Clean up DB from inactive teams) should + // get rid of these items permanently eventually. + + // Mark group deleted. + global $user; + $modified_part = ', modified = now(), modified_ip = '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', modified_by = '.$mdb2->quote($user->id); + $sql = "update tt_teams set status = NULL $modified_part where id = $group_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) return false; + + return true; + } +} diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index d45f4d94..e0a4919d 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.65.4130 | Copyright © Anuko | +  Anuko Time Tracker 1.17.65.4131 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/admin_team_delete.php b/admin_team_delete.php index 6958ca0e..b2b462ce 100644 --- a/admin_team_delete.php +++ b/admin_team_delete.php @@ -47,7 +47,10 @@ $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getK if ($request->isPost()) { if ($request->getParameter('btn_delete')) { - if (ttTeamHelper::markDeleted($team_id)) { + import('ttAdmin'); + $admin = new ttAdmin(); + $result = $admin->markGroupDeleted($team_id); + if ($result) { header('Location: admin_teams.php'); exit(); } else