X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffetch.php;h=5dcedb1aafdca58b6b8d0a01b58ed8611fe88155;hb=fc87c51bb4620762590b291a9617f3ee44ec8609;hp=4e7d8c751afc43dde451e77608321dcc4c40acbc;hpb=79d36b932b9e23c9054a3952ca8aaf5697ca52c8;p=friendica.git diff --git a/mod/fetch.php b/mod/fetch.php index 4e7d8c751a..5dcedb1aaf 100644 --- a/mod/fetch.php +++ b/mod/fetch.php @@ -10,6 +10,7 @@ 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; @@ -17,8 +18,7 @@ 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]; @@ -35,7 +35,7 @@ function fetch_init(App $a) $parts = parse_url($item["author-link"]); $host = $parts["scheme"]."://".$parts["host"]; - if (normalise_link($host) != normalise_link(System::baseUrl())) { + if (Strings::normaliseLink($host) != Strings::normaliseLink(System::baseUrl())) { $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid); header("HTTP/1.1 301 Moved Permanently"); @@ -44,15 +44,13 @@ function fetch_init(App $a) } } - 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);