friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dissolve relationship (new protocol) working

Browse source
This commit is contained in:
Friendika 2011-01-26 02:32:00 -08:00
parent 2fc89deaea
commit c7ace10ffb
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/items.php
View file

@ -1157,6 +1157,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
continue; continue;
} }
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
if($contact['network'] === 'stat') { if($contact['network'] === 'stat') {
if(strlen($datarray['title'])) if(strlen($datarray['title']))
unset($datarray['title']); unset($datarray['title']);
@ -1167,6 +1168,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
); );
$datarray['last-child'] = 1; $datarray['last-child'] = 1;
} }
if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) { if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
// one way feed - no remote comment ability // one way feed - no remote comment ability
$datarray['last-child'] = 0; $datarray['last-child'] = 0;

6
mod/contacts.php
View file

@ -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); contact_remove($contact_id);
notice( t('Contact has been removed.') . EOL ); notice( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts'); goaway($a->get_baseurl() . '/contacts');

24
mod/dfrn_notify.php
View file

@ -75,6 +75,19 @@ function dfrn_notify_post(&$a) {
logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']); logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
logger('dfrn_notify: data: ' . $data, LOGGER_DATA); 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)) { if(strlen($key)) {
$rawkey = hex2bin(trim($key)); $rawkey = hex2bin(trim($key));
logger('rino: md5 raw key: ' . md5($rawkey)); 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']) { if($importer['readonly']) {
// We aren't receiving stuff from this person. But we will quietly ignore them // We aren't receiving stuff from this person. But we will quietly ignore them