IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attachment download (issue #193)

Browse Source
This commit is contained in:
James Cole 2016-02-25 14:53:26 +01:00
parent bcaca0eca3
commit 69a8cad47b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/AttachmentController.php
View File

@ -14,6 +14,7 @@ use Input;
use Preferences; use Preferences;
use Response; use Response;
use Session; use Session;
use Storage;
use URL; use URL;
use View; use View;
@ -79,14 +80,16 @@ class AttachmentController extends Controller
*/ */
public function download(Attachment $attachment, AttachmentHelperInterface $helper) public function download(Attachment $attachment, AttachmentHelperInterface $helper)
{ {
// create a disk.
$disk = Storage::disk('upload');
$file = $attachment->fileName();
$file = $helper->getAttachmentLocation($attachment); if ($disk->exists($file)) {
if (file_exists($file)) {
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\')); $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
return response(Crypt::decrypt(file_get_contents($file)), 200) return response(Crypt::decrypt($disk->get($file)), 200)
->header('Content-Description', 'File Transfer') ->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream') ->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted) ->header('Content-Disposition', 'attachment; filename=' . $quoted)
@ -95,7 +98,7 @@ class AttachmentController extends Controller
->header('Expires', '0') ->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public') ->header('Pragma', 'public')
->header('Content-Length', $attachment->size); ->header('Content-Length', $disk->size($file));
} }
throw new FireflyException('Could not find the indicated attachment. The file is no longer there.'); throw new FireflyException('Could not find the indicated attachment. The file is no longer there.');