X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_notify.php;h=f284b8b38955cf3ee284d9b4a43d7af85acb4f4e;hb=2d90068ec2b4fc6c918c87fc9321c3954da6a26f;hp=8f11cabf44d7c360f20e1c357439f67177b2d9de;hpb=dbf6ee6a0578a0b4244852b74dac549a25e6f05d;p=friendica.git

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 8f11cabf44..f284b8b389 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('simplepie/simplepie.inc');
+require_once('library/simplepie/simplepie.inc');
 require_once('include/items.php');
 require_once('include/event.php');
 
@@ -144,7 +144,7 @@ function dfrn_notify_post(&$a) {
 	}
 
 	// Consume notification feed. This may differ from consuming a public feed in several ways
-	// - might contain email
+	// - might contain email or friend suggestions
 	// - might contain remote followup to our message
 	//		- in which case we need to accept it and then notify other conversants
 	// - we may need to send various email notifications
@@ -154,6 +154,103 @@ function dfrn_notify_post(&$a) {
 	$feed->enable_order_by_date(false);
 	$feed->init();
 
+	$reloc = $feed->get_feed_tags( NAMESPACE_DFRN, 'relocate' );
+	if(isset($reloc[0]['child'][NAMESPACE_DFRN])) {
+		$base = $reloc[0]['child'][NAMESPACE_DFRN];
+		$newloc = array();
+		$newloc['uid'] = $importer['importer_uid'];
+		$newloc['cid'] = $importer['id'];
+		$newloc['name'] = notags(unxmlify($base['name'][0]['data']));
+		$newloc['photo'] = notags(unxmlify($base['photo'][0]['data']));
+		$newloc['url'] = notags(unxmlify($base['url'][0]['data']));
+		$newloc['request'] = notags(unxmlify($base['request'][0]['data']));
+		$newloc['confirm'] = notags(unxmlify($base['confirm'][0]['data']));
+		$newloc['notify'] = notags(unxmlify($base['notify'][0]['data']));
+		$newloc['poll'] = notags(unxmlify($base['poll'][0]['data']));
+		$newloc['site-pubkey'] = notags(unxmlify($base['site-pubkey'][0]['data']));
+		$newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
+		$newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));
+		
+		// TODO
+		// merge with current record, current contents have priority
+		// update record, set url-updated
+		// update profile photos
+		// schedule a scan?
+
+	}
+
+	// handle friend suggestion notification
+
+	$sugg = $feed->get_feed_tags( NAMESPACE_DFRN, 'suggest' );
+	if(isset($sugg[0]['child'][NAMESPACE_DFRN])) {
+		$base = $sugg[0]['child'][NAMESPACE_DFRN];
+		$fsugg = array();
+		$fsugg['uid'] = $importer['importer_uid'];
+		$fsugg['cid'] = $importer['id'];
+		$fsugg['name'] = notags(unxmlify($base['name'][0]['data']));
+		$fsugg['photo'] = notags(unxmlify($base['photo'][0]['data']));
+		$fsugg['url'] = notags(unxmlify($base['url'][0]['data']));
+		$fsugg['request'] = notags(unxmlify($base['request'][0]['data']));
+		$fsugg['body'] = escape_tags(unxmlify($base['note'][0]['data']));
+
+		// Does our member already have a friend matching this description?
+
+		$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc($fsugg['name']),
+			dbesc($fsugg['url']),
+			intval($fsugg['uid'])
+		);
+		if(count($r))
+			xml_status(0);
+
+		// Do we already have an fcontact record for this person?
+
+		$fid = 0;
+		$r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+			dbesc($fsugg['url']),
+			dbesc($fsugg['name']),
+			dbesc($fsugg['request'])
+		);
+		if(count($r)) {
+			$fid = $r[0]['id'];
+		}
+		if(! $fid)
+			$r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
+			dbesc($fsugg['name']),
+			dbesc($fsugg['url']),
+			dbesc($fsugg['photo']),
+			dbesc($fsugg['request'])
+		);
+		$r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+			dbesc($fsugg['url']),
+			dbesc($fsugg['name']),
+			dbesc($fsugg['request'])
+		);
+		if(count($r)) {
+			$fid = $r[0]['id'];
+		}
+		// database record did not get created. Quietly give up.
+		else
+			xml_status(0);
+
+		$hash = random_string();
+ 
+		$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
+			VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
+			intval($fsugg['uid']),
+			intval($fid),
+			intval($fsugg['cid']),
+			dbesc($fsugg['body']),
+			dbesc($hash),
+			dbesc(datetime_convert()),
+			intval(0)
+		);
+
+		// TODO - send email notify (which may require a new notification preference)
+
+		xml_status(0);
+	}
+
 	$ismail = false;
 
 	$rawmail = $feed->get_feed_tags( NAMESPACE_DFRN, 'mail' );
@@ -606,6 +703,8 @@ function dfrn_notify_post(&$a) {
 					$ev['cid'] = $importer['id'];
 					$ev['uid'] = $importer['uid'];
 					$ev['uri'] = $item_id;
+					$ev['edited'] = $datarray['edited'];
+					$ev['private'] = $datarray['private'];
 
 					$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($item_id),
@@ -649,6 +748,12 @@ function dfrn_notify_post(&$a) {
 				continue;
 			}
 
+			// This is my contact on another system, but it's really me.
+			// Turn this into a wall post.
+
+			if($contact['remote_self'])
+				$datarray['wall'] = 1;
+
 			$datarray['parent-uri'] = $item_id;
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];