string update

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 8318be4ddf19ffaba1c9acce4754a1fdf56ebb83..5441ac5108c5bfdc892ea91749930189b189c33a 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,5 +1,6 @@
 <?php
 require_once("boot.php");
+require_once('include/queue_fn.php');
 
 function delivery_run($argv, $argc){
        global $a, $db;
@@ -240,7 +241,7 @@ function delivery_run($argv, $argc){
                                $birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
 
                        $atom .= replace_macros($feed_template, array(
-                                       '$version'      => xmlify(FRIENDIKA_VERSION),
+                                       '$version'      => xmlify(FRIENDICA_VERSION),
                                        '$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
                                        '$feed_title'   => xmlify($owner['name']),
                                        '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
@@ -323,14 +324,7 @@ function delivery_run($argv, $argc){
        
                        if($deliver_status == (-1)) {
                                logger('notifier: delivery failed: queuing message');
-                               // queue message for redelivery
-                               q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-                                       VALUES ( %d, '%s', '%s', '%s') ",
-                                       intval($contact['id']),
-                                       dbesc(datetime_convert()),
-                                       dbesc(datetime_convert()),
-                                       dbesc($atom)
-                               );
+                               add_to_queue($contact['id'],NETWORK_DFRN,$atom);
                        }
                        break;
 
@@ -370,13 +364,7 @@ function delivery_run($argv, $argc){
                                                $deliver_status = slapper($owner,$contact['notify'],$slappy);
                                                if($deliver_status == (-1)) {
                                                        // queue message for redelivery
-                                                       q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
-                                                               VALUES ( %d, '%s', '%s', '%s') ",
-                                                               intval($contact['id']),
-                                                               dbesc(datetime_convert()),
-                                                               dbesc(datetime_convert()),
-                                                               dbesc($slappy)
-                                                       );                                                              
+                                                       add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
                                                }
                                        }
                                }