diff options
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | mod/contacts.php | 6 | ||||
| -rw-r--r-- | mod/dfrn_notify.php | 24 |
3 files changed, 21 insertions, 11 deletions
diff --git a/include/items.php b/include/items.php index 7b0ff2ce6..e238280fc 100644 --- a/include/items.php +++ b/include/items.php @@ -1157,6 +1157,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { continue; } $datarray = get_atom_elements($feed,$item); + if($contact['network'] === 'stat') { if(strlen($datarray['title'])) unset($datarray['title']); @@ -1167,6 +1168,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { ); $datarray['last-child'] = 1; } + if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) { // one way feed - no remote comment ability $datarray['last-child'] = 0; diff --git a/mod/contacts.php b/mod/contacts.php index 7236a200d..83f73140b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -177,6 +177,12 @@ function contacts_content(&$a) { } } + if($orig_record[0]['network'] === 'dfrn') { + require_once('include/items.php'); + dfrn_deliver($a->user,$orig_record[0],'placeholder', 1); + } + + contact_remove($contact_id); notice( t('Contact has been removed.') . EOL ); goaway($a->get_baseurl() . '/contacts'); 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 |