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 8c7a6839a91055217c1b3522f4966909f2344d9e..cb00addc9497d823bbdd0f55094f7a924d6bcea6 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -1,7 +1,9 @@
 <?php
 /**
- * @file include/queue.php
+ * @file src/Worker/Queue.php
  */
+namespace Friendica\Worker;
+
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
@@ -9,14 +11,16 @@ 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 {
+class Queue
+{
        public static function execute($queue_id = 0)
        {
                global $a;
@@ -28,7 +32,7 @@ class Queue {
                        logger('queue: start');
 
                        // Handling the pubsubhubbub requests
-                       Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
+                       Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'PubSubPublish');
 
                        $r = q(
                                "SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
@@ -54,8 +58,8 @@ class Queue {
 
                        if (DBM::is_result($r)) {
                                foreach ($r as $q_item) {
-                                       logger('Call queue for id '.$q_item['id']);
-                                       Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Queue", (int)$q_item['id']);
+                                       logger('Call queue for id ' . $q_item['id']);
+                                       Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Queue", (int) $q_item['id']);
                                }
                        }
                        return;
@@ -75,80 +79,71 @@ class Queue {
 
                $q_item = $r[0];
 
-               $c = q(
-                       "SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-                       intval($q_item['cid'])
-               );
-
-               if (!DBM::is_result($c)) {
+               $contact = dba::select('contact', [], ['id' => $q_item['cid']], ['limit' => 1]);
+               if (!DBM::is_result($contact)) {
                        remove_queue_item($q_item['id']);
                        return;
                }
 
-               $dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
+               $dead = Cache::get($cachekey_deadguy . $contact['notify']);
 
                if (!is_null($dead) && $dead) {
-                       logger('queue: skipping known dead url: '.$c[0]['notify']);
+                       logger('queue: skipping known dead url: ' . $contact['notify']);
                        update_queue_time($q_item['id']);
                        return;
                }
 
-               $server = PortableContact::detectServer($c[0]['url']);
+               $server = PortableContact::detectServer($contact['url']);
 
                if ($server != "") {
-                       $vital = Cache::get($cachekey_server.$server);
+                       $vital = Cache::get($cachekey_server . $server);
 
                        if (is_null($vital)) {
-                               logger("Check server ".$server." (".$c[0]["network"].")");
+                               logger("Check server " . $server . " (" . $contact["network"] . ")");
 
-                               $vital = PortableContact::checkServer($server, $c[0]["network"], true);
-                               Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
+                               $vital = PortableContact::checkServer($server, $contact["network"], true);
+                               Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR);
                        }
 
                        if (!is_null($vital) && !$vital) {
-                               logger('queue: skipping dead server: '.$server);
+                               logger('queue: skipping dead server: ' . $server);
                                update_queue_time($q_item['id']);
                                return;
                        }
                }
 
-               $u = q(
-                       "SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
-                       FROM `user` WHERE `uid` = %d LIMIT 1",
-                       intval($c[0]['uid'])
-               );
-               if (!DBM::is_result($u)) {
+               $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;
 
                switch ($contact['network']) {
                        case NETWORK_DFRN:
-                               logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+                               logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                $deliver_status = DFRN::deliver($owner, $contact, $data);
 
                                if ($deliver_status == (-1)) {
                                        update_queue_time($q_item['id']);
-                                       Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
+                                       Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                } else {
                                        remove_queue_item($q_item['id']);
                                }
                                break;
                        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);
+                                       logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+                                       $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
 
                                        if ($deliver_status == (-1)) {
                                                update_queue_time($q_item['id']);
-                                               Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
+                                               Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                        } else {
                                                remove_queue_item($q_item['id']);
                                        }
@@ -156,12 +151,12 @@ class Queue {
                                break;
                        case NETWORK_DIASPORA:
                                if ($contact['notify']) {
-                                       logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+                                       logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
                                        $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true);
 
                                        if ($deliver_status == (-1)) {
                                                update_queue_time($q_item['id']);
-                                               Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
+                                               Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
                                        } else {
                                                remove_queue_item($q_item['id']);
                                        }
@@ -179,7 +174,7 @@ class Queue {
                                }
                                break;
                }
-               logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
+               logger('Deliver status ' . (int) $deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>');
 
                return;
        }