X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnotifier.php;h=aedc560b037f474919fc0fa16c65fd4caf3614bf;hb=afaacd134c7127a66741c452818f9bfc00d48dd8;hp=36ff27054ffecea8e26f7f73d29f6c82bc1bfa7a;hpb=47e9613acde8a6282e3c3717edf6efb7fce47252;p=friendica.git

diff --git a/include/notifier.php b/include/notifier.php
index 36ff27054f..aedc560b03 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -1,40 +1,43 @@
 <?php
 
-print_r($argv);
-require_once("boot.php");
+	require_once("boot.php");
 
-$a = new App;
+	$a = new App;
 
-@include(".htconfig.php");
-require_once("dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-	unset($db_host, $db_user, $db_pass, $db_data);
+	@include(".htconfig.php");
+	require_once("dba.php");
+	$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
 
-require_once("session.php");
-require_once("datetime.php");
 
-if($argc < 3)
-	exit;
-dbg(3);
-	$baseurl = $argv[1];
-	$a->set_baseurl($argv[1]);
+	require_once("session.php");
+	require_once("datetime.php");
+	require_once('include/items.php');
+	require_once('include/bbcode.php');
 
-	$cmd = $argv[2];
+	if($argc < 3)
+		exit;
+
+	$a->set_baseurl(get_config('system','url'));
+
+	logger('notifier: invoked: ' . print_r($argv,true));
+
+	$cmd = $argv[1];
 
 	switch($cmd) {
 
 		case 'mail':
 		default:
-			$item_id = intval($argv[3]);
+			$item_id = intval($argv[2]);
 			if(! $item_id)
 				killme();
 			break;
 	}
 
-
 	$recipients = array();
+	$url_recipients = array();
 
-	if($cmd == 'mail') {
+	if($cmd === 'mail') {
 
 		$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
 				intval($item_id)
@@ -55,19 +58,21 @@ dbg(3);
 		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 * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+	$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)
 	);
 
@@ -76,20 +81,36 @@ dbg(3);
 	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 single 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']);
@@ -100,15 +121,30 @@ dbg(3);
 			foreach($items as $item) {
 				$recipients[] = $item['contact-id'];
 				$conversants[] = $item['contact-id'];
+				// pull out additional tagged people to notify (if public message)
+				if($notify_hub && strlen($item['inform'])) {
+					$people = explode(',',$item['inform']);
+					foreach($people as $person) {
+						if(substr($person,0,4) === 'cid:') {
+							$recipients[] = intval(substr($person,4));
+							$conversants[] = intval(substr($person,4));
+						}
+						else {
+							$url_recipients[] = substr($person,4);
+						}
+					}
+				}
 			}
 
-			$conversants = array_unique($conversants,SORT_NUMERIC);
+			logger('notifier: url_recipients' . print_r($url_recipients,true));
+
+			$conversants = array_unique($conversants);
 
 
-			$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_unique(array_merge($recipients,$allow_people,$allow_groups));
+			$deny = array_unique(array_merge($deny_people,$deny_groups));
 			$recipients = array_diff($recipients,$deny);
-	
+
 			$conversant_str = dbesc(implode(', ',$conversants));
 		}
 
@@ -118,126 +154,83 @@ dbg(3);
 			killme();
 
 		$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');
 	}
 
-	$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 = '';
+	$slaps = array();
+
+	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()),
-			'$feed_title' => xmlify($owner['name']),
-			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 
-				$updated . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
-			'$name' => xmlify($owner['name']),
+			'$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']),
-			'$thumb' => xmlify($owner['thumb']),
-			'$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
-			'$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
-			'$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z'))
+			'$photo'        => xmlify($owner['photo']),
+			'$thumb'        => xmlify($owner['thumb']),
+			'$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))
 	));
 
-	if($cmd == 'mail') {
+	if($cmd === 'mail') {
+		$notify_hub = false;  // mail is  not public
+
 		$atom .= replace_macros($mail_template, array(
-			'$name' => xmlify($owner['name']),
+			'$name'         => xmlify($owner['name']),
 			'$profile_page' => xmlify($owner['url']),
-			'$thumb' => xmlify($owner['thumb']),
-			'$item_id' => xmlify($item['uri']),
-			'$subject' => xmlify($item['title']),
-			'$created' => xmlify(datetime_convert('UTC', 'UTC', 
-				$item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-			'$content' =>xmlify($item['body']),
-			'$parent_id' => xmlify($item['parent-uri'])
-
+			'$thumb'        => xmlify($owner['thumb']),
+			'$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']),
+			'$parent_id'    => xmlify($item['parent-uri'])
 		));
 	}
 	else {
 
 		if($followup) {
-			foreach($items as $item) {
+			foreach($items as $item) {  // there is only one item
 				if($item['id'] == $item_id) {
-					$atom .= replace_macros($cmnt_template, array(
-						'$name' => xmlify($owner['name']),
-						'$profile_page' => xmlify($owner['url']),
-						'$thumb' => xmlify($owner['thumb']),
-						'$item_id' => xmlify($item['uri']),
-						'$title' => xmlify($item['title']),
-						'$published' => xmlify(datetime_convert('UTC', 'UTC', 
-							$item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-						'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
-							$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-						'$content' =>xmlify($item['body']),
-						'$parent_id' => xmlify($item['parent-uri']),
-						'$comment_allow' => 0
-					));
+					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);
 				}
 			}
 		}
 		else {
 			foreach($items as $item) {
-				if($item['deleted']) {
-					$atom .= replace_macros($tomb_template, array(
-						'$id' => xmlify($item['uri']),
-						'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
-							$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z'))
-					));
-				}
-				else {
-					foreach($contacts as $contact) {
-						if($item['contact-id'] == $contact['id']) {
-							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' , 'Y-m-d\TH:i:s\Z')),
-									'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
-										$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-									'$content' =>xmlify($item['body']),
-									'$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 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' , 'Y-m-d\TH:i:s\Z')),
-									'$updated' => xmlify(datetime_convert('UTC', 'UTC', 
-										$item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
-									'$content' =>xmlify($item['body']),
-									'$parent_id' => xmlify($item['parent-uri']),
-									'$comment_allow' => (($item['last-child']) ? 1 : 0)
-								));
-							}
-						}
-					}
-				}
+				$contact = get_item_contact($item,$contacts);
+				if(! $contact)
+					continue;
+
+				$atom   .= atom_entry($item,'text',$contact,$owner,true);
+				$slaps[] = atom_entry($item,'html',$contact,$owner,true);
 			}
 		}
 	}
