aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-01 05:13:59 -0700
committerFriendika <info@friendika.com>2011-08-01 05:13:59 -0700
commit326a873082cd9f31f70bfb703ad2c3e7fde19bb8 (patch)
treedb431ba643a675b097651b6e77aecd7f1e00153d /include
parent823d7ba42ac619010fa786936ad625461e27e56d (diff)
downloadvolse-hubzilla-326a873082cd9f31f70bfb703ad2c3e7fde19bb8.tar.gz
volse-hubzilla-326a873082cd9f31f70bfb703ad2c3e7fde19bb8.tar.bz2
volse-hubzilla-326a873082cd9f31f70bfb703ad2c3e7fde19bb8.zip
merge diaspora/friendika vcard formats - not yet complete
Diffstat (limited to 'include')
-rw-r--r--include/api.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php
index 7b3dd866c..c77c55cef 100644
--- a/include/api.php
+++ b/include/api.php
@@ -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