X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAttach.php;h=bd785881c3d067a9a36cdfb0a17bf2ae7b84740c;hb=c18bda9397d0ea9d68ea7a81e6292459317fdbf5;hp=dd4e368058b7c3583424dfed3122aef629f789d1;hpb=854cc3e47296d4a1b01b893376064cf254d84f79;p=friendica.git

diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index dd4e368058..bd785881c3 100644
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -1,51 +1,64 @@
 <?php
 /**
- * @file src/Module/Attach.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
-
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Model\Attach as MAttach;
 
 /**
- * @brief Attach Module
+ * Attach Module
  */
 class Attach extends BaseModule
 {
 	/**
-	 * @brief Return to user an attached file given the id
+	 * Return to user an attached file given the id
 	 */
-	public static function rawContent()
+	protected function rawContent(array $request = [])
 	{
-		$a = self::getApp();
-		if ($a->argc != 2) {
-			System::httpExit(400); // Bad Request.
+		$a = DI::app();
+		if (empty($this->parameters['item'])) {
+			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
-	
 
-		$item_id = intval($a->argv[1]);
-		
+		$item_id = intval($this->parameters['item']);
+
 		// 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(DI::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(DI::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.')]);
+			Logger::notice('NULL data for attachment with id ' . $item['id']);
+			throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('Item was not found.'));
 		}
 
 		// Use quotes around the filename to prevent a "multiple Content-Disposition"