clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

firend request homecoming - ensure login redirects back to confirmation page, 

prune old introductions that remain blocked over 30 minutes.
This commit is contained in:
Friendika 2011-01-07 00:24:08 -08:00
parent 502d59089b
commit fb736b984d
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mod/dfrn_request.php
View File

@ -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']);
if(! strlen($url)) {
notice( t("Invalid locator") . EOL );
@ -456,7 +479,7 @@ function dfrn_request_content(&$a) {
/* setup the return URL to come back to this page if they use openid */
$stripped = str_replace('q=','',$a->query_string);
$_SESSION['return_url'] = trim($stripped,'/');
$_SESSION['return_url'] = trim($stripped,'/');
return login();
}