tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fixed contact suggestion

Browse source
This commit is contained in:
Michael 2019-05-19 08:54:26 +00:00
parent 7a13582c67
commit 14d4132ad0
1 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
mod/fsuggest.php
View file

@ -13,7 +13,7 @@ use Friendica\Util\Strings;
function fsuggest_post(App $a) function fsuggest_post(App $a)
{ {
if (! local_user()) { if (!local_user()) {
return; return;
} }
@ -22,53 +22,35 @@ function fsuggest_post(App $a)
} }
$contact_id = intval($a->argv[1]); $contact_id = intval($a->argv[1]);
if (empty($contact_id)) {
return;
}
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); $contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'photo'], ['id' => $contact_id, 'uid' => local_user()]);
if (! DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
notice(L10n::t('Contact not found.') . EOL); notice(L10n::t('Contact not found.') . EOL);
return; return;
} }
$new_contact = intval($_POST['suggest']);
$hash = Strings::getRandomHex();
$note = Strings::escapeHtml(trim(defaults($_POST, 'note', ''))); $note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
if ($new_contact) { $new_contact = intval($_POST['suggest']);
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", if (empty($new_contact)) {
intval($new_contact), return;
intval(local_user())
);
if (DBA::isResult($r)) {
q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
intval(local_user()),
intval($contact_id),
DBA::escape($contact['name']),
DBA::escape($contact['url']),
DBA::escape($contact['request']),
DBA::escape($contact['photo']),
DBA::escape($hash),
DBA::escape(DateTimeFormat::utcNow())
);
$r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
DBA::escape($hash),
intval(local_user())
);
if (DBA::isResult($r)) {
$fsuggest_id = $contact['id'];
q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
DBA::escape($note),
intval($fsuggest_id),
intval(local_user())
);
Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', $fsuggest_id);
}
info(L10n::t('Friend suggestion sent.') . EOL);
}
} }
if (!DBA::exists('contact', ['id' => $new_contact])) {
return;
}
$fields = ['uid' => local_user(),'cid' => $contact_id, 'name' => $contact['name'],
'url' => $contact['url'], 'request' => $contact['request'],
'photo' => $contact['photo'], 'note' => $note, 'created' => DateTimeFormat::utcNow()];
DBA::insert('fsuggest', $fields);
Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', DBA::lastInsertId());
info(L10n::t('Friend suggestion sent.') . EOL);
} }
function fsuggest_content(App $a) function fsuggest_content(App $a)