The CSS code for shared messages is moved from "vier" to the global.css, so that...

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index d89cded9eb10ed7ecf082d25f0dbef8989109e45..a3d4838b0ea87da4aac1e426da781c196560a195 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -52,7 +52,7 @@ function delivery_run(&$argv, &$argc){
                );
                if(! count($r)) {
                        continue;
-               }       
+               }
 
                $maxsysload = intval(get_config('system','maxloadavg'));
                if($maxsysload < 1)
@@ -67,7 +67,7 @@ function delivery_run(&$argv, &$argc){
 
                // It's ours to deliver. Remove it from the queue.
 
-               q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
+               q("delete from deliverq where cmd = '%s' and item = %d and contact = %d",
                        dbesc($cmd),
                        dbesc($item_id),
                        dbesc($contact_id)
@@ -157,7 +157,7 @@ function delivery_run(&$argv, &$argc){
                $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, 
                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, 
                        `user`.`page-flags`, `user`.`prvnets`
-                       FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+                       FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                        WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
                        intval($uid)
                );
@@ -319,7 +319,7 @@ function delivery_run(&$argv, &$argc){
                                                `contact`.`name` as `senderName`,
                                                `user`.* 
                                                FROM `contact` 
-                                               LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+                                               INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` 
                                                WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                                                AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
                                                $sql_extra
@@ -331,7 +331,7 @@ function delivery_run(&$argv, &$argc){
                                        if($x && count($x)) {
                                                $write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false);
                                                if((($owner['page-flags'] == PAGE_COMMUNITY) || ($write_flag)) && (! $x[0]['writable'])) {
-                                                       q("update contact set writable = 1 where id = %d limit 1",
+                                                       q("update contact set writable = 1 where id = %d",
                                                                intval($x[0]['id'])
                                                        );
                                                        $x[0]['writable'] = 1;
@@ -366,7 +366,6 @@ function delivery_run(&$argv, &$argc){
                                break;
 
                        case NETWORK_OSTATUS :
-
                                // Do not send to otatus if we are not configured to send to public networks
                                if($owner['prvnets'])
                                        break;
@@ -386,7 +385,7 @@ function delivery_run(&$argv, &$argc){
                                                // private emails may be in included in public conversations. Filter them.
                                                if(($public_message) && $item['private'] == 1)
                                                        continue;
-       
+
                                                $item_contact = get_item_contact($item,$icontacts);
                                                if(! $item_contact)
                                                        continue;
@@ -430,7 +429,7 @@ function delivery_run(&$argv, &$argc){
                                        if($cmd === 'wall-new') 
                                                $it = $items[0];
                                        else {
-                                               $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
+                                               $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                                        intval($argv[2]),
                                                        intval($uid)
                                                );
@@ -542,7 +541,7 @@ function delivery_run(&$argv, &$argc){
 
                                        diaspora_send_relay($target_item,$owner,$contact,$public_message);
                                        break;
-                               }               
+                               }
                                elseif(($top_level) && (! $walltowall)) {
                                        // currently no workable solution for sending walltowall
                                        logger('delivery: diaspora status: ' . $loc);
@@ -558,6 +557,9 @@ function delivery_run(&$argv, &$argc){
                        case NETWORK_FACEBOOK :
                                if(get_config('system','dfrn_only'))
                                        break;
+                       case NETWORK_PUMPIO :
+                               if(get_config('system','dfrn_only'))
+                                       break;
                        default:
                                break;
                }