mirror of
https://github.com/friendica/friendica
synced 2024-11-13 01:42:59 +00:00
friend request homecoming - ensure login redirects back to confirmation page,
prune old introductions that remain blocked over 30 minutes.
This commit is contained in:
parent
502d59089b
commit
ffbdad7041
1 changed files with 24 additions and 1 deletions
|
@ -245,6 +245,29 @@ function dfrn_request_post(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* Cleanup old introductions that remain blocked.
|
||||||
|
* Also remove the contact record, but only if there is no existing relationship
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
$r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel`
|
||||||
|
FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id`
|
||||||
|
WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ");
|
||||||
|
if(count($r)) {
|
||||||
|
foreach($r as ($rr) {
|
||||||
|
if(! $rr['rel']) {
|
||||||
|
q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($rr['cid'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($rr['iid'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$url = trim($_POST['dfrn_url']);
|
$url = trim($_POST['dfrn_url']);
|
||||||
if(! strlen($url)) {
|
if(! strlen($url)) {
|
||||||
notice( t("Invalid locator") . EOL );
|
notice( t("Invalid locator") . EOL );
|
||||||
|
|
Loading…
Reference in a new issue