X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fexpire.php;h=bb0129aad6278f1ad10759be8ad91f48f6731553;hb=eeec1ea1635a54b8149a029d0b9e8f97269af087;hp=73bffb20dce37a89e88714afdf7611634da2b8c4;hpb=4a473611163a12b48d3bbad71dc54765be8789f9;p=friendica.git

diff --git a/include/expire.php b/include/expire.php
index 73bffb20dc..bb0129aad6 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -9,34 +9,66 @@ function expire_run(&$argv, &$argc){
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 
-	// 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");
-	if (dbm::is_result($r)) {
+	load_hooks();
+
+	if (($argc == 2) && ($argv[1] == '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)) {
 			dba::delete('item', array('id' => $row['id']));
 		}
 		dba::close($r);
-	}
 
-	// make this optional as it could have a performance impact on large sites
+		logger('Delete expired items - done', LOGGER_DEBUG);
 
-	if (intval(get_config('system','optimize_items'))) {
-		q("OPTIMIZE TABLE `item`");
+		// make this optional as it could have a performance impact on large sites
+		if (intval(get_config('system', 'optimize_items'))) {
+			q("OPTIMIZE TABLE `item`");
+		}
+		return;
+	} elseif (($argc == 2) && (intval($argv[1]) > 0)) {
+		$user = dba::select('user', array('uid', 'username', 'expire'), array('uid' => $argv[1]), array('limit' => 1));
+		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']);
+			logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
+		}
+		return;
+	} elseif (($argc == 3) && ($argv[1] == 'hook') && is_array($a->hooks) && array_key_exists("expire", $a->hooks)) {
+		foreach ($a->hooks["expire"] as $hook) {
+			if ($hook[1] == $argv[2]) {
+				logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG);
+				call_single_hook($a, $name, $hook, $data);
+			}
+		}
+		return;
 	}
 
 	logger('expire: start');
 
-	$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
-	if (dbm::is_result($r)) {
-		foreach ($r as $rr) {
-			logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
-			item_expire($rr['uid'],$rr['expire']);
-		}
+	proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+			'include/expire.php', '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);
+		proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+				'include/expire.php', (int)$row['uid']);
 	}
+	dba::close($r);
 
-	load_hooks();
+	logger('expire: calling hooks');
+
+	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);
+			proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+					'include/expire.php', 'hook', $hook[1]);
+		}
+	}
 
-	call_hooks('expire');
+	logger('expire: end');
 
 	return;
 }