X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FExpire.php;h=713bfa25e0ad67f6a6f9caab456ba5de7375dffd;hb=1e9bff88bc05fce154edee9f047e7d8922184140;hp=ac2577e77ecb47019f8535638a7c8103f45b78de;hpb=501514bd5406253bcbcb420d89fa04199fe5b8c2;p=friendica.git

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index ac2577e77e..713bfa25e0 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -6,27 +6,32 @@
 
 namespace Friendica\Worker;
 
+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;
 
-		require_once('include/datetime.php');
-		require_once('include/items.php');
-		require_once('include/Contact.php');
+		require_once 'include/items.php';
 
-		load_hooks();
+		Addon::loadHooks();
 
 		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");
+			$r = dba::p("SELECT `id`, `icid` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
 			while ($row = dba::fetch($r)) {
-				dba::delete('item', array('id' => $row['id']));
+				dba::delete('item', ['id' => $row['id']]);
+				if (!dba::exists('item', ['icid' => $row['icid']])) {
+					dba::delete('item-content', ['id' => $row['icid']]);
+				}
 			}
 			dba::close($r);
 
@@ -38,10 +43,10 @@ class Expire {
 			}
 			return;
 		} elseif (intval($param) > 0) {
-			$user = dba::select('user', array('uid', 'username', 'expire'), array('uid' => $param), array('limit' => 1));
+			$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;
@@ -49,7 +54,7 @@ class Expire {
 			foreach ($a->hooks["expire"] as $hook) {
 				if ($hook[1] == $hook_name) {
 					logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG);
-					call_single_hook($a, $name, $hook, $data);
+					Addon::callSingleHook($a, $hook_name, $hook, $data);
 				}
 			}
 			return;
@@ -57,14 +62,14 @@ class Expire {
 
 		logger('expire: start');
 
-		Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-				'expire', 'delete');
+		Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+				'Expire', 'delete');
 
 		$r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
 		while ($row = dba::fetch($r)) {
 			logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG);
-			Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-					'expire', (int)$row['uid']);
+			Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+					'Expire', (int)$row['uid']);
 		}
 		dba::close($r);
 
@@ -73,8 +78,8 @@ class Expire {
 		if (is_array($a->hooks) && array_key_exists('expire', $a->hooks)) {
 			foreach ($a->hooks['expire'] as $hook) {
 				logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
-				Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-						'expire', 'hook', $hook[1]);
+				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+						'Expire', 'hook', $hook[1]);
 			}
 		}