Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index da616ad5bb103ba16a7726a8fbff7135864f5ce5..5dcedb1aafdca58b6b8d0a01b58ed8611fe88155 100644 (file)
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -5,35 +5,37 @@ 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\DBM;
+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];
 
        // Fetch the item
-       $fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network'];
-       $condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+       $fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
+               'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach'];
+       $condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
        $item = Item::selectFirst($fields, $condition);
-       if (!DBM::is_result($item)) {
-               $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+       if (!DBA::isResult($item)) {
+               $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
                $item = Item::selectFirst(['author-link'], $condition);
-               if (DBM::is_result($item)) {
+               if (DBA::isResult($item)) {
                        $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");
@@ -42,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);