fix twitter title showing up occasionally

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
old mode 100644 (file)
new mode 100755 (executable)
index 46112d7..677d893
--- 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;
@@ -20,6 +21,7 @@ function delivery_run($argv, $argc){
        require_once('include/items.php');
        require_once('include/bbcode.php');
        require_once('include/diaspora.php');
+       require_once('include/email.php');
 
        load_config('config');
        load_config('system');
@@ -83,7 +85,7 @@ function delivery_run($argv, $argc){
        else {
 
                // find ancestors
-               $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+               $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
                        intval($item_id)
                );
 
@@ -101,7 +103,7 @@ function delivery_run($argv, $argc){
 
 
                $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` 
-                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d ORDER BY `id` ASC",
+                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
                        intval($parent_id)
                );
 
@@ -123,7 +125,6 @@ function delivery_run($argv, $argc){
                if( ! ($icontacts && count($icontacts)))
                        return;
 
-
                // avoid race condition with deleting entries
 
                if($items[0]['deleted']) {
@@ -241,7 +242,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)) ,
@@ -269,13 +270,61 @@ function delivery_run($argv, $argc){
                                if(! $item_contact)
                                        continue;
 
-                               $atom .= atom_entry($item,'text',$item_contact,$owner,true);
+                               if($normal_mode) {
+                                       if($item_id == $item['id'] || $item['id'] == $item['parent'])
+                                               $atom .= atom_entry($item,'text',$item_contact,$owner,true);
+                               }
+                               else
+                                       $atom .= atom_entry($item,'text',$item_contact,$owner,true);
 
                        }
 
                        $atom .= '</feed>' . "\r\n";
 
                        logger('notifier: ' . $atom, LOGGER_DATA);
+                       $basepath =  implode('/', array_slice(explode('/',$contact['url']),0,3));
+
+                       // perform local delivery if we are on the same site
+
+                       if(link_compare($basepath,$a->get_baseurl())) {
+
+                               $nickname = basename($contact['url']);
+                               if($contact['issued-id'])
+                                       $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
+                               else
+                                       $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
+                                       
+                               $x = q("SELECT  `contact`.*, `contact`.`uid` AS `importer_uid`, 
+                                       `contact`.`pubkey` AS `cpubkey`, 
+                                       `contact`.`prvkey` AS `cprvkey`, 
+                                       `contact`.`thumb` AS `thumb`, 
+                                       `contact`.`url` as `url`,
+                                       `contact`.`name` as `senderName`,
+                                       `user`.* 
+                                       FROM `contact` 
+                                       LEFT 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
+                                       AND `user`.`account_expired` = 0 LIMIT 1",
+                                       dbesc(NETWORK_DFRN),
+                                       dbesc($nickname)
+                               );
+
+                               if(count($x)) {
+                                       if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
+                                               q("update contact set writable = 1 where id = %d limit 1",
+                                                       intval($x[0]['id'])
+                                               );
+                                               $x[0]['writable'] = 1;
+                                       }
+
+                                       require_once('library/simplepie/simplepie.inc');
+                                       logger('mod-delivery: local delivery');
+                                       local_delivery($x[0],$atom);
+                                       break;                                  
+                               }
+                       }
 
                        $deliver_status = dfrn_deliver($owner,$contact,$atom);
 
@@ -283,14 +332,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;
 
@@ -330,13 +372,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);
                                                }
                                        }
                                }
@@ -345,7 +381,8 @@ function delivery_run($argv, $argc){
                        break;
 
                case NETWORK_MAIL :
-                                               
+               case NETWORK_MAIL2:
+                               
                        if(get_config('system','dfrn_only'))
                                break;
                        // WARNING: does not currently convert to RFC2047 header encodings, etc.
@@ -384,8 +421,15 @@ function delivery_run($argv, $argc){
                                if($r1 && $r1[0]['reply_to'])
                                        $reply_to = $r1[0]['reply_to'];
 
-                               $subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
-                               $headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+                               $subject  = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
+
+                               // only expose our real email address to true friends
+
+                               if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
+                                       $headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
+                               else
+                                       $headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+
                                if($reply_to)
                                        $headers .= 'Reply-to: ' . $reply_to . "\n";
                                $headers .= 'Message-id: <' . $it['uri'] . '>' . "\n";