Group selection: Respect "pubmail" and ignore atchived or blocked contacts

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

diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index dd4e368058b7c3583424dfed3122aef629f789d1..f67104015d768622e2740b56517443b71915ca55 100644 (file)
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -8,8 +8,8 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Model\Attach as MAttach;
 
 /**
@@ -20,32 +20,32 @@ 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();
                if ($a->argc != 2) {
-                       System::httpExit(400); // Bad Request.
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
-       
 
+               // @TODO: Replace with parameter from router
                $item_id = intval($a->argv[1]);
                
                // 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"