From: Nik Okuntseff Date: Sat, 13 Apr 2019 17:49:10 +0000 (+0000) Subject: Improved db cleanup code to also include attachment cleanup. X-Git-Tag: timetracker_1.19-1~103 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=37da1bee2ce91703f964ae58c580240bd3798011;p=timetracker.git Improved db cleanup code to also include attachment cleanup. --- diff --git a/WEB-INF/lib/ttFileHelper.class.php b/WEB-INF/lib/ttFileHelper.class.php index 997634fe..c69439d6 100644 --- a/WEB-INF/lib/ttFileHelper.class.php +++ b/WEB-INF/lib/ttFileHelper.class.php @@ -79,7 +79,7 @@ class ttFileHelper { // Set the url, number of POST vars, POST data. curl_setopt($ch, CURLOPT_URL, $this->register_uri); - curl_setopt($ch, CURLOPT_POST, count($fields)); + curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -152,7 +152,7 @@ class ttFileHelper { // Set the url, number of POST vars, POST data. curl_setopt($ch, CURLOPT_URL, $this->putfile_uri); - curl_setopt($ch, CURLOPT_POST, count($fields)); + curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -230,7 +230,7 @@ class ttFileHelper { // Set the url, number of POST vars, POST data. curl_setopt($ch, CURLOPT_URL, $this->deletefile_uri); - curl_setopt($ch, CURLOPT_POST, count($fields)); + curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -304,7 +304,7 @@ class ttFileHelper { // Set the url, number of POST vars, POST data. curl_setopt($ch, CURLOPT_URL, $this->deletefiles_uri); - curl_setopt($ch, CURLOPT_POST, count($fields)); + curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -466,7 +466,7 @@ class ttFileHelper { // Set the url, number of POST vars, POST data. curl_setopt($ch, CURLOPT_URL, $this->getfile_uri); - curl_setopt($ch, CURLOPT_POST, count($fields)); + curl_setopt($ch, CURLOPT_POST, true); curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); diff --git a/WEB-INF/lib/ttOrgHelper.class.php b/WEB-INF/lib/ttOrgHelper.class.php index 346ea5d1..a4be2e96 100644 --- a/WEB-INF/lib/ttOrgHelper.class.php +++ b/WEB-INF/lib/ttOrgHelper.class.php @@ -85,6 +85,10 @@ class ttOrgHelper { // deleteOrg deletes data for the entire organization from database permanently. static function deleteOrg($org_id) { + + // Delete all org files. + ttOrgHelper::deleteOrgFiles($org_id); + // 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. @@ -119,6 +123,70 @@ class ttOrgHelper { $affected = $mdb2->exec($sql); if (is_a($affected, 'PEAR_Error')) return false; } + return true; } + + // deleteOrgFiles deletes files attached to all entities in the entire organization. + static function deleteOrgFiles($org_id) { + + // Delete all org files from the database. + $mdb2 = getConnection(); + $sql = "delete from tt_files where org_id = $org_id"; + $affected = $mdb2->exec($sql); + if (is_a($affected, 'PEAR_Error')) + return false; + + // Try to make a call to file storage facility. + if (!defined('FILE_STORAGE_URI')) return true; // Nothing to do. + + $deleteorgfiles_uri = FILE_STORAGE_URI.'deleteorgfiles'; + + // Obtain site id. + $sql = "select param_value as site_id from tt_site_config where param_name = 'locker_id'"; + $res = $mdb2->query($sql); + $val = $res->fetchRow(); + $site_id = $val['site_id']; + if (!$site_id) return true; // Nothing to do. + + // Obtain site key. + $sql = "select param_value as site_key from tt_site_config where param_name = 'locker_key'"; + $res = $mdb2->query($sql); + $val = $res->fetchRow(); + $site_key = $val['site_key']; + if (!$site_key) return true; // Can't continue without site key. + + // Obtain org key. + $sql = "select group_key as org_key from tt_groups where id = $org_id"; + $res = $mdb2->query($sql); + $val = $res->fetchRow(); + $org_key = $val['org_key']; + if (!$site_key) return true; // Can't continue without org key. + + $curl_fields = array('site_id' => $site_id, + 'site_key' => $site_key, + 'org_id' => $org_id, + 'org_key' => $org_key); + + // url-ify the data for the POST. + foreach($curl_fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; } + $fields_string = rtrim($fields_string, '&'); + + // Open connection. + $ch = curl_init(); + + // Set the url, number of POST vars, POST data. + curl_setopt($ch, CURLOPT_URL, $deleteorgfiles_uri); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + + // Execute a post request. + $result = curl_exec($ch); + + // Close connection. + curl_close($ch); + + // Many things can go wrong with a remote call to file storage facility. + // By design, we ignore such errors. return true; } } diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index e2b18404..80f684b6 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.64.4931 | Copyright © Anuko | +  Anuko Time Tracker 1.18.64.4932 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/dbinstall.php b/dbinstall.php index 007e5160..6e5b1b25 100644 --- a/dbinstall.php +++ b/dbinstall.php @@ -1157,7 +1157,6 @@ if ($_POST) { } if ($_POST["cleanup"]) { - $mdb2 = getConnection(); $inactive_orgs = ttOrgHelper::getInactiveOrgs(); @@ -1191,6 +1190,7 @@ if ($_POST) { ttExecute("OPTIMIZE TABLE tt_user_project_binds"); ttExecute("OPTIMIZE TABLE tt_users"); ttExecute("OPTIMIZE TABLE tt_roles"); + ttExecute("OPTIMIZE TABLE tt_files"); } print "Done.
\n";