Review changes

[friendica.git] / src / Worker / Expire.php

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index ac2577e77ecb47019f8535638a7c8103f45b78de..e963d6d3519d43ae6e278ae26de6b0793ac3fe7c 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -11,13 +11,14 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use dba;
 
+require_once 'include/dba.php';
+
 class Expire {
        public static function execute($param = '', $hook_name = '') {
                global $a;
 
-               require_once('include/datetime.php');
-               require_once('include/items.php');
-               require_once('include/Contact.php');
+               require_once 'include/datetime.php';
+               require_once 'include/items.php';
 
                load_hooks();
 
@@ -49,7 +50,7 @@ class Expire {
                        foreach ($a->hooks["expire"] as $hook) {
                                if ($hook[1] == $hook_name) {
                                        logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG);
-                                       call_single_hook($a, $name, $hook, $data);
+                                       call_single_hook($a, $hook_name, $hook, $data);
                                }
                        }
                        return;
@@ -58,13 +59,13 @@ class Expire {
                logger('expire: start');
 
                Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-                               'expire', 'delete');
+                               'Expire', 'delete');
 
                $r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
                while ($row = dba::fetch($r)) {
                        logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG);
                        Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-                                       'expire', (int)$row['uid']);
+                                       'Expire', (int)$row['uid']);
                }
                dba::close($r);
 
@@ -74,7 +75,7 @@ class Expire {
                        foreach ($a->hooks['expire'] as $hook) {
                                logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
                                Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
-                                               'expire', 'hook', $hook[1]);
+                                               'Expire', 'hook', $hook[1]);
                        }
                }