friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

cleanup after refactor

This commit is contained in:
Friendika 2011-08-16 00:52:34 -07:00
parent c7197b99f9
commit 2c0404fdc8
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/diaspora.php
View File

@ -257,8 +257,8 @@ function diaspora_get_contact_by_handle($uid,$handle) {
function diaspora_request($importer,$xml) { function diaspora_request($importer,$xml) {
$sender_handle = $xml->sender_handle; $sender_handle = unxmlify($xml->sender_handle);
$recipient_handle = $xml->recipient_handle; $recipient_handle = unxmlify($xml->recipient_handle);
if(! $sender_handle || ! $recipient_handle) if(! $sender_handle || ! $recipient_handle)
return; return;
@ -303,21 +303,12 @@ function diaspora_request($importer,$xml) {
); );
// find the contact record we just created // find the contact record we just created
$contact_record = null;
if($r) { $contact_record = diaspora_get_contact_by_handle($importer['uid'],$sender_handle);
$r = q("SELECT `id` FROM `contact`
WHERE `uid` = %d AND `addr` = '%s' AND `poll` = '%s' LIMIT 1",
intval($importer['uid']),
$ret['addr'],
$ret['poll']
);
if(count($r))
$contact_record = $r[0];
}
$hash = random_string() . (string) time(); // Generate a confirm_key $hash = random_string() . (string) time(); // Generate a confirm_key
if(is_array($contact_record)) { if($contact_record) {
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`,`blocked`) $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`,`blocked`)
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s', 0 )", VALUES ( %d, %d, 1, %d, '%s', '%s', '%s', 0 )",
intval($importer['uid']), intval($importer['uid']),
@ -328,10 +319,8 @@ function diaspora_request($importer,$xml) {
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
} }
return; return;
} }
function diaspora_post($importer,$xml) { function diaspora_post($importer,$xml) {
@ -370,7 +359,6 @@ function diaspora_post($importer,$xml) {
); );
} }
$created = unxmlify($xml->created_at); $created = unxmlify($xml->created_at);
$private = ((unxmlify($xml->public) == 'false') ? 1 : 0); $private = ((unxmlify($xml->public) == 'false') ? 1 : 0);
@ -422,7 +410,6 @@ function diaspora_post($importer,$xml) {
return; return;
} }
function diaspora_comment($importer,$xml) { function diaspora_comment($importer,$xml) {