Degrade priority step by step

[friendica.git] / include / expire.php

diff --git a/include/expire.php b/include/expire.php
index 855d7fb5e44abc544f7eb5f7f5364e7bd05253f6..aa34cbaa5bf88b8c4af782e0680058c2a22df3b0 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,49 +1,35 @@
 <?php
 
-use \Friendica\Core\Config;
-
-require_once("boot.php");
+use Friendica\Core\Config;
 
 function expire_run(&$argv, &$argc){
-       global $a, $db;
-
-       if(is_null($a)) {
-               $a = new App;
-       }
-
-       if(is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       };
+       global $a;
 
-       require_once('include/session.php');
        require_once('include/datetime.php');
        require_once('include/items.php');
        require_once('include/Contact.php');
 
-       Config::load();
-
-       $a->set_baseurl(get_config('system','url'));
-
-
        // 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')))
-               q("optimize table item");
+       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']);
                }
        }
 
@@ -53,8 +39,3 @@ function expire_run(&$argv, &$argc){
 
        return;
 }
-
-if (array_search(__file__,get_included_files())===0){
-  expire_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
-}