Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 3ad433afd8645822d9e831cc69b70a19de148f97..d63ad7ae7cceba578572595d34ecad8d3a640107 100755 (executable)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -201,7 +201,7 @@ function notifier_run($argv, $argc){
                // by stringing togther an array of retractions and sending them onward.
                 
        
-               $localhost = $a->get_hostname();
+               $localhost = str_replace('www.','',$a->get_hostname());
                if(strpos($localhost,':'))
                        $localhost = substr($localhost,0,strpos($localhost,':'));
 
@@ -337,7 +337,9 @@ function notifier_run($argv, $argc){
                        '$picdate'      => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
                        '$uridate'      => xmlify(datetime_convert('UTC','UTC',$owner['uri-date']    . '+00:00' , ATOM_TIME)) ,
                        '$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME)) ,
-                       '$birthday'     => $birthday
+                       '$birthday'     => $birthday,
+                       '$community'    => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
+
        ));
 
        if($mail) {
@@ -383,8 +385,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);
                                }
                        }
                }
@@ -411,13 +413,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);
                        }
                }
        }
@@ -648,38 +650,24 @@ function notifier_run($argv, $argc){
                                                        $headers .= 'Reply-to: ' . $reply_to . "\n";
 
                                                // for testing purposes: Collect exported mails
-                                               $file = tempnam("/tmp/friendica/", "mail-out2-");
-                                               file_put_contents($file, json_encode($it));
+                                               //$file = tempnam("/tmp/friendica/", "mail-out2-");
+                                               //file_put_contents($file, json_encode($it));
 
-                                               $headers .= 'Message-Id: <' . cleanupmessageid($it['uri']) . '>' . "\n";
+                                               $headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
 
                                                if($it['uri'] !== $it['parent-uri']) {
-                                                       $headers .= 'References: <' . cleanupmessageid($it['parent-uri']) . '>' . "\n";
-                                                       if(! strlen($it['title'])) {
+                                                       $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'])
-                                                               );
-                                                               if(count($r)) {
-                                                                       $subtitle = $r[0]['title'];
-                                                                       if($subtitle) {
-                                                                               if(strncasecmp($subtitle,'RE:',3))
-                                                                                       $subject = $subtitle;
-                                                                               else
-                                                                                       $subject = 'Re: ' . $subtitle;
-                                                                       }
-                                                               }
+                                                                       dbesc($it['parent-uri']));
+
+                                                               if(count($r) AND ($r[0]['title'] != ''))  
+                                                                       $subject = $r[0]['title'];
                                                        }
+                                                       if(strncasecmp($subject,'RE:',3))
+                                                               $subject = 'Re: '.$subject;
                                                }
-
-                                               $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 = html2plain($html);
-                                               logger('notifier: email delivery to ' . $addr);
-                                               mail($addr, $subject, $message, $headers);
+                                               email_send($addr, $subject, $headers, $it);
                                        }
                                        break;
                                case NETWORK_DIASPORA:
@@ -726,7 +714,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);
@@ -841,15 +829,6 @@ function notifier_run($argv, $argc){
        return;
 }
 
-function cleanupmessageid($messageid) {
-       global $a;
-
-       if (!strpos($messageid, '@'))
-               $messageid = str_replace(":", ".", $messageid).'@'.$a->get_hostname();
-
-       return($messageid);
-}
-
 if (array_search(__file__,get_included_files())===0){
   notifier_run($argv,$argc);
   killme();