Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 09:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge diaspora/friendika vcard formats - not yet complete

Browse source
This commit is contained in:
Friendika 2011-08-01 05:13:59 -07:00
parent 823d7ba42a
commit 326a873082
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/api.php
View file

@ -114,6 +114,7 @@
load_contact_links(local_user());
logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
logger('API parameters: ' . print_r($_REQUEST,true));
$type="json";
if (strpos($a->query_string, ".xml")>0) $type="xml";
if (strpos($a->query_string, ".json")>0) $type="json";
@ -220,7 +221,7 @@
}
}
if ($user==='') {
if (! $user) {
if (local_user()===false) {
api_login($a); return False;
} else {
@ -230,7 +231,7 @@
}
logger('api_user: ' . $extra_query . ' ' , $user);
// user info
$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `contact`
WHERE 1