From 5a7ff660c4eabb989e5993cbf03bfe6786622bce Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 25 Jan 2011 03:57:10 -0800
Subject: [PATCH] "unfriend" protocol

---
 include/items.php   |  6 ++++--
 mod/dfrn_notify.php | 35 +++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/include/items.php b/include/items.php
index cbe0e970d1..b6a5888001 100644
--- a/include/items.php
+++ b/include/items.php
@@ -756,7 +756,7 @@ function get_item_contact($item,$contacts) {
 }
 
 
-function dfrn_deliver($owner,$contact,$atom) {
+function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$a = get_app();
 
@@ -827,6 +827,8 @@ function dfrn_deliver($owner,$contact,$atom) {
 
 	$postvars['dfrn_id']      = $idtosend;
 	$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+	if($dissolve)
+		$postvars['dissolve'] = '1';
 
 	if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) {
 		$postvars['data'] = $atom;
@@ -838,7 +840,7 @@ function dfrn_deliver($owner,$contact,$atom) {
 		$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
 	}
 
-	if($rino && $rino_allowed) {
+	if($rino && $rino_allowed && (! $dissolve)) {
 		$key = substr(random_string(),0,16);
 		$data = bin2hex(aes_encrypt($postvars['data'],$key));
 		$postvars['data'] = $data;
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 49356d358c..6c3ae022b2 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -11,6 +11,7 @@ function dfrn_notify_post(&$a) {
 	$challenge    = ((x($_POST,'challenge'))    ? notags(trim($_POST['challenge'])) : '');
 	$data         = ((x($_POST,'data'))         ? $_POST['data']                    : '');
 	$key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
+	$dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
 
 	$direction = (-1);
 	if(strpos($dfrn_id,':') == 1) {
@@ -51,6 +52,8 @@ function dfrn_notify_post(&$a) {
 	}
 		 
 
+
+
 	$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, 
 		`contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `user`.* FROM `contact` 
 		LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
@@ -65,19 +68,13 @@ function dfrn_notify_post(&$a) {
 		//NOTREACHED
 	}
 
+	// $importer in this case contains the contact record for the remote contact joined with the user record of our user. 
+
 	$importer = $r[0];
 
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
-	if($importer['readonly']) {
-		// We aren't receiving stuff from this person. But we will quietly ignore them
-		// rather than a blatant "go away" message.
-		logger('dfrn_notify: ignoring');
-		xml_status(0);
-		//NOTREACHED
-	}
-
 	if(strlen($key)) {
 		$rawkey = hex2bin(trim($key));
 		logger('rino: md5 raw key: ' . md5($rawkey));
@@ -95,6 +92,28 @@ function dfrn_notify_post(&$a) {
 		logger('rino: decrypted data: ' . $data, LOGGER_DATA);
 	}
 
+
+
+	if($dissolve == 1) {
+
+		/**
+		 * Relationship is dissolved permanently
+		 */
+ 
+		contact_remove($importer['id']);
+		logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
+		xml_status(0);
+
+	}
+
+	if($importer['readonly']) {
+		// We aren't receiving stuff from this person. But we will quietly ignore them
+		// rather than a blatant "go away" message.
+		logger('dfrn_notify: ignoring');
+		xml_status(0);
+		//NOTREACHED
+	}
+
 	// Consume notification feed. This may differ from consuming a public feed in several ways
 	// - might contain email
 	// - might contain remote followup to our message