Remove global $db variable

[friendica.git] / src / Worker / Expire.php

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 6b853bde7722742427bf5967fe608ea7352819bf..685fad49e8f64fc171946f3600203b26c5489d13 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -10,15 +10,17 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use dba;
 
 require_once 'include/dba.php';
 
-class Expire {
-       public static function execute($param = '', $hook_name = '') {
-               global $a;
+class Expire
+{
+       public static function execute($param = '', $hook_name = '')
+       {
+               $a = \Friendica\BaseObject::getApp();
 
-               require_once 'include/datetime.php';
                require_once 'include/items.php';
 
                Addon::loadHooks();
@@ -26,24 +28,43 @@ class Expire {
                if ($param == 'delete') {
                        logger('Delete expired items', LOGGER_DEBUG);
                        // physically remove anything that has been deleted for more than two months
-                       $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
-                       while ($row = dba::fetch($r)) {
+                       $condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"];
+                       $rows = dba::select('item', ['id', 'iaid', 'icid'],  $condition);
+                       while ($row = dba::fetch($rows)) {
                                dba::delete('item', ['id' => $row['id']]);
+                               if (!empty($row['iaid']) && !dba::exists('item', ['iaid' => $row['iaid']])) {
+                                       dba::delete('item-activity', ['id' => $row['iaid']]);
+                               }
+                               if (!empty($row['icid']) && !dba::exists('item', ['icid' => $row['icid']])) {
+                                       dba::delete('item-content', ['id' => $row['icid']]);
+                               }
                        }
-                       dba::close($r);
+                       dba::close($rows);
 
-                       logger('Delete expired items - done', LOGGER_DEBUG);
+                       // Normally we shouldn't have orphaned data at all.
+                       // If we do have some, then we have to check why.
+                       logger('Deleting orphaned item activities - start', LOGGER_DEBUG);
+                       $condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`iaid` = `item-activity`.`id`)"];
+                       dba::delete('item-activity', $condition);
+                       logger('Orphaned item activities deleted: ' . dba::affected_rows(), LOGGER_DEBUG);
+
+                       logger('Deleting orphaned item content - start', LOGGER_DEBUG);
+                       $condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`icid` = `item-content`.`id`)"];
+                       dba::delete('item-content', $condition);
+                       logger('Orphaned item content deleted: ' . dba::affected_rows(), LOGGER_DEBUG);
 
                        // make this optional as it could have a performance impact on large sites
                        if (intval(Config::get('system', 'optimize_items'))) {
                                dba::e("OPTIMIZE TABLE `item`");
                        }
+
+                       logger('Delete expired items - done', LOGGER_DEBUG);
                        return;
                } elseif (intval($param) > 0) {
                        $user = dba::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);
                        if (DBM::is_result($user)) {
                                logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG);
-                               item_expire($user['uid'], $user['expire']);
+                               Item::expire($user['uid'], $user['expire']);
                                logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
                        }
                        return;