Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upFileResponse: send response either as attachment or inline #11
Conversation
| @@ -33,6 +33,9 @@ class FileResponse extends Nette\Object implements Nette\Application\IResponse | |||
| /** @var bool */ | |||
| public $resuming = TRUE; | |||
|
|
|||
| /** @var bool */ | |||
| private $contentDispositionAttachment = TRUE; | |||
This comment has been minimized.
This comment has been minimized.
|
I would add it as 4th constructor parameter as well, defaulting to TRUE and remove setter. |
| */ | ||
| public function setContentDispositionAttachment($attachment = TRUE) | ||
| { | ||
| return $this->contentDispositionAttachment = $attachment; |
This comment has been minimized.
This comment has been minimized.
Majkl578
May 31, 2014
Contributor
Setters in Nette usually return $this so they provide fluent behavior.
This comment has been minimized.
This comment has been minimized.
| * Sends response to output. | ||
| * @return void | ||
| */ | ||
| public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse) | ||
| { | ||
| $contentDisposition = $this->contentDispositionAttachment ? 'attachment' : 'inline'; |
This comment has been minimized.
This comment has been minimized.
| $httpResponse->setContentType($this->contentType); | ||
| $httpResponse->setHeader('Content-Disposition', 'attachment; filename="' . $this->name . '"'); | ||
| $httpResponse->setHeader('Content-Disposition', $contentDisposition . '; filename="' . $this->name . '"'); |
This comment has been minimized.
This comment has been minimized.
Majkl578
May 31, 2014
Contributor
You can write it directly e.g. like this:
$httpResponse->setHeader('Content-Disposition', ($this->forceDownload ? 'attachment' : 'inline') . '; filename="' . $this->name . '"');Or split it to more lines if it gets too long.
This comment has been minimized.
This comment has been minimized.
honzalilak
May 31, 2014
Author
Yeah, I was thinking about this, but I found your solution little bit less readable. But you are right that when the line is divided into two it wont be a problem. Will rewrite it.
|
|
||
| Assert::same( $origData, ob_get_clean() ); | ||
| Assert::same('inline; filename="' . $fileName . '"', $response->getHeader('Content-Disposition')); | ||
| }); |
This comment has been minimized.
This comment has been minimized.
FileResponse: send response either as attachment or inline FileResponse: send response either as attachment or inline FileResponse: send response as attachment or inline
|
Guys thanks a lot for your feedback! I followed the contribution guide, changed the code and forced-pushed changes here. The only problem I see is the missing line at the end of the file with tests. I can see it in my local version. I will check the settings of git, maybe it is cutting them? Or do you have any ideas? |
FileResponse: send response either as attachment or inline
honzalilak commentedMay 31, 2014
This pull requests allows files in response being sent directly into browser instead of forcing them to be downloaded - this is especially helpful when there is a need to show e.g. pdf files directly in the browser window. See related issue nette/nette#1410.
As proposed in the contribution guide http://nette.org/en/contributing, I am adding following information:
I am really a newbie. I will appreciate if you provide me with some explaining comments in case you find this pull request as not acceptable. Thanks a lot!