X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifier.php;h=e1bb29eaf22359ec5a283770ffc0c5d475a74002;hb=997cad8685ca4e63b3286ea6bd643656adab7466;hp=4b97311f65df8d3a38ccceb491e9b4a5d9b0f48c;hpb=994011ddb6cc1097214537160a10bf710aedc553;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 4b97311f65..e1bb29eaf2 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -145,7 +145,7 @@ function notifier_run($argv, $argc){
 
 		$parent = $items[0];
 
-		if($parent['type'] === 'remote' && (! $expire)) {
+		if($parent['wall'] == 0 && (! $expire)) {
 			// local followup to remote post
 			$followup = true;
 			$notify_hub = false; // not public
@@ -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;
 			}
@@ -494,12 +504,14 @@ 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($slap && count($url_recipients) && ($followup || $top_level) && $notify_hub && (! $expire)) {
+		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
+				}
 			}
 		}
 	}
@@ -543,7 +555,7 @@ function notifier_run($argv, $argc){
 			WHERE `network` = 'dfrn' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
 			AND `rel` != %d ",
 			intval($owner['uid']),
-			intval(REL_FAN)
+			intval(CONTACT_IS_SHARING)
 		);
 
 		if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
@@ -575,7 +587,6 @@ function notifier_run($argv, $argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  echo "run!";
   notifier_run($argv,$argc);
   killme();
 }