kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed bug where download would not be pushed as download.

Browse Source
This commit is contained in:
James Cole
2016-02-03 11:46:28 +01:00
parent 8f2d4494d5
commit aff8493204
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ use FireflyIII\Models\Attachment;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
use Input;
use Preferences;
use Request;
use Response;
use Session;
use URL;
@@ -25,7 +24,7 @@ class AttachmentController extends Controller
{
/**
* @codeCoverageIgnore
*
*/
public function __construct()
{
@@ -83,17 +82,17 @@ class AttachmentController extends Controller
$quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
Request::header('Content-Description: File Transfer');
Request::header('Content-Type: application/octet-stream');
Request::header('Content-Disposition: attachment; filename=' . $quoted);
Request::header('Content-Transfer-Encoding: binary');
Request::header('Connection: Keep-Alive');
Request::header('Expires: 0');
Request::header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
Request::header('Pragma: public');
Request::header('Content-Length: ' . $attachment->size);
return Crypt::decrypt(file_get_contents($file));
return response(Crypt::decrypt(file_get_contents($file)), 200)
->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted)
->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive')
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', $attachment->size);
} else {
abort(404);