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 a9e629f..677d893
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -21,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');
@@ -84,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)
                );
 
@@ -102,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)
                );
 
@@ -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)) ,
@@ -311,6 +312,13 @@ function delivery_run($argv, $argc){
                                );
 
                                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);
@@ -373,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.
@@ -412,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";