diff options
author | friendica <info@friendica.com> | 2012-02-28 17:32:44 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-02-28 17:32:44 -0800 |
commit | 60ae0d8974ce9f0406978130e4feac84a332509b (patch) | |
tree | 1e68e1646937972cfe1d8deb2a530a0ea48f6a3a /mod/dfrn_confirm.php | |
parent | 21803e0cd33d51cd634d0147409f0a6529441c8e (diff) | |
download | volse-hubzilla-60ae0d8974ce9f0406978130e4feac84a332509b.tar.gz volse-hubzilla-60ae0d8974ce9f0406978130e4feac84a332509b.tar.bz2 volse-hubzilla-60ae0d8974ce9f0406978130e4feac84a332509b.zip |
cleaned up mess created when both people request friendship and one approves as duplex
Diffstat (limited to 'mod/dfrn_confirm.php')
-rw-r--r-- | mod/dfrn_confirm.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 5a24f0089..0bc3ea7df 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -107,7 +107,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { * */ - $r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d AND `duplex` = 0 LIMIT 1", dbesc($dfrn_id), intval($cid), intval($uid) @@ -116,6 +116,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(! count($r)) { logger('dfrn_confirm: Contact not found in DB.'); notice( t('Contact not found.') . EOL ); + notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL ); return; } @@ -631,6 +632,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) { xml_status(3,$message); } + // It's possible that the other person also requested friendship. + // If it is a duplex relationship, ditch the issued-id if one exists. + + if($duplex) { + $r = q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d LIMIT 1", + intval($dfrn_record) + ); + } + // We're good but now we have to scrape the profile photo and send notifications. |