diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-03 08:21:28 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-03 08:21:28 +0200 |
| commit | 9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21 (patch) | |
| tree | 7b3af87ff4e4ef44999f69a6213b6f5df9ad2383 /include/queue.php | |
| parent | bda839635ceefac14c9d7892cd24d28fc6cdd596 (diff) | |
| parent | f2bdcb19e7f2748d3c368ab11deeb98d63fedca7 (diff) | |
| download | volse-hubzilla-9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21.tar.gz volse-hubzilla-9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21.tar.bz2 volse-hubzilla-9b93bd25218dc0b4a5e477c3a64d6f74a51a9d21.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/queue.php')
| -rw-r--r-- | include/queue.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/queue.php b/include/queue.php index d4fc7dbd6..ff280cb53 100644 --- a/include/queue.php +++ b/include/queue.php @@ -97,7 +97,7 @@ function queue_run($argv, $argc){ $deliver_status = 0; switch($contact['network']) { - case 'dfrn': + case NETWORK_DFRN: logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']); $deliver_status = dfrn_deliver($owner,$contact,$data); @@ -109,7 +109,7 @@ function queue_run($argv, $argc){ remove_queue_item($q_item['id']); } break; - default: + case NETWORK_OSTATUS: if($contact['notify']) { logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$data); @@ -120,6 +120,18 @@ function queue_run($argv, $argc){ remove_queue_item($q_item['id']); } break; + default: + $a = get_app(); + $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false); + call_hooks('queue_deliver', $a, $params); + + if($params['result']) + remove_queue_item($q_item['id']); + else + update_queue_time($q_item['id']); + + break; + } } |