-	$atom .= "</feed>\r\n";
-echo $atom;
-	// create a clone of this feed but with comments disabled to send to those who can't respond. 
+	$atom .= '</feed>' . "\r\n";
 
-	$atom_nowrite = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
+	logger('notifier: ' . $atom, LOGGER_DATA);
 
+	logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
 
 	if($followup)
 		$recip_str = $parent['contact-id'];
@@ -245,7 +238,7 @@ echo $atom;
 		$recip_str = implode(', ', $recipients);
 
 
-	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) ",
+	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 ",
 		dbesc($recip_str)
 	);
 	if(! count($r))
@@ -253,67 +246,107 @@ echo $atom;
 
 	// delivery loop
 
-	foreach($r as $rr) {
-		if($rr['self'])
-			continue;
-
-		if(! strlen($rr['dfrn-id']))
-			continue;
-
-
-
-		$url = $rr['notify'] . '?dfrn_id=' . $rr['dfrn-id'];
-
-		$xml = fetch_url($url);
-echo $xml;
-		if(! $xml)
-			continue;
+	require_once('include/salmon.php');
 
-		$res = simplexml_load_string($xml);
-
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+	foreach($r as $contact) {
+		if($contact['self'])
 			continue;
 
-		$postvars = array();
-		$sent_dfrn_id = hex2bin($res->dfrn_id);
-
-		$final_dfrn_id = '';
-		openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$rr['pubkey']);
-		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-		if($final_dfrn_id != $rr['dfrn-id']) {
-			// did not decode properly - cannot trust this site 
-			continue;
-		}
+		$deliver_status = 0;
+
+		switch($contact['network']) {
+			case 'dfrn':
+				logger('notifier: dfrndelivery: ' . $contact['name']);
+				$deliver_status = dfrn_deliver($owner,$contact,$atom);
+
+				logger('notifier: dfrn_delivery returns ' . $deliver_status);
+
+				if($deliver_status == (-1)) {
+					logger('notifier: delivery failed: queuing message');
+					// queue message for redelivery
+					q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
+						VALUES ( %d, '%s', '%s', '%s') ",
+						intval($contact['id']),
+						dbesc(datetime_convert()),
+						dbesc(datetime_convert()),
+						dbesc($atom)
+					);
+				}
+				break;
+			default:
+				if($followup && $contact['notify']) {
+					logger('notifier: slapdelivery: ' . $contact['name']);
+					$deliver_status = slapper($owner,$contact['notify'],$slap);
+
+					if($deliver_status == (-1)) {
+						// queue message for redelivery
+						q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
+							VALUES ( %d, '%s', '%s', '%s') ",
+							intval($contact['id']),
+							dbesc(datetime_convert()),
+							dbesc(datetime_convert()),
+							dbesc($slap)
+						);
 
-		$postvars['dfrn_id'] = $rr['dfrn-id'];
+					}
 
-		$challenge = hex2bin($res->challenge);
 
-		openssl_public_decrypt($challenge,$postvars['challenge'],$rr['pubkey']);
+				}
+				else {
 
-		if($cmd == 'mail') {
-			$postvars['data'] = $atom;
-		}
-		elseif(strlen($rr['dfrn-id']) && (! ($rr['blocked']) || ($rr['readonly']))) {
-			$postvars['data'] = $atom;
+					// only send salmon if public - e.g. if it's ok to notify
+					// a public hub, it's ok to send a salmon
+
+					if(count($slaps) && $notify_hub) {
+						logger('notifier: slapdelivery: ' . $contact['name']);
+						foreach($slaps as $slappy) {
+							if($contact['notify']) {
+								$deliver_status = slapper($owner,$contact['notify'],$slappy);
+								if($deliver_status == (-1)) {
+									// queue message for redelivery
+									q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`)
+										VALUES ( %d, '%s', '%s', '%s') ",
+										intval($contact['id']),
+										dbesc(datetime_convert()),
+										dbesc(datetime_convert()),
+										dbesc($slappy)
+									);								
+								}
+							}
+						}
+					}
+				}
+				break;
 		}
-		else {
-			$postvars['data'] = $atom_nowrite;
+	}
+		
+	// send additional slaps to mentioned remote tags (@foo@example.com)
+
+	if(count($slaps) && count($url_recipients) && $notify_hub) {
+		foreach($url_recipients as $url) {
+			logger('notifier: urldelivery: ' . $url);
+			foreach($slaps as $slappy) {
+				if($url) {
+					$deliver_status = slapper($owner,$url,$slappy);
+					// TODO: redeliver/queue these items on failure, though there is no contact record
+				}
+			}
 		}
+	}
 
-		$xml = post_url($rr['notify'],$postvars);
-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)) {
-
-			$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);
+				logger('pubsub: publish: ' . $h . ' returned ' . $a->get_curl_code());
+				if(count($hubs) > 1)
+					sleep(7);				// try and avoid multiple hubs responding at precisely the same time
+			}
 		}
 	}