hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IE Download

Browse Source
This commit is contained in:
Romain Neutron
2012-10-18 16:41:59 +02:00
parent c042bdc2d6
commit c811a334ba
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Alchemy/Phrasea/Controller/Prod/Printer.php
View File

@@ -57,20 +57,11 @@ class Printer implements ControllerProviderInterface
} }
$PDF = new PDFExport($printer->get_elements(), $layout); $PDF = new PDFExport($printer->get_elements(), $layout);
/** $response = new Response($PDF->render(), 200, array('Content-Type' => 'application/pdf'));
* $response->headers->set('Pragma', 'public', true);
* Header "Pragma: public" SHOULD be present. $response->setMaxAge(0);
* In case it is not present, download on IE 8 and previous over HTTPS
* will fail.
*
* @todo : merge this shitty fix with Response object.
*
*/
if ( ! headers_sent()) {
header("Pragma: public");
}
return new Response($PDF->render(), 200, array('Content-Type' => 'application/pdf')); return $response;
} }
); );

17
lib/classes/set/export.class.php
View File

@@ -792,25 +792,18 @@ class set_export extends set_abstract
); );
$response->headers->set('X-Sendfile', $file); $response->headers->set('X-Sendfile', $file);
$response->headers->set('X-Accel-Redirect', $file_xaccel); $response->headers->set('X-Accel-Redirect', $file_xaccel);
$response->headers->set('Pragma', 'public', true); $response->headers->set('Pragma', 'public', true);
$response->setMaxAge(0);
$response->headers->set('Content-Type', $mime); $response->headers->set('Content-Type', $mime);
$response->headers->set('Content-Length', filesize($file)); $response->headers->set('Content-Length', filesize($file));
$response->headers->set('Content-Disposition', $headerDisposition); $response->headers->set('Content-Disposition', $headerDisposition);
return $response; return $response;
} else { } else {
/** $response->headers->set('Pragma', 'public', true);
* $response->setMaxAge(0);
* Header "Pragma: public" SHOULD be present.
* In case it is not present, download on IE 8 and previous over HTTPS
* will fail.
*
* @todo : merge this shitty fix with Response object.
*
*/
if ( ! headers_sent()) {
header("Pragma: public");
}
$response->headers->set('Content-Type', $mime); $response->headers->set('Content-Type', $mime);
$response->headers->set('Content-Length', filesize($file)); $response->headers->set('Content-Length', filesize($file));

3
tests/Alchemy/Phrasea/Controller/Prod/PrinterTest.php
View File

@@ -72,6 +72,9 @@ class ControllerPrinterTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
$this->assertEquals("application/pdf", $response->headers->get("content-type")); $this->assertEquals("application/pdf", $response->headers->get("content-type"));
$this->assertTrue($response->isOk()); $this->assertTrue($response->isOk());
$this->assertEquals(0, $response->getMaxAge());
$this->assertTrue($response->headers->has('pragma'));
$this->assertEquals('public', $response->headers->get('pragma'));
} }
} }
} }