Degrade priority step by step

[friendica.git] / include / expire.php

diff --git a/include/expire.php b/include/expire.php
index da121157d21d5ed22454b33d4e76b26dea7d767e..aa34cbaa5bf88b8c4af782e0680058c2a22df3b0 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -10,22 +10,26 @@ function expire_run(&$argv, &$argc){
        require_once('include/Contact.php');
 
        // physically remove anything that has been deleted for more than two months
-
-       $r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+       $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+       if (dbm::is_result($r)) {
+               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
-
-       if (intval(get_config('system','optimize_items'))) {
+       if (intval(get_config('system', 'optimize_items'))) {
                q("OPTIMIZE TABLE `item`");
        }
 
        logger('expire: start');
 
-       $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
+       $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']);
+                       item_expire($rr['uid'], $rr['expire']);
                }
        }