TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish export handle

Browse Source 
modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
This commit is contained in:
Benjamin Perche
2014-07-15 10:19:52 +02:00
parent 4d5461bd08
commit 994eaed7e1
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Controller/Admin/ImportExportController.php
View File

@@ -117,8 +117,10 @@ class ImportExportController extends BaseAdminController
$formattedContent = $formatter->encode($data); $formattedContent = $formatter->encode($data);
$filename = $formatter::FILENAME . "." . $formatter->getExtension();
if (!$boundForm->get("do_compress")->getData()) { if (!$boundForm->get("do_compress")->getData()) {
$filename = $formatter::FILENAME . "." . $formatter->getExtension();
return new Response( return new Response(
$formattedContent, $formattedContent,
@@ -153,12 +155,8 @@ class ImportExportController extends BaseAdminController
} }
} }
/**
* Then add the export file
*/
$archiveBuilder->addFileFromString( $archiveBuilder->addFileFromString(
$formattedContent, $formattedContent, $filename
$formatter::FILENAME . "." . $formatter->getExtension()
); );
return $archiveBuilder->buildArchiveResponse($formatter::FILENAME); return $archiveBuilder->buildArchiveResponse($formatter::FILENAME);

4
core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
View File

@@ -238,8 +238,6 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
*/ */
public function buildArchiveResponse($filename) public function buildArchiveResponse($filename)
{ {
$this->tar->setMetadata("Generated by Thelia v" . Thelia::THELIA_VERSION);
if (!is_file($this->cacheFile)) { if (!is_file($this->cacheFile)) {
$this->throwFileNotFound($this->cacheFile); $this->throwFileNotFound($this->cacheFile);
} }
@@ -262,7 +260,7 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
200, 200,
[ [
"Content-Type" => $this->getMimeType(), "Content-Type" => $this->getMimeType(),
"Content-Disposition" => $filename . "." . $this->getExtension(), "Content-Disposition" => "attachment; filename=\"".$filename . "." . $this->getExtension() ."\"",
] ]
); );
} }

2
core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
View File

@@ -332,7 +332,7 @@ class ZipArchiveBuilder extends AbstractArchiveBuilder
200, 200,
[ [
"Content-Type" => $this->getMimeType(), "Content-Type" => $this->getMimeType(),
"Content-Disposition" => $filename . "." . $this->getExtension(), "Content-Disposition" => "attachment; filename=\"". $filename . "." . $this->getExtension() ."\"",
] ]
); );
} }