Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()

[friendica.git] / src / Module / Attach.php

diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index 24e0edc5552ad774d7187573249835acd31474b7..fab1be2d5812a8b45592d1d8f757efa4a1cb8b69 100644 (file)
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -10,6 +10,7 @@ use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Model\Attach as MAttach;
 
 /**
@@ -20,11 +21,11 @@ class Attach extends BaseModule
        /**
         * @brief Return to user an attached file given the id
         */
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
                if ($a->argc != 2) {
-                       System::httpExit(400); // Bad Request.
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
 
                // @TODO: Replace with parameter from router
@@ -33,19 +34,19 @@ class Attach extends BaseModule
                // Check for existence
                $item = MAttach::exists(['id' => $item_id]);
                if ($item === false) {
-                       System::httpExit(404, ['description' => L10n::t('Item was not found.')]);
+                       throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('Item was not found.'));
                }
 
                // Now we'll fetch the item, if we have enough permisson
                $item = MAttach::getByIdWithPermission($item_id);
                if ($item === false) {
-                       System::httpExit(403, ['description' => L10n::t('Permission denied.')]);
+                       throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Permission denied.'));
                }
 
                $data = MAttach::getData($item);
                if (is_null($data)) {
                        Logger::log('NULL data for attachment with id ' . $item['id']);
-                       System::httpExit(404, ['description' => L10n::t('Item was not found.')]);
+                       throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('Item was not found.'));
                }
 
                // Use quotes around the filename to prevent a "multiple Content-Disposition"