eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Attachment] Sometimes we can't provide download of original file

This commit is contained in:
Diogo Peralta Cordeiro 2021-08-12 04:58:34 +01:00
parent 3019048585
commit daaf7ea236
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Controller/Attachment.php
View File

@ -90,12 +90,22 @@ class Attachment extends Controller
*/
public function attachment_view(Request $request, int $id)
{
return $this->attachment($id, fn (array $res) => GSFile::sendFile($res['filepath'], $res['mimetype'], GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'], HeaderUtils::DISPOSITION_INLINE));
return $this->attachment($id, function (array $res) {
if (!array_key_exists('filepath', $res)) {
throw new ServerException('This attachment is not stored locally.');
}
return GSFile::sendFile($res['filepath'], $res['mimetype'], GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'], HeaderUtils::DISPOSITION_INLINE);
});
}
public function attachment_download(Request $request, int $id)
{
return $this->attachment($id, fn (array $res) => GSFile::sendFile($res['filepath'], $res['mimetype'], GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'], HeaderUtils::DISPOSITION_ATTACHMENT));
return $this->attachment($id, function (array $res) {
if (!array_key_exists('filepath', $res)) {
throw new ServerException('This attachment is not stored locally.');
}
return GSFile::sendFile($res['filepath'], $res['mimetype'], GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'], HeaderUtils::DISPOSITION_ATTACHMENT);
});
}
/**

8
src/Core/GSFile.php
View File

@ -133,7 +133,7 @@ class GSFile
}
return $response;
} else {
throw new ServerException(_m('This attachment is not stored locally'));
throw new ServerException(_m('This attachment is not stored locally.'));
}
}
@ -186,8 +186,10 @@ class GSFile
*/
public static function getAttachmentFileInfo(int $id): array
{
$res = self::getFileInfo($id);
$res['filepath'] = Common::config('attachments', 'dir') . $res['filename'];
$res = self::getFileInfo($id);
if (!is_null($res['filename'])) {
$res['filepath'] = Common::config('attachments', 'dir') . $res['filename'];
}
return $res;
}