Merge pull request #140 from tobiasd/master

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index 4b97311f65df8d3a38ccceb491e9b4a5d9b0f48c..59e57376222287dc041d24aadb5be14ad42d81ab 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -238,6 +238,8 @@ function notifier_run($argv, $argc){
        if($cmd === 'mail') {
                $notify_hub = false;  // mail is  not public
 
+               $body = fix_private_photos($item['body'],$owner['uid']);
+
                $atom .= replace_macros($mail_template, array(
                        '$name'         => xmlify($owner['name']),
                        '$profile_page' => xmlify($owner['url']),
@@ -245,7 +247,7 @@ function notifier_run($argv, $argc){
                        '$item_id'      => xmlify($item['uri']),
                        '$subject'      => xmlify($item['title']),
                        '$created'      => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
-                       '$content'      => xmlify($item['body']),
+                       '$content'      => xmlify($body),
                        '$parent_id'    => xmlify($item['parent-uri'])
                ));
        }
@@ -363,8 +365,13 @@ function notifier_run($argv, $argc){
                                        }
                                        break;
                                case 'stat':
+
+                                       // Do not send to otatus if we are not configured to send to public networks
                                        if($owner['prvnets'])
                                                break;
+                                       if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
+                                               break;
+
                                        if($followup && $contact['notify']) {
                                                logger('notifier: slapdelivery: ' . $contact['name']);
                                                $deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -380,8 +387,6 @@ function notifier_run($argv, $argc){
                                                        );
 
                                                }
-       
-
                                        }
                                        else {
 
@@ -411,6 +416,9 @@ function notifier_run($argv, $argc){
 
                                case 'mail':
                                                
+                                       if(get_config('system','dfrn_only'))
+                                               break;
+
                                        // WARNING: does not currently convert to RFC2047 header encodings, etc.
 
                                        $addr = $contact['addr'];
@@ -486,6 +494,8 @@ function notifier_run($argv, $argc){
                                case 'feed':
                                case 'face':
                                case 'dspr':
+                                       if(get_config('system','dfrn_only'))
+                                               break;
                                default:
                                        break;
                        }
@@ -495,11 +505,13 @@ function notifier_run($argv, $argc){
        // send additional slaps to mentioned remote tags (@foo@example.com)
 
        if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
-               foreach($url_recipients as $url) {
-                       if($url) {
-                               logger('notifier: urldelivery: ' . $url);
-                               $deliver_status = slapper($owner,$url,$slap);
-                               // TODO: redeliver/queue these items on failure, though there is no contact record
+               if(! get_config('system','dfrn_only')) {
+                       foreach($url_recipients as $url) {
+                               if($url) {
+                                       logger('notifier: urldelivery: ' . $url);
+                                       $deliver_status = slapper($owner,$url,$slap);
+                                       // TODO: redeliver/queue these items on failure, though there is no contact record
+                               }
                        }
                }
        }
@@ -575,7 +587,6 @@ function notifier_run($argv, $argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  echo "run!";
   notifier_run($argv,$argc);
   killme();
 }