X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FApi%2FApiResponse.php;h=b5b2a4717c45bf9a25c9a34c15a1463aff8d5769;hb=53aba7b37e019d4093d0985e394d393ae77ef0df;hp=960ce3d2cb67460157939e99eaf9f6506a056454;hpb=21f3a56c424a85fbfea023e577e24420d960cdb3;p=friendica.git diff --git a/src/Module/Api/ApiResponse.php b/src/Module/Api/ApiResponse.php index 960ce3d2cb..b5b2a4717c 100644 --- a/src/Module/Api/ApiResponse.php +++ b/src/Module/Api/ApiResponse.php @@ -1,6 +1,6 @@ $data2]; - return XML::fromArray($data3, $xml, false, $namespaces); + return XML::fromArray($data3, $dummy, false, $namespaces); } /** @@ -107,6 +107,7 @@ class ApiResponse extends Response * * @param array $arr Array to be passed to template * @param int $cid Contact ID of template + * * @return array */ private function addRSSValues(array $arr, int $cid): array @@ -149,6 +150,7 @@ class ApiResponse extends Response case 'atom': case 'xml': return $this->createXML($data, $root_element); + case 'json': default: return $data; @@ -219,6 +221,7 @@ class ApiResponse extends Response case 'xml': $this->setType(static::TYPE_XML); break; + case 'json': $this->setType(static::TYPE_JSON); if (!empty($return)) { @@ -229,9 +232,11 @@ class ApiResponse extends Response $return = $json; } break; + case 'rss': $this->setType(static::TYPE_RSS); break; + case 'atom': $this->setType(static::TYPE_ATOM); break; @@ -271,9 +276,8 @@ class ApiResponse extends Response 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'request' => $request, ]); - $error = $this->l10n->t('API endpoint %s %s is not implemented', strtoupper($method), $path); - $error_description = $this->l10n->t('The API endpoint is currently not implemented but might be in the future.'); + $error = $this->l10n->t('API endpoint %s %s is not implemented but might be in the future.', strtoupper($method), $path); - $this->exit('error', ['error' => ['error' => $error, 'error_description' => $error_description]]); + $this->error(501, 'Not Implemented', $error); } }