diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-01-27 07:14:55 +0100 |
| commit | 444d82a5328433fbe48e18b928d35218905a756c (patch) | |
| tree | 84bd92072bf37eee3b54ebf7cb9ccaf408562e67 /mod/dfrn_notify.php | |
| parent | 6558ee1e2210fb41b1f4d95f806ee441a565087d (diff) | |
| parent | d2dddd995abef2d0805901b278647bef0ce50f88 (diff) | |
| download | volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.gz volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.bz2 volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'mod/dfrn_notify.php')
| -rw-r--r-- | mod/dfrn_notify.php | 24 |
1 files changed, 13 insertions, 11 deletions
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 |