X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=069f3bdf2e37abb655237ac8edbb6692d442b375;hb=eb5e6aae7273fef06a06f983fe78aaad737aa729;hp=4b80bd3b6c4b9e5b33ea8cddafb26c6caae15901;hpb=399b6828f6888ff65d3ace22876c49f0887e88e6;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 4b80bd3b6c..069f3bdf2e 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,7 +1,5 @@
 <?php
 
-	$debugging = false;
-
 	require_once("boot.php");
 
 	$a = new App;
@@ -11,10 +9,14 @@
 	$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
 
+
+	$debugging = get_config('system','debugging');
+
 	require_once("session.php");
 	require_once("datetime.php");
 	require_once('include/items.php');
 
+
 	if($argc < 3)
 		exit;
 
@@ -37,7 +39,7 @@
 
 	$recipients = array();
 
-	if($cmd == 'mail') {
+	if($cmd === 'mail') {
 
 		$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
 				intval($item_id)
@@ -58,19 +60,19 @@
 		if(! count($r))
 			killme();
 
-		$parent = $r[0]['parent'];
+		$parent_id = $r[0]['parent'];
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
 
 		$items = q("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id` ASC",
-			intval($parent)
+			intval($parent_id)
 		);
 
 		if(! count($items))
 			killme();
 	}
 
-	$r = q("SELECT `contact`.*, `user`.`nickname` 
+	$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` 
 		FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 		intval($uid)
@@ -81,20 +83,34 @@
 	else
 		killme();
 
+	$hub = get_config('system','huburl');
+	// If this is a public conversation, notify the feed hub
+	$notify_hub = true;
+
+	// fill this in with a salmon slap if applicable
+	$slap = '';
+
 	if($cmd != 'mail') {
 
 		require_once('include/group.php');
 
 		$parent = $items[0];
 
-		if($parent['type'] == 'remote') {
+		if($parent['type'] === 'remote') {
 			// local followup to remote post
 			$followup = true;
+			$notify_hub = false; // not public
 			$conversant_str = dbesc($parent['contact-id']);
 		}
 		else {
 			$followup = false;
 
+			if((strlen($parent['allow_cid'])) 
+				|| (strlen($parent['allow_gid'])) 
+				|| (strlen($parent['deny_cid'])) 
+				|| (strlen($parent['deny_gid'])))
+				$notify_hub = false; // private recipients, not public
+
 			$allow_people = expand_acl($parent['allow_cid']);
 			$allow_groups = expand_groups(expand_acl($parent['allow_gid']));
 			$deny_people = expand_acl($parent['deny_cid']);
@@ -113,10 +129,8 @@
 			$recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups),SORT_NUMERIC);
 			$deny = array_unique(array_merge($deny_people,$deny_groups),SORT_NUMERIC);
 			$recipients = array_diff($recipients,$deny);
-	
-			$conversant_str = dbesc(implode(', ',$conversants));
-
 
+			$conversant_str = dbesc(implode(', ',$conversants));
 		}
 
 		$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
@@ -126,21 +140,35 @@
 
 		$contacts = $r;
 
-		$tomb_template = file_get_contents('view/atom_tomb.tpl');
-		$item_template = file_get_contents('view/atom_item.tpl');
-		$cmnt_template = file_get_contents('view/atom_cmnt.tpl');
+		$tomb_template = load_view_file('view/atom_tomb.tpl');
+		$item_template = load_view_file('view/atom_item.tpl');
+		$cmnt_template = load_view_file('view/atom_cmnt.tpl');
 	}
 
-	$feed_template = file_get_contents('view/atom_feed.tpl');
-	$mail_template = file_get_contents('view/atom_mail.tpl');
+	$feed_template = load_view_file('view/atom_feed.tpl');
+	$mail_template = load_view_file('view/atom_mail.tpl');
 
 	$atom = '';
 
+	$hubxml = '';
+	if(strlen($hub)) {
+		$hubs = explode(',', $hub);
+		if(count($hubs)) {
+			foreach($hubs as $h) {
+				$h = trim($h);
+				if(! strlen($h))
+					continue;
+				$hubxml .= '<link rel="hub" href="' . xmlify($h) . '" />' . "\n" ;
+			}
+		}
+	}
 
 	$atom .= replace_macros($feed_template, array(
 			'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 			'$feed_title'   => xmlify($owner['name']),
 			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
+			'$hub'          => $hubxml,
+			'$salmon'       => '',   // private feed, we don't use salmon here
 			'$name'         => xmlify($owner['name']),
 			'$profile_page' => xmlify($owner['url']),
 			'$photo'        => xmlify($owner['photo']),
@@ -150,7 +178,8 @@
 			'$namdate'      => xmlify(datetime_convert('UTC','UTC',$owner['name-date']   . '+00:00' , ATOM_TIME))
 	));
 
-	if($cmd == 'mail') {
+	if($cmd === 'mail') {
+		$notify_hub = false;  // mail is  not public
 		$atom .= replace_macros($mail_template, array(
 			'$name'         => xmlify($owner['name']),
 			'$profile_page' => xmlify($owner['url']),
@@ -164,15 +193,14 @@
 	}
 	else {
 
-
 		if($followup) {
-			foreach($items as $item) {
+			foreach($items as $item) {  // there is only one item
 
 				$verb = construct_verb($item);
 				$actobj = construct_activity($item);
 
 				if($item['id'] == $item_id) {
-					$atom .= replace_macros($cmnt_template, array(
+					$slap = replace_macros($cmnt_template, array(
 						'$name'               => xmlify($owner['name']),
 						'$profile_page'       => xmlify($owner['url']),
 						'$thumb'              => xmlify($owner['thumb']),
@@ -182,17 +210,20 @@
 						'$item_id'            => xmlify($item['uri']),
 						'$title'              => xmlify($item['title']),
 						'$published'          => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
-						'$updated'            => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
+						'$updated'            => xmlify(datetime_convert('UTC', 'UTC', $item['edited']  . '+00:00' , ATOM_TIME)),
 						'$location'           => xmlify($item['location']),
+						'$coord'              => xmlify($item['coord']),
 						'$type'               => 'text',
 						'$verb'               => xmlify($verb),
 						'$actobj'             => $actobj,
+						'$alt'                => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
 						'$content'            => xmlify($item['body']),
 						'$parent_id'          => xmlify($item['parent-uri']),
 						'$comment_allow'      => 0
 					));
 				}
 			}
+			$atom .= $slap;
 		}
 		else {
 			foreach($items as $item) {
@@ -203,65 +234,64 @@
 					));
 				}
 				else {
-					foreach($contacts as $contact) {
-						if($item['contact-id'] == $contact['id']) {
-
-							$verb = construct_verb($item);
-							$actobj = construct_activity($item);
-
-							if($item['parent'] == $item['id']) {
-								$atom .= replace_macros($item_template, array(
-									'$name'               => xmlify($contact['name']),
-									'$profile_page'       => xmlify($contact['url']),
-									'$thumb'              => xmlify($contact['thumb']),
-									'$owner_name'         => xmlify($item['owner-name']),
-									'$owner_profile_page' => xmlify($item['owner-link']),
-									'$owner_thumb'        => xmlify($item['owner-avatar']),
-									'$item_id'            => xmlify($item['uri']),
-									'$title'              => xmlify($item['title']),
-									'$published'          => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
-									'$updated'            => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
-									'$location'           => xmlify($item['location']),
-									'$type'               => 'text',
-									'$verb'               => xmlify($verb),
-									'$actobj'             => $actobj,
-									'$content'            => xmlify($item['body']),
-									'$comment_allow'      => (($item['last-child']) ? 1 : 0)
-								));
-							}
-							else {
-								$atom .= replace_macros($cmnt_template, array(
-									'$name'          => xmlify($contact['name']),
-									'$profile_page'  => xmlify($contact['url']),
-									'$thumb'         => xmlify($contact['thumb']),
-									'$item_id'       => xmlify($item['uri']),
-									'$title'         => xmlify($item['title']),
-									'$published'     => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
-									'$updated'       => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
-									'$content'       => xmlify($item['body']),
-									'$location'      => xmlify($item['location']),
-									'$type'          => 'text',
-									'$verb'          => xmlify($verb),
-									'$actobj'        => $actobj,
-									'$parent_id'     => xmlify($item['parent-uri']),
-									'$comment_allow' => (($item['last-child']) ? 1 : 0)
-								));
-							}
-						}
+					$contact = get_item_contact($item,$contacts);
+					if(! $contact)
+						continue;
+
+					$verb = construct_verb($item);
+					$actobj = construct_activity($item);
+
+					if($item['parent'] == $item['id']) {
+						$atom .= replace_macros($item_template, array(
+							'$name'               => xmlify($contact['name']),
+							'$profile_page'       => xmlify($contact['url']),
+							'$thumb'              => xmlify($contact['thumb']),
+							'$owner_name'         => xmlify($item['owner-name']),
+							'$owner_profile_page' => xmlify($item['owner-link']),
+							'$owner_thumb'        => xmlify($item['owner-avatar']),
+							'$item_id'            => xmlify($item['uri']),
+							'$title'              => xmlify($item['title']),
+							'$published'          => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
+							'$updated'            => xmlify(datetime_convert('UTC', 'UTC', $item['edited']  . '+00:00' , ATOM_TIME)),
+							'$location'           => xmlify($item['location']),
+							'$coord'              => xmlify($item['coord']),
+							'$type'               => 'text',
+							'$verb'               => xmlify($verb),
+							'$actobj'             => $actobj,
+							'$content'            => xmlify($item['body']),
+							'$alt'                => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
+							'$comment_allow'      => (($item['last-child']) ? 1 : 0)
+						));
+					}
+					else {
+						$atom .= replace_macros($cmnt_template, array(
+							'$name'          => xmlify($contact['name']),
+							'$profile_page'  => xmlify($contact['url']),
+							'$thumb'         => xmlify($contact['thumb']),
+							'$item_id'       => xmlify($item['uri']),
+							'$title'         => xmlify($item['title']),
+							'$published'     => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
+							'$updated'       => xmlify(datetime_convert('UTC', 'UTC', $item['edited']  . '+00:00' , ATOM_TIME)),
+							'$content'       => xmlify($item['body']),
+							'$alt'           => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
+							'$location'      => xmlify($item['location']),
+							'$coord'         => xmlify($item['coord']),
+							'$type'          => 'text',
+							'$verb'          => xmlify($verb),
+							'$actobj'        => $actobj,
+							'$parent_id'     => xmlify($item['parent-uri']),
+							'$comment_allow' => (($item['last-child']) ? 1 : 0)
+						));
 					}
 				}
 			}
 		}
 	}
-	$atom .= "</feed>\r\n";
+	$atom .= '</feed>' . "\r\n";
 
 	if($debugging)
 		echo $atom;
 
-	// create a clone of this feed but with comments disabled to send to those who can't respond. 
-
-	$atom_nowrite = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
-
 
 	if($followup)
 		$recip_str = $parent['contact-id'];
@@ -277,91 +307,51 @@
 
 	// delivery loop
 
-	foreach($r as $rr) {
-		if($rr['self'])
-			continue;
-
-		if((! strlen($rr['dfrn-id'])) && (! $rr['duplex']))
-			continue;
-
-
-		$idtosend = $orig_id = (($rr['dfrn-id']) ? $rr['dfrn-id'] : $rr['issued-id']);
-
-		if($rr['duplex'] && $rr['dfrn-id'])
-			$idtosend = '0:' . $orig_id;
-		if($rr['duplex'] && $rr['issued-id'])
-			$idtosend = '1:' . $orig_id;		
-
-		$url = $rr['notify'] . '?dfrn_id=' . $idtosend;
-
-		if($debugging)
-			echo "URL: $url";
-
-		$xml = fetch_url($url);
 
-		if($debugging)
-			echo $xml;
 
-		if(! $xml)
+	foreach($r as $contact) {
+		if($contact['self'])
 			continue;
 
-		$res = simplexml_load_string($xml);
+		$deliver_status = 0;
 
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
-			continue;
-
-		$postvars     = array();
-
-		$sent_dfrn_id = hex2bin($res->dfrn_id);
-		$challenge    = hex2bin($res->challenge);
-
-		$final_dfrn_id = '';
-
-		if($rr['duplex'] && strlen($rr['prvkey'])) {
-			openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$rr['prvkey']);
-			openssl_private_decrypt($challenge,$postvars['challenge'],$rr['prvkey']);
-		}
-		else {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$rr['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$rr['pubkey']);
-		}
-
-		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-
-		if(strpos($final_dfrn_id,':') == 1)
-			$final_dfrn_id = substr($final_dfrn_id,2);
-
-		if($final_dfrn_id != $orig_id) {
-			// did not decode properly - cannot trust this site 
-			continue;
-		}
-
-		$postvars['dfrn_id'] = $idtosend;
-
-		if(($rr['rel']) && ($rr['rel'] != REL_FAN) && (! $rr['blocked']) && (! $rr['readonly'])) {
-			$postvars['data'] = $atom;
-		}
-		else {
-			$postvars['data'] = $atom_nowrite;
+		switch($contact['network']) {
+			case 'dfrn':
+				$deliver_status = dfrn_deliver($owner,$contact,$atom,$debugging);
+				break;
+			default:
+				if($followup) {
+					require_once('include/salmon.php');
+					slapper($owner,$contact,$slap);
+				}
+				break;
 		}
 
-		$xml = post_url($rr['notify'],$postvars);
-
-		if($debugging)
-			echo $xml;
-
-		$res = simplexml_load_string($xml);
-
-		// Currently there is no retry attempt for failed mail delivery.
-		// We need to handle this in the UI, report the non-deliverables and try again
- 
-		if(($cmd == 'mail') && (intval($res->status) == 0)) {
-
+		if(($cmd === 'mail') && ($deliver_status == 0)) {
 			$r = q("UPDATE `mail` SET `delivered` = 1 WHERE `id` = %d LIMIT 1",
 				intval($item_id)
 			);
 		}
 	}
 
+	if((strlen($hub)) && ($notify_hub)) {
+		$hubs = explode(',', $hub);
+		if(count($hubs)) {
+			foreach($hubs as $h) {
+				$h = trim($h);
+				if(! strlen($h))
+					continue;
+				$params = 'hub.mode=publish&hub.url=' . urlencode($a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+				post_url($h,$params);
+				if($debugging) {
+					file_put_contents('pubsub.out', "\n\n" . "Pinged hub " . $h . ' at ' 
+						. datetime_convert() . "\n" . "Hub returned " . $a->get_curl_code() . "\n\n" , FILE_APPEND);
+				}
+				if(count($hubs) > 1)
+					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
+			}
+		}
+	}
+
 	killme();