X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=c18b1670d0ff41642192145912fe3fa1c63469fe;hb=6e7bd68ebb027b90398eee4fcc3bd73912a881e3;hp=b3033c0aa22d0fe8586dd61f9f6496d824a4b9c6;hpb=01daaafc92d09f042ae3f881bf97606c449f6d3e;p=friendica.git diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index b3033c0aa2..c18b1670d0 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -70,19 +70,19 @@ function dfrn_request_post(&$a) { $confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : ""); $hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0); $contact_record = null; - + if(x($dfrn_url)) { /** * Lookup the contact based on their URL (which is the only unique thing we have at the moment) */ - + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1", intval(local_user()), dbesc($dfrn_url), dbesc(normalise_link($dfrn_url)) ); - + if(count($r)) { if(strlen($r[0]['dfrn-id'])) { @@ -96,21 +96,21 @@ function dfrn_request_post(&$a) { else $contact_record = $r[0]; } - + if(is_array($contact_record)) { - $r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d", intval($aes_allow), intval($hidden), intval($contact_record['id']) ); } else { - + /** * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo */ - require_once('Scrape.php'); + require_once('include/Scrape.php'); $parms = scrape_dfrn($dfrn_url); @@ -283,11 +283,11 @@ function dfrn_request_post(&$a) { if(count($r)) { foreach($r as $rr) { if(! $rr['rel']) { - q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1", + q("DELETE FROM `contact` WHERE `id` = %d", intval($rr['cid']) ); } - q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", + q("DELETE FROM `intro` WHERE `id` = %d", intval($rr['iid']) ); } @@ -298,9 +298,9 @@ function dfrn_request_post(&$a) { * Cleanup any old email intros - which will have a greater lifetime */ - $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` + $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 + WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 AND `contact`.`network` = '%s' AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ", dbesc(NETWORK_MAIL2) @@ -308,11 +308,11 @@ function dfrn_request_post(&$a) { if(count($r)) { foreach($r as $rr) { if(! $rr['rel']) { - q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1", + q("DELETE FROM `contact` WHERE `id` = %d", intval($rr['cid']) ); } - q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", + q("DELETE FROM `intro` WHERE `id` = %d", intval($rr['iid']) ); } @@ -358,6 +358,7 @@ function dfrn_request_post(&$a) { intval($uid) ); if(! count($r)) { + notice( t('This account has not been configured for email. Request failed.') . EOL); return; } @@ -405,7 +406,7 @@ function dfrn_request_post(&$a) { `uri-date` = '%s', `avatar-date` = '%s', `hidden` = 0, - WHERE `id` = %d LIMIT 1 + WHERE `id` = %d ", dbesc($photos[0]), dbesc($photos[1]), @@ -454,7 +455,7 @@ function dfrn_request_post(&$a) { logger('dfrn_request: url: ' . $url); if(! strlen($url)) { - notice( t("Unable to resolve your name at the provided location.") . EOL); + notice( t("Unable to resolve your name at the provided location.") . EOL); return; } @@ -485,7 +486,7 @@ function dfrn_request_post(&$a) { if(is_array($contact_record)) { // There is a contact record but no issued-id, so this // is a reciprocal introduction from a known contact - $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d", dbesc($issued_id), intval($contact_record['id']) ); @@ -504,7 +505,7 @@ function dfrn_request_post(&$a) { } - require_once('Scrape.php'); + require_once('include/Scrape.php'); $parms = scrape_dfrn(($hcard) ? $hcard : $url); @@ -554,17 +555,17 @@ function dfrn_request_post(&$a) { ); // find the contact record we just created - if($r) { - $r = q("SELECT `id` FROM `contact` + if($r) { + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1", intval($uid), $parms['url'], $parms['issued-id'] ); - if(count($r)) + if(count($r)) $contact_record = $r[0]; } - + } if($r === false) { notice( t('Failed to update contact record.') . EOL ); @@ -572,7 +573,7 @@ function dfrn_request_post(&$a) { } $hash = random_string() . (string) time(); // Generate a confirm_key - + if(is_array($contact_record)) { $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`) VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )", @@ -616,7 +617,7 @@ function dfrn_request_post(&$a) { * */ - $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url); + $url = str_replace('{uri}', $a->get_baseurl() . '/profile/' . $nickname, $url); goaway($url); // NOTREACHED // END $network === NETWORK_OSTATUS @@ -700,7 +701,7 @@ function dfrn_request_content(&$a) { if(count($r)) { if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP)) - $auto_confirm = true; + $auto_confirm = true; if(! $auto_confirm) { require_once('include/enotify.php'); @@ -740,7 +741,7 @@ function dfrn_request_content(&$a) { // If we are auto_confirming, this record will have already been nuked // in dfrn_confirm_post() - $r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1", + $r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s'", dbesc($_GET['confirm_key']) ); }