From c7ace10ffb4a9f7dcb5e24eb4db25a4cfb449de7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 26 Jan 2011 02:32:00 -0800 Subject: dissolve relationship (new protocol) working --- mod/dfrn_notify.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'mod/dfrn_notify.php') diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 6c3ae022b..f581702d8 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -75,6 +75,19 @@ function dfrn_notify_post(&$a) { logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']); logger('dfrn_notify: data: ' . $data, LOGGER_DATA); + if($dissolve == 1) { + + /** + * Relationship is dissolved permanently + */ + + require_once('include/Contact.php'); + contact_remove($importer['id']); + logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']); + xml_status(0); + + } + if(strlen($key)) { $rawkey = hex2bin(trim($key)); logger('rino: md5 raw key: ' . md5($rawkey)); @@ -94,17 +107,6 @@ function dfrn_notify_post(&$a) { - 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 -- cgit v1.2.3