diff options
| author | Michael <icarus@dabo.de> | 2012-02-20 01:53:22 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-20 01:53:22 +0100 |
| commit | 0fb22e1284c0510a0d009e34b7a1aa31ef6be052 (patch) | |
| tree | cd3b4aa3b824587eb0b271d9a51b4311171af966 /include/api.php | |
| parent | b6d7777226517dc22745bc3d78b827b0175bcb16 (diff) | |
| download | volse-hubzilla-0fb22e1284c0510a0d009e34b7a1aa31ef6be052.tar.gz volse-hubzilla-0fb22e1284c0510a0d009e34b7a1aa31ef6be052.tar.bz2 volse-hubzilla-0fb22e1284c0510a0d009e34b7a1aa31ef6be052.zip | |
API is now working on my nginx server.
Diffstat (limited to 'include/api.php')
| -rwxr-xr-x | include/api.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/include/api.php b/include/api.php index 7b8709659..a621f1aa7 100755 --- a/include/api.php +++ b/include/api.php @@ -99,6 +99,10 @@ **************************/ function api_call(&$a){ GLOBAL $API, $called_api; + + // preset + $type="json"; + foreach ($API as $p=>$info){ if (strpos($a->query_string, $p)===0){ $called_api= explode("/",$p); @@ -109,14 +113,14 @@ load_contact_links(local_user()); - logger('API call for ' . $a->user['username'] . ': ' . $a->query_string); + logger('API call for ' . $a->user['username'] . ': ' . $a->query_string); logger('API parameters: ' . print_r($_REQUEST,true)); - $type="json"; + $type="json"; if (strpos($a->query_string, ".xml")>0) $type="xml"; if (strpos($a->query_string, ".json")>0) $type="json"; if (strpos($a->query_string, ".rss")>0) $type="rss"; - if (strpos($a->query_string, ".atom")>0) $type="atom"; - + if (strpos($a->query_string, ".atom")>0) $type="atom"; + $r = call_user_func($info['func'], $a, $type); if ($r===false) return; @@ -126,8 +130,8 @@ header ("Content-Type: text/xml"); return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; break; - case "json": - //header ("Content-Type: application/json"); + case "json": + //header ("Content-Type: application/json"); foreach($r as $rr) return json_encode($rr); break; @@ -139,7 +143,7 @@ header ("Content-Type: application/atom+xml"); return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; break; - + } //echo "<pre>"; var_dump($r); die(); } @@ -150,8 +154,8 @@ header ("Content-Type: text/xml"); return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; break; - case "json": - header ("Content-Type: application/json"); + case "json": + header ("Content-Type: application/json"); return json_encode(array('error' => 'not implemented')); break; case "rss": @@ -162,7 +166,6 @@ header ("Content-Type: application/atom+xml"); return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r; break; - } } |