1
1
Fork 0
This commit is contained in:
Friendika 2011-08-18 22:01:35 -07:00
parent 9167b2057b
commit 0a0c5013ce

View file

@ -318,14 +318,14 @@ function diaspora_request($importer,$xml) {
return; return;
} }
require_once('include/Scrape.php'); $ret = find_diaspora_person_by_handle($sender_handle);
$ret = probe_url($sender_handle);
if((! count($ret)) || ($ret['network'] != NETWORK_DIASPORA)) { if((! count($ret)) || ($ret['network'] != NETWORK_DIASPORA)) {
logger('diaspora_request: Cannot resolve diaspora handle ' . $sender_handle . ' for ' . $recipient_handle); logger('diaspora_request: Cannot resolve diaspora handle ' . $sender_handle . ' for ' . $recipient_handle);
return; return;
} }
dbg(1);
$r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`) $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
VALUES ( %d, '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ", VALUES ( %d, '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
intval($importer['uid']), intval($importer['uid']),
@ -360,7 +360,7 @@ function diaspora_request($importer,$xml) {
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
} }
dbg(0);
return; return;
} }