X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FExpire.php;h=b09db5c6774e171a774fd003479635b9945ef3f1;hb=32ef5623ab8247162af93ef2f0bc6def6b2b8bf6;hp=822a4389df6cdfd6d7f6a243b5dadbe0034e0b0e;hpb=174ae78ec18dfc114324c75687d2c8553c4cc1c5;p=friendica.git

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 822a4389df..b09db5c677 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -9,8 +9,8 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Model\Item;
 use Friendica\Database\DBM;
+use Friendica\Model\Item;
 use dba;
 
 require_once 'include/dba.php';
@@ -19,7 +19,6 @@ class Expire {
 	public static function execute($param = '', $hook_name = '') {
 		global $a;
 
-		require_once 'include/datetime.php';
 		require_once 'include/items.php';
 
 		Addon::loadHooks();
@@ -27,18 +26,37 @@ 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`.`uri` = `item-activity`.`uri`)"];
+			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`.`uri` = `item-content`.`uri`)"];
+			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]);