X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FQueue.php;h=179e37c0770bc7bd501a0866adc281f21e98b0f8;hb=58d5d918314a2b01762c0fca33368a5a62a89512;hp=f09def003d5d9423c18ebe5a9f614e430ce69298;hpb=2196a0577b29dcec1ba4d2c32be10fa5f0e91034;p=friendica.git

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index f09def003d..179e37c077 100644
--- 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,14 @@ 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/dba.php';
 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
 {
@@ -55,7 +55,7 @@ class Queue
 			 */
 			$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
 
-			call_hooks('queue_predeliver', $a, $r);
+			call_hooks('queue_predeliver', $r);
 
 			if (DBM::is_result($r)) {
 				foreach ($r as $q_item) {
@@ -80,7 +80,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 +113,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 +140,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']);
@@ -167,7 +166,7 @@ class Queue
 
 			default:
 				$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
-				call_hooks('queue_deliver', $a, $params);
+				call_hooks('queue_deliver', $params);
 
 				if ($params['result']) {
 					remove_queue_item($q_item['id']);