merged 2 if() into one as requested by CR

[friendica.git] / include / expire.php

diff --git a/include/expire.php b/include/expire.php
index 755cd2494b94ee108547c45898649d61966a9823..35b109a50a487156ac53fe3d3ec66bfb1c9906e6 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -1,34 +1,14 @@
 <?php
 
-require_once("boot.php");
+use \Friendica\Core\Config;
 
-function expire_run($argv, $argc){
-       global $a, $db;
+function expire_run(&$argv, &$argc){
+       global $a;
 
-       if(is_null($a)) {
-               $a = new App;
-       }
-  
-       if(is_null($db)) {
-           @include(".htconfig.php");
-       require_once("dba.php");
-           $db = new dba($db_host, $db_user, $db_pass, $db_data);
-       unset($db_host, $db_user, $db_pass, $db_data);
-       };
-
-       require_once('include/session.php');
        require_once('include/datetime.php');
-       require_once('library/simplepie/simplepie.inc');
        require_once('include/items.php');
        require_once('include/Contact.php');
 
-       load_config('config');
-       load_config('system');
-
-
-       $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");
@@ -39,19 +19,18 @@ function expire_run($argv, $argc){
                q("optimize table item");
 
        logger('expire: start');
-       
+
        $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
-       if(count($r)) {
-               foreach($r as $rr) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
                        logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
                        item_expire($rr['uid'],$rr['expire']);
                }
        }
 
-       return;
-}
+       load_hooks();
 
-if (array_search(__file__,get_included_files())===0){
-  expire_run($argv,$argc);
-  killme();
+       call_hooks('expire');
+
+       return;
 }