From a6cf036db26f9a7f399f7440c574c12d03821fa7 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 May 2019 17:59:37 +0000 Subject: [PATCH] Sending contact suggestions does work again --- mod/fsuggest.php | 19 +++++++++++-------- src/Worker/Delivery.php | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mod/fsuggest.php b/mod/fsuggest.php index e84a8bd54d..2cede56852 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -26,26 +26,29 @@ function fsuggest_post(App $a) return; } - $contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'photo'], ['id' => $contact_id, 'uid' => local_user()]); - if (!DBA::isResult($contact)) { + // We do query the "uid" as well to ensure that it is our contact + if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) { notice(L10n::t('Contact not found.') . EOL); return; } - $note = Strings::escapeHtml(trim(defaults($_POST, 'note', ''))); - - $new_contact = intval($_POST['suggest']); - if (empty($new_contact)) { + $suggest_contact_id = intval($_POST['suggest']); + if (empty($suggest_contact_id)) { return; } - if (!DBA::exists('contact', ['id' => $new_contact])) { + // We do query the "uid" as well to ensure that it is our contact + $contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]); + if (!DBA::isResult($contact)) { + notice(L10n::t('Suggested contact not found.') . EOL); return; } + $note = Strings::escapeHtml(trim(defaults($_POST, 'note', ''))); + $fields = ['uid' => local_user(),'cid' => $contact_id, 'name' => $contact['name'], 'url' => $contact['url'], 'request' => $contact['request'], - 'photo' => $contact['photo'], 'note' => $note, 'created' => DateTimeFormat::utcNow()]; + 'photo' => $contact['avatar'], 'note' => $note, 'created' => DateTimeFormat::utcNow()]; DBA::insert('fsuggest', $fields); Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', DBA::lastInsertId()); diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 921662a115..904e9904ef 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -319,7 +319,7 @@ class Delivery extends BaseObject $deliver_status = DFRN::deliver($owner, $contact, $atom, false, true); } - Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status); + Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => defaults($target_item, 'guid', $target_item['id']), 'return' => $deliver_status]); if ($deliver_status < 0) { Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]); -- 2.39.5