X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=3e9c4e662671ee4422de37a0c59e37d22d0506d0;hb=182058943ff479b1052bf5ff95595cb60b660eb1;hp=9336c140475ef0b0b8edc102c9e5f07aa6aa59e7;hpb=d4a02dc31408210ab9f67ecac1948dc22b95b8da;p=friendica.git diff --git a/mod/fetch.php b/mod/fetch.php index 9336c14047..3e9c4e6626 100644 --- a/mod/fetch.php +++ b/mod/fetch.php @@ -4,22 +4,19 @@ This file is part of the Diaspora protocol. It is used for fetching single publi */ use Friendica\App; -use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Protocol\Diaspora; use Friendica\Model\Item; use Friendica\Model\User; use Friendica\Util\Strings; -use Friendica\Util\XML; use Friendica\Database\DBA; function fetch_init(App $a) { if (($a->argc != 3) || (!in_array($a->argv[1], ["post", "status_message", "reshare"]))) { - header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found')); - killme(); + System::httpExit(404); } $guid = $a->argv[2]; @@ -41,19 +38,17 @@ function fetch_init(App $a) header("HTTP/1.1 301 Moved Permanently"); header("Location:".$location); - killme(); + exit(); } } - header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found')); - killme(); + System::httpExit(404); } // Fetch some data from the author (We could combine both queries - but I think this is more readable) $user = User::getOwnerDataById($item["uid"]); if (!$user) { - header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found')); - killme(); + System::httpExit(404); } $status = Diaspora::buildStatus($item, $user); @@ -63,5 +58,5 @@ function fetch_init(App $a) header("Content-Type: application/magic-envelope+xml; charset=utf-8"); echo Diaspora::buildMagicEnvelope($xml, $user); - killme(); + exit(); }