Merge pull request #7101 from nupplaphil/task/mod_viewsrc

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index 6723a77e9d106d269ce3a8f5d373f11633fc1553..fa5b2e1962d3d0df161315f6010a4074d52f3f64 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -20,6 +20,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Module\Objects;
+use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Strings;
@@ -36,20 +37,6 @@ function display_init(App $a)
 
        $nick = (($a->argc > 1) ? $a->argv[1] : '');
 
-       if ($a->argc == 3) {
-               if (substr($a->argv[2], -5) == '.atom') {
-                       $item_id = substr($a->argv[2], 0, -5);
-                       displayShowFeed($item_id, false);
-               }
-       }
-
-       if ($a->argc == 4) {
-               if ($a->argv[3] == 'conversation.atom') {
-                       $item_id = $a->argv[2];
-                       displayShowFeed($item_id, true);
-               }
-       }
-
        $item = null;
        $item_user = local_user();
 
@@ -81,12 +68,20 @@ function display_init(App $a)
                if (!DBA::isResult($item)) {
                        $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [0, 2], 'uid' => 0]);
                }
-       } elseif (($a->argc == 3) && ($nick == 'feed-item')) {
-               $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => [0, 2], 'uid' => 0]);
+       } elseif ($a->argc >= 3 && $nick == 'feed-item') {
+               $item_id = $a->argv[2];
+               if (substr($item_id, -5) == '.atom') {
+                       $item_id = substr($item_id, 0, -5);
+               }
+               $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item_id, 'private' => [0, 2], 'uid' => 0]);
        }
 
        if (!DBA::isResult($item)) {
-               System::httpExit(404);
+               return;
+       }
+
+       if ($a->argc >= 3 && $nick == 'feed-item') {
+               displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
        }
 
        if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
@@ -206,8 +201,7 @@ function display_fetchauthor($a, $item)
 function display_content(App $a, $update = false, $update_uid = 0)
 {
        if (Config::get('system','block_public') && !local_user() && !remote_user()) {
-               notice(L10n::t('Public access denied.') . EOL);
-               return;
+               throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
        }
 
        $o = '';
@@ -260,7 +254,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        }
 
        if (!$item_id) {
-               System::httpExit(404);
+               throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
        }
 
        // We are displaying an "alternate" link if that post was public. See issue 2864
@@ -309,8 +303,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
 
        if (!empty($a->profile['hidewall']) && !$is_owner && !$is_remote_contact) {
-               notice(L10n::t('Access to this profile has been restricted.') . EOL);
-               return;
+               throw new HTTPException\ForbiddenException(L10n::t('Access to this profile has been restricted.'));
        }
 
        // We need the editor here to be able to reshare an item.
@@ -346,7 +339,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
        $item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
        if (!DBA::isResult($item)) {
-               System::httpExit(404);
+               throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
        }
 
        $item['uri'] = $item['parent-uri'];
@@ -421,7 +414,7 @@ function displayShowFeed($item_id, $conversation)
 {
        $xml = DFRN::itemFeed($item_id, $conversation);
        if ($xml == '') {
-               System::httpExit(500);
+               throw new HTTPException\InternalServerErrorException(L10n::t('The feed for this item is unavailable.'));
        }
        header("Content-type: application/atom+xml");
        echo $xml;