Merge pull request #4260 from annando/item-shadow

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

diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 391c590b4b98cf52e2da62f5a991df2ba4f918ec..ffb24af09e9dc6bf60d5e8479124dfdba82d41ad 100644 (file)
--- 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.
@@ -81,7 +83,7 @@ class DBClean {
                                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 +105,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 +131,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 +157,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 +183,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 +209,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 +235,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 +274,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 +302,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 +324,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 +335,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');
-               //}
        }
 }