X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAttach.php;h=b70e4342976e52259f2de84dd510eb04df581212;hb=96d2cddb54f3ea3ead6e43e5ca1f814ed6327987;hp=bad97b5736d7440b66c7f86bd9db3c5003ffdcfd;hpb=0a4119adaf6294bf43d135a0f435c1dd677c50e0;p=friendica.git

diff --git a/src/Module/Attach.php b/src/Module/Attach.php
index bad97b5736..b70e434297 100644
--- a/src/Module/Attach.php
+++ b/src/Module/Attach.php
@@ -1,13 +1,27 @@
 <?php
 /**
- * @file src/Module/Attach.php
+ * @copyright Copyright (C) 2010-2023, 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\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -21,32 +35,30 @@ class Attach extends BaseModule
 	/**
 	 * Return to user an attached file given the id
 	 */
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
-		$a = DI::app();
-		if ($a->argc != 2) {
+		if (empty($this->parameters['item'])) {
 			throw new \Friendica\Network\HTTPException\BadRequestException();
 		}
 
-		// @TODO: Replace with parameter from router
-		$item_id = intval($a->argv[1]);
-		
+		$item_id = intval($this->parameters['item']);
+
 		// Check for existence
 		$item = MAttach::exists(['id' => $item_id]);
 		if ($item === false) {
-			throw new \Friendica\Network\HTTPException\NotFoundException(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
+		// Now we'll fetch the item, if we have enough permission
 		$item = MAttach::getByIdWithPermission($item_id);
 		if ($item === false) {
-			throw new \Friendica\Network\HTTPException\ForbiddenException(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']);
-			throw new \Friendica\Network\HTTPException\NotFoundException(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"
@@ -60,7 +72,7 @@ class Attach extends BaseModule
 		}
 
 		echo $data;
-		exit();
+		System::exit();
 		// NOTREACHED
 	}
 }