X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=9c194d962cfbbc5e419d94a354a7f391612244c0;hb=24836f2966842b413ae29f325fbb61b30186a5f7;hp=db2542849d1d1d721171609dd1b11e385b92480d;hpb=b2e92e0af32f86212d15748c6d432d658905d4b6;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index db2542849d..9c194d962c 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -20,6 +20,9 @@ function notifier_run($argv, $argc){
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 
+	load_config('config');
+	load_config('system');
+
 	load_hooks();
 
 	if($argc < 3)
@@ -71,6 +74,16 @@ function notifier_run($argv, $argc){
 		if(! count($items))
 			return;
 	}
+	elseif($cmd === 'suggest') {
+		$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+			intval($item_id)
+		);
+		if(! count($suggest))
+			return;
+		$uid = $suggest[0]['uid'];
+		$recipients[] = $suggest[0]['cid'];
+		$item = $suggest[0];
+	}
 	else {
 
 		// find ancestors
@@ -106,7 +119,8 @@ function notifier_run($argv, $argc){
 			$top_level = true;
 	}
 
-	$r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` 
+	$r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, 
+		`user`.`page-flags`, `user`.`prvnets`
 		FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 		intval($uid)
@@ -125,7 +139,7 @@ function notifier_run($argv, $argc){
 	// fill this in with a single salmon slap if applicable
 	$slap = '';
 
-	if($cmd != 'mail') {
+	if($cmd != 'mail' && $cmd != 'suggest') {
 
 		require_once('include/group.php');
 
@@ -224,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']),
@@ -231,10 +247,30 @@ 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'])
 		));
 	}
+	elseif($cmd === 'suggest') {
+		$notify_hub = false;  // suggestions are not public
+
+		$sugg_template = get_markup_template('atom_suggest.tpl');
+
+		$atom .= replace_macros($sugg_template, array(
+			'$name'         => xmlify($item['name']),
+			'$url'          => xmlify($item['url']),
+			'$photo'        => xmlify($item['photo']),
+			'$request'      => xmlify($item['request']),
+			'$note'         => xmlify($item['note'])
+		));
+
+		// We don't need this any more
+
+		q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1",
+			intval($item['id'])
+		);
+
+	}
 	else {
 		if($followup) {
 			foreach($items as $item) {  // there is only one item
@@ -329,6 +365,8 @@ function notifier_run($argv, $argc){
 					}
 					break;
 				case 'stat':
+					if($owner['prvnets'])
+						break;
 					if($followup && $contact['notify']) {
 						logger('notifier: slapdelivery: ' . $contact['name']);
 						$deliver_status = slapper($owner,$contact['notify'],$slap);
@@ -372,8 +410,9 @@ function notifier_run($argv, $argc){
 						}
 					}
 					break;
-				case 'mail':
 
+				case 'mail':
+						
 					// WARNING: does not currently convert to RFC2047 header encodings, etc.
 
 					$addr = $contact['addr'];
@@ -446,9 +485,9 @@ function notifier_run($argv, $argc){
 						mail($addr, $subject, $message, $headers);
 					}
 					break;
-				case 'dspr':
 				case 'feed':
 				case 'face':
+				case 'dspr':
 				default:
 					break;
 			}
@@ -511,6 +550,8 @@ function notifier_run($argv, $argc){
 
 		if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
 
+			logger('pubdeliver: ' . print_r($r,true));
+
 			foreach($r as $rr) {
 
 				/* Don't deliver to folks who have already been delivered to */