Merge pull request #4046 from MrPetovan/bug/4041-fix-register

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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index f09def003d5d9423c18ebe5a9f614e430ce69298..cb00addc9497d823bbdd0f55094f7a924d6bcea6 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -1,9 +1,7 @@
 <?php
-
 /**
  * @file src/Worker/Queue.php
  */
-
 namespace Friendica\Worker;
 
 use Friendica\Core\Cache;
@@ -13,12 +11,13 @@ use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\PortableContact;
+use Friendica\Protocol\Salmon;
+use dba;
 
 require_once 'include/queue_fn.php';
 require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
-require_once 'include/salmon.php';
 
 class Queue
 {
@@ -80,7 +79,7 @@ class Queue
 
                $q_item = $r[0];
 
-               $contact = dba::select('contact', [], ['id' => intval($q_item['cid'])], ['limit' => 1]);
+               $contact = dba::select('contact', [], ['id' => $q_item['cid']], ['limit' => 1]);
                if (!DBM::is_result($contact)) {
                        remove_queue_item($q_item['id']);
                        return;
@@ -113,16 +112,15 @@ class Queue
                        }
                }
 
-               $user = dba::select('user', [], ['uid' => intval($contact['uid'])], ['limit' => 1]);
+               $user = dba::select('user', [], ['uid' => $contact['uid']], ['limit' => 1]);
                if (!DBM::is_result($user)) {
                        remove_queue_item($q_item['id']);
                        return;
                }
 
-               $data      = $q_item['content'];
-               $public    = $q_item['batch'];
-               $contact   = $c[0];
-               $owner     = $u[0];
+               $data   = $q_item['content'];
+               $public = $q_item['batch'];
+               $owner  = $user;
 
                $deliver_status = 0;
 
@@ -141,7 +139,7 @@ class Queue
                        case NETWORK_OSTATUS:
                                if ($contact['notify']) {
                                        logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
-                                       $deliver_status = slapper($owner, $contact['notify'], $data);
+                                       $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
 
                                        if ($deliver_status == (-1)) {
                                                update_queue_time($q_item['id']);