clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Response even more compatible ..

This commit is contained in:
Philipp 2022-01-03 20:18:43 +01:00
parent 37f850377e
commit 35a2fd45af
No known key found for this signature in database
GPG Key ID: 24A7501396EB5432
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Core/System.php
View File

@ -21,10 +21,9 @@
namespace Friendica\Core; namespace Friendica\Core;
use Exception;
use Friendica\App;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\DI; use Friendica\DI;
use Friendica\Module\Response;
use Friendica\Network\HTTPException\FoundException; use Friendica\Network\HTTPException\FoundException;
use Friendica\Network\HTTPException\MovedPermanentlyException; use Friendica\Network\HTTPException\MovedPermanentlyException;
use Friendica\Network\HTTPException\TemporaryRedirectException; use Friendica\Network\HTTPException\TemporaryRedirectException;
@ -292,11 +291,9 @@ class System
Logger::notice('xml_status returning non_zero: ' . $st . " message=" . $message); Logger::notice('xml_status returning non_zero: ' . $st . " message=" . $message);
} }
header("Content-type: text/xml"); DI::apiResponse()->setType(Response::TYPE_XML);
DI::apiResponse()->addContent(XML::fromArray(["result" => $result], $xml));
$xmldata = ["result" => $result]; DI::page()->exit(DI::apiResponse()->generate());
echo XML::fromArray($xmldata, $xml);
exit(); exit();
} }
@ -314,9 +311,9 @@ class System
if ($val >= 400) { if ($val >= 400) {
Logger::debug('Exit with error', ['code' => $val, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); Logger::debug('Exit with error', ['code' => $val, 'message' => $message, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
} }
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $message); DI::apiResponse()->setStatus($val, $message);
DI::apiResponse()->addContent($content);
DI::page()->exit(DI::apiResponse()->generate()); DI::page()->exit(DI::apiResponse()->generate());
echo $content;
exit(); exit();
} }
@ -326,7 +323,7 @@ class System
if ($httpCode >= 400) { if ($httpCode >= 400) {
Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']); Logger::debug('Exit with error', ['code' => $httpCode, 'content_type' => $content_type, 'callstack' => System::callstack(20), 'method' => DI::args()->getMethod(), 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '']);
} }
header($_SERVER["SERVER_PROTOCOL"] . ' ' . $httpCode); DI::apiResponse()->setStatus($httpCode);
self::jsonExit($data, $content_type); self::jsonExit($data, $content_type);
} }
@ -342,9 +339,9 @@ class System
* @param integer $options JSON options * @param integer $options JSON options
*/ */
public static function jsonExit($x, $content_type = 'application/json', int $options = 0) { public static function jsonExit($x, $content_type = 'application/json', int $options = 0) {
DI::apiResponse()->setType(Response::TYPE_JSON, $content_type);
DI::apiResponse()->addContent(json_encode($x, $options));
DI::page()->exit(DI::apiResponse()->generate()); DI::page()->exit(DI::apiResponse()->generate());
header("Content-type: $content_type");
echo json_encode($x, $options);
exit(); exit();
} }
@ -500,7 +497,7 @@ class System
*/ */
public static function htmlUpdateExit($o) public static function htmlUpdateExit($o)
{ {
header("Content-type: text/html"); DI::apiResponse()->setType(Response::TYPE_HTML);
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
// We can remove this hack once Internet Explorer recognises HTML5 natively // We can remove this hack once Internet Explorer recognises HTML5 natively
echo "<section>"; echo "<section>";

3
src/Module/Response.php
View File

@ -96,6 +96,9 @@ class Response implements ICanCreateResponses
} }
switch ($type) { switch ($type) {
case static::TYPE_HTML:
$content_type = $content_type ?? 'text/html';
break;
case static::TYPE_JSON: case static::TYPE_JSON:
$content_type = $content_type ?? 'application/json'; $content_type = $content_type ?? 'application/json';
break; break;