Move Config::get() to DI::config()->get()

This commit is contained in:
nupplaPhil
2020-01-19 21:21:13 +01:00
parent 5d294e8be8
commit 6c36fd9e01
126 changed files with 581 additions and 596 deletions

View File

@@ -14,7 +14,7 @@ use Friendica\Database\DBA;
class DBClean {
public static function execute($stage = 0) {
if (!Config::get('system', 'dbclean', false)) {
if (!DI::config()->get('system', 'dbclean', false)) {
return;
}
@@ -30,12 +30,12 @@ class DBClean {
*/
private static function forkCleanProcess() {
// Get the expire days for step 8 and 9
$days = Config::get('system', 'dbclean-expire-days', 0);
$days = DI::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.
if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($i > 9) || ($days > 0))) {
if (!DI::config()->get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($i > 9) || ($days > 0))) {
Worker::add(PRIORITY_LOW, 'DBClean', $i);
}
}
@@ -62,11 +62,11 @@ class DBClean {
*/
private static function removeOrphans($stage) {
// We split the deletion in many small tasks
$limit = Config::get('system', 'dbclean-expire-limit', 1000);
$limit = DI::config()->get('system', 'dbclean-expire-limit', 1000);
// 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);
$days = DI::config()->get('system', 'dbclean-expire-days', 0);
$days_unclaimed = DI::config()->get('system', 'dbclean-expire-unclaimed', 90);
if ($days_unclaimed == 0) {
$days_unclaimed = $days;
@@ -77,7 +77,7 @@ class DBClean {
return;
}
$last_id = Config::get('system', 'dbclean-last-id-1', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-1', 0);
Logger::log("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
@@ -100,7 +100,7 @@ class DBClean {
Config::set('system', 'dbclean-last-id-1', $last_id);
} elseif ($stage == 2) {
$last_id = Config::get('system', 'dbclean-last-id-2', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-2', 0);
Logger::log("Deleting items without parents. Last ID: ".$last_id);
$r = DBA::p("SELECT `id` FROM `item`
@@ -126,7 +126,7 @@ class DBClean {
Config::set('system', 'finished-dbclean-2', true);
}
} elseif ($stage == 3) {
$last_id = Config::get('system', 'dbclean-last-id-3', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-3', 0);
Logger::log("Deleting orphaned data from thread table. Last ID: ".$last_id);
$r = DBA::p("SELECT `iid` FROM `thread`
@@ -152,7 +152,7 @@ class DBClean {
Config::set('system', 'finished-dbclean-3', true);
}
} elseif ($stage == 4) {
$last_id = Config::get('system', 'dbclean-last-id-4', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-4', 0);
Logger::log("Deleting orphaned data from notify table. Last ID: ".$last_id);
$r = DBA::p("SELECT `iid`, `id` FROM `notify`
@@ -178,7 +178,7 @@ class DBClean {
Config::set('system', 'finished-dbclean-4', true);
}
} elseif ($stage == 5) {
$last_id = Config::get('system', 'dbclean-last-id-5', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-5', 0);
Logger::log("Deleting orphaned data from notify-threads table. Last ID: ".$last_id);
$r = DBA::p("SELECT `id` FROM `notify-threads`
@@ -204,7 +204,7 @@ class DBClean {
Config::set('system', 'finished-dbclean-5', true);
}
} elseif ($stage == 6) {
$last_id = Config::get('system', 'dbclean-last-id-6', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-6', 0);
Logger::log("Deleting orphaned data from sign table. Last ID: ".$last_id);
$r = DBA::p("SELECT `iid`, `id` FROM `sign`
@@ -230,7 +230,7 @@ class DBClean {
Config::set('system', 'finished-dbclean-6', true);
}
} elseif ($stage == 7) {
$last_id = Config::get('system', 'dbclean-last-id-7', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-7', 0);
Logger::log("Deleting orphaned data from term table. Last ID: ".$last_id);
$r = DBA::p("SELECT `oid`, `tid` FROM `term`
@@ -260,7 +260,7 @@ class DBClean {
return;
}
$last_id = Config::get('system', 'dbclean-last-id-8', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-8', 0);
Logger::log("Deleting expired threads. Last ID: ".$last_id);
$r = DBA::p("SELECT `thread`.`iid` FROM `thread`
@@ -295,8 +295,8 @@ class DBClean {
return;
}
$last_id = Config::get('system', 'dbclean-last-id-9', 0);
$till_id = Config::get('system', 'dbclean-last-id-8', 0);
$last_id = DI::config()->get('system', 'dbclean-last-id-9', 0);
$till_id = DI::config()->get('system', 'dbclean-last-id-8', 0);
Logger::log("Deleting old global item entries from expired threads from ID ".$last_id." to ID ".$till_id);
$r = DBA::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
@@ -319,8 +319,8 @@ class DBClean {
Config::set('system', 'dbclean-last-id-9', $last_id);
} elseif ($stage == 10) {
$last_id = Config::get('system', 'dbclean-last-id-10', 0);
$days = intval(Config::get('system', 'dbclean_expire_conversation', 90));
$last_id = DI::config()->get('system', 'dbclean-last-id-10', 0);
$days = intval(DI::config()->get('system', 'dbclean_expire_conversation', 90));
Logger::log("Deleting old conversations. Last created: ".$last_id);
$r = DBA::p("SELECT `received`, `item-uri` FROM `conversation`