Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 53178ce53a4bcd62d29b74becd2ecb814fff8916..4765cca06d155c9a9c19fc387c6a41ebc82f3a11 100755 (executable)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -2,6 +2,7 @@
 
 require_once("boot.php");
 require_once('include/queue_fn.php');
+require_once('include/html2plain.php');
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -35,7 +36,7 @@ function notifier_run($argv, $argc){
        require_once("datetime.php");
        require_once('include/items.php');
        require_once('include/bbcode.php');
-
+       require_once('include/email.php');
        load_config('config');
        load_config('system');
 
@@ -264,7 +265,7 @@ function notifier_run($argv, $argc){
                        $deny_people  = expand_acl($parent['deny_cid']);
                        $deny_groups  = expand_groups(expand_acl($parent['deny_gid']));
 
-                       // if our parent is a forum, uplink to the origonal author causing
+                       // if our parent is a forum, uplink to the origional author causing
                        // a delivery fork
 
                        if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
@@ -382,8 +383,8 @@ function notifier_run($argv, $argc){
                                        continue;
                                if($item['id'] == $item_id) {
                                        logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
-                                       $slap  = atom_entry($item,'html',$owner,$owner,false);
-                                       $atom .= atom_entry($item,'text',$owner,$owner,false);
+                                       $slap  = atom_entry($item,'html',null,$owner,false);
+                                       $atom .= atom_entry($item,'text',null,$owner,false);
                                }
                        }
                }
@@ -410,13 +411,13 @@ function notifier_run($argv, $argc){
                                        // older sites without a corresponding dfrn_notify change may do the wrong thing.
 
                                    if($item_id == $item['id'] || $item['id'] == $item['parent'])
-                                               $atom .= atom_entry($item,'text',$contact,$owner,true);
+                                               $atom .= atom_entry($item,'text',null,$owner,true);
                                }
                                else
-                                       $atom .= atom_entry($item,'text',$contact,$owner,true);
+                                       $atom .= atom_entry($item,'text',null,$owner,true);
 
                                if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
-                                       $slaps[] = atom_entry($item,'html',$contact,$owner,true);
+                                       $slaps[] = atom_entry($item,'html',null,$owner,true);
                        }
                }
        }
@@ -526,6 +527,14 @@ function notifier_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);
@@ -625,23 +634,27 @@ function notifier_run($argv, $argc){
                                                );
                                                if($r1 && $r1[0]['reply_to'])
                                                        $reply_to = $r1[0]['reply_to'];
-       
-                                               $subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
+
+                                               $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: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+                                                       $headers  = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
                                                else
-                                                       $headers  = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
+                                                       $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";
+                                               // for testing purposes: Collect exported mails
+                                               $file = tempnam("/tmp/friendica/", "mail-out2-");
+                                               file_put_contents($file, json_encode($it));
+
+                                               $headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
 
                                                if($it['uri'] !== $it['parent-uri']) {
-                                                       $header .= 'References: <' . $it['parent-uri'] . '>' . "\n";
+                                                       $headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
                                                        if(! strlen($it['title'])) {
                                                                $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
                                                                        dbesc($it['parent-uri'])
@@ -658,13 +671,16 @@ function notifier_run($argv, $argc){
                                                        }
                                                }
 
-                                               $headers .= 'MIME-Version: 1.0' . "\n";
-                                               $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+                                               /*$headers .= 'MIME-Version: 1.0' . "\n";
+                                               //$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+                                               $headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
                                                $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
                                                $html    = prepare_body($it);
-                                               $message = '<html><body>' . $html . '</body></html>';
+                                               //$message = '<html><body>' . $html . '</body></html>';
+                                               $message = html2plain($html);
                                                logger('notifier: email delivery to ' . $addr);
-                                               mail($addr, $subject, $message, $headers);
+                                               mail($addr, $subject, $message, $headers);*/
+                                               email_send($addr, $subject, $headers, $it);
                                        }
                                        break;
                                case NETWORK_DIASPORA:
@@ -711,7 +727,7 @@ function notifier_run($argv, $argc){
                                                // we are the relay - send comments, likes and unlikes to our conversants
                                                diaspora_send_relay($target_item,$owner,$contact);
                                                break;
-                                       }               
+                                       }
                                        elseif(($top_level) && (! $walltowall)) {
                                                // currently no workable solution for sending walltowall
                                                diaspora_send_status($target_item,$owner,$contact);