aboutsummaryrefslogtreecommitdiffstats
path: root/include/queue.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-03 16:16:27 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-03 16:16:27 +0200
commitebb8186191d46f6b264d09f886d5574761194685 (patch)
treee810c602bf72c387a2171a3cd03078bdda3d86d1 /include/queue.php
parent9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21 (diff)
parente591ed6b30808cabf1f0c80a356f3fa12ce4aa31 (diff)
downloadvolse-hubzilla-ebb8186191d46f6b264d09f886d5574761194685.tar.gz
volse-hubzilla-ebb8186191d46f6b264d09f886d5574761194685.tar.bz2
volse-hubzilla-ebb8186191d46f6b264d09f886d5574761194685.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/queue.php')
-rw-r--r--include/queue.php22
1 files changed, 6 insertions, 16 deletions
diff --git a/include/queue.php b/include/queue.php
index ff280cb53..cc36b2f62 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,20 +1,6 @@
<?php
require_once("boot.php");
-
-function update_queue_time($id) {
- logger('queue: requeue item ' . $id);
- q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
- dbesc(datetime_convert()),
- intval($id)
- );
-}
-
-function remove_queue_item($id) {
- logger('queue: remove queue item ' . $id);
- q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
- intval($id)
- );
-}
+require_once('include/queue_fn.php');
function queue_run($argv, $argc){
global $a, $db;
@@ -58,6 +44,10 @@ function queue_run($argv, $argc){
if(! count($r)){
return;
}
+
+ call_hooks('queue_predeliver', $a, $r);
+
+
// delivery loop
require_once('include/salmon.php');
@@ -69,6 +59,7 @@ function queue_run($argv, $argc){
if(! count($qi))
continue;
+
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($qi[0]['cid'])
);
@@ -121,7 +112,6 @@ function queue_run($argv, $argc){
}
break;
default:
- $a = get_app();
$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
call_hooks('queue_deliver', $a, $params);