Merge pull request #3030 from Hypolite/bug/proxy_url_extension

[friendica.git] / include / expire.php

diff --git a/include/expire.php b/include/expire.php
index 373ebf55fead6df625e33bc716104c4139319bb0..eca2b1c42ad9a7ee3962c047e8c67e7faeb22051 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -8,24 +8,22 @@ function expire_run(&$argv, &$argc){
        if(is_null($a)) {
                $a = new App;
        }
-  
+
        if(is_null($db)) {
            @include(".htconfig.php");
-       require_once("dba.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);
        };
 
        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'));
 
 
@@ -39,19 +37,23 @@ 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)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
                        item_expire($rr['uid'],$rr['expire']);
                }
        }
 
+       load_hooks();
+
+       call_hooks('expire');
+
        return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  expire_run($argv,$argc);
+  expire_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }