diff options
| author | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
| commit | 31376de0665091f2dba04755562ccd238d57a13c (patch) | |
| tree | ae59c8697b9fd20c33aeaf8acb3a698b63e9657b /include/api.php | |
| parent | c854f8c238da2df08b52249142ad24ef66e422d1 (diff) | |
| parent | 50c16c394fe2d966c62d30930600212a4e33303e (diff) | |
| download | volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.gz volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.bz2 volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php index 2505def4c..9fe2ef47d 100644 --- a/include/api.php +++ b/include/api.php @@ -197,7 +197,10 @@ require_once('include/items.php'); case "json": header ("Content-Type: application/json"); foreach($r as $rr) - return json_encode($rr); + $json = json_encode($rr); + if ($_GET['callback']) + $json = $_GET['callback']."(".$json.")"; + return $json; break; case "rss": header ("Content-Type: application/rss+xml"); @@ -618,7 +621,19 @@ require_once('include/items.php'); api_register_func('api/red/group','api_group', true); + function api_red_xchan(&$a,$type) { + if(api_user() === false) + return false; + require_once('include/hubloc.php'); + if($_SERVER['request_method'] === 'POST') { + $r = xchan_store($_REQUEST); + } + $r = xchan_fetch($_REQUEST); + json_return_and_die($r); + }; + api_register_func('api/red/xchan','api_red_xchan',true); + function api_statuses_mediap(&$a, $type) { if (api_user() === false) { |