X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDBClean.php;h=20691c178e052f5385efd049f87ae4c1917a76f3;hb=eb4650ff231a58a24247d3c7df45524a2359bf60;hp=391c590b4b98cf52e2da62f5a991df2ba4f918ec;hpb=418365b30e126565643ca3139c938e462cac10d8;p=friendica.git

diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 391c590b4b..20691c178e 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -10,6 +10,8 @@ use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use dba;
 
+require_once 'include/dba.php';
+
 class DBClean {
 	public static function execute($stage = 0) {
 
@@ -17,9 +19,6 @@ class DBClean {
 			return;
 		}
 
-		// Get the expire days for step 8 and 9
-		$days = Config::get('system', 'dbclean-expire-days', 0);
-
 		if ($stage == 0) {
 			self::forkCleanProcess();
 		} else {
@@ -31,6 +30,9 @@ class DBClean {
 	 * @brief Fork the different DBClean processes
 	 */
 	private static function forkCleanProcess() {
+		// Get the expire days for step 8 and 9
+		$days = Config::get('system', 'dbclean-expire-days', 0);
+
 		for ($i = 1; $i <= 10; $i++) {
 			// Execute the background script for a step when it isn't finished.
 			// Execute step 8 and 9 only when $days is defined.
@@ -67,21 +69,30 @@ class DBClean {
 
 		// Get the expire days for step 8 and 9
 		$days = Config::get('system', 'dbclean-expire-days', 0);
+		$days_unclaimed = Config::get('system', 'dbclean-expire-unclaimed', 90);
+
+		if ($days_unclaimed == 0) {
+			$days_unclaimed = $days;
+		}
 
 		if ($stage == 1) {
+			if ($days_unclaimed <= 0) {
+				return;
+			}
+
 			$last_id = Config::get('system', 'dbclean-last-id-1', 0);
 
 			logger("Deleting old global item entries from item table without user copy. Last ID: ".$last_id);
 			$r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
 						NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
-						`received` < UTC_TIMESTAMP() - INTERVAL 90 DAY AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id);
+						`received` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `id` >= ?
+					ORDER BY `id` LIMIT ".intval($limit), $days_unclaimed, $last_id);
 			$count = dba::num_rows($r);
 			if ($count > 0) {
 				logger("found global item orphans: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', array('id' => $orphan["id"]));
+					dba::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id);
 			} else {
@@ -103,7 +114,7 @@ class DBClean {
 				logger("found item orphans without parents: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', array('id' => $orphan["id"]));
+					dba::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id);
 			} else {
@@ -129,7 +140,7 @@ class DBClean {
 				logger("found thread orphans: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["iid"];
-					dba::delete('thread', array('iid' => $orphan["iid"]));
+					dba::delete('thread', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 3, $last_id);
 			} else {
@@ -155,7 +166,7 @@ class DBClean {
 				logger("found notify orphans: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('notify', array('iid' => $orphan["iid"]));
+					dba::delete('notify', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 4, $last_id);
 			} else {
@@ -181,7 +192,7 @@ class DBClean {
 				logger("found notify-threads orphans: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('notify-threads', array('id' => $orphan["id"]));
+					dba::delete('notify-threads', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 5, $last_id);
 			} else {
@@ -207,7 +218,7 @@ class DBClean {
 				logger("found sign orphans: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('sign', array('iid' => $orphan["iid"]));
+					dba::delete('sign', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 6, $last_id);
 			} else {
@@ -233,7 +244,7 @@ class DBClean {
 				logger("found term orphans: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["tid"];
-					dba::delete('term', array('oid' => $orphan["oid"]));
+					dba::delete('term', ['oid' => $orphan["oid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 7, $last_id);
 			} else {
@@ -272,7 +283,7 @@ class DBClean {
 				logger("found expired threads: ".$count);
 				while ($thread = dba::fetch($r)) {
 					$last_id = $thread["iid"];
-					dba::delete('thread', array('iid' => $thread["iid"]));
+					dba::delete('thread', ['iid' => $thread["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 8, $last_id);
 			} else {
@@ -300,7 +311,7 @@ class DBClean {
 				logger("found global item entries from expired threads: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', array('id' => $orphan["id"]));
+					dba::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id);
 			} else {
@@ -322,7 +333,7 @@ class DBClean {
 				logger("found old conversations: ".$count);
 				while ($orphan = dba::fetch($r)) {
 					$last_id = $orphan["received"];
-					dba::delete('conversation', array('item-uri' => $orphan["item-uri"]));
+					dba::delete('conversation', ['item-uri' => $orphan["item-uri"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 10, $last_id);
 			} else {
@@ -333,10 +344,5 @@ class DBClean {
 
 			Config::set('system', 'dbclean-last-id-10', $last_id);
 		}
-
-		// Call it again if not all entries were purged
-		//if ($count > 0) {
-		//	Worker::add(PRIORITY_MEDIUM, 'DBClean');
-		//}
 	}
 }