From 994eaed7e14e9d6d6cb93f4d104692dee33ddff2 Mon Sep 17 00:00:00 2001
From: Benjamin Perche <bperche9@gmail.com>
Date: Tue, 15 Jul 2014 10:19:52 +0200
Subject: [PATCH] =?UTF-8?q?Finish=20export=20handle=20=09modifi=C3=A9:=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20core/lib/Thelia/Controller/Admin/Import?=
 =?UTF-8?q?ExportController.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarAr?=
 =?UTF-8?q?chiveBuilder.php=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20c?=
 =?UTF-8?q?ore/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiv?=
 =?UTF-8?q?eBuilder.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Thelia/Controller/Admin/ImportExportController.php | 10 ++++------
 .../Archive/ArchiveBuilder/TarArchiveBuilder.php       |  4 +---
 .../Archive/ArchiveBuilder/ZipArchiveBuilder.php       |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/lib/Thelia/Controller/Admin/ImportExportController.php b/core/lib/Thelia/Controller/Admin/ImportExportController.php
index b45013dca..eb81bdabb 100644
--- a/core/lib/Thelia/Controller/Admin/ImportExportController.php
+++ b/core/lib/Thelia/Controller/Admin/ImportExportController.php
@@ -117,8 +117,10 @@ class ImportExportController extends BaseAdminController
 
             $formattedContent = $formatter->encode($data);
 
+            $filename = $formatter::FILENAME . "." . $formatter->getExtension();
+
             if (!$boundForm->get("do_compress")->getData()) {
-                $filename = $formatter::FILENAME . "." . $formatter->getExtension();
+
 
                 return new Response(
                     $formattedContent,
@@ -153,12 +155,8 @@ class ImportExportController extends BaseAdminController
                     }
                 }
 
-                /**
-                 * Then add the export file
-                 */
                 $archiveBuilder->addFileFromString(
-                    $formattedContent,
-                    $formatter::FILENAME . "." . $formatter->getExtension()
+                    $formattedContent, $filename
                 );
 
                 return $archiveBuilder->buildArchiveResponse($formatter::FILENAME);
diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
index 35f9a5d55..b455a6e0b 100644
--- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
+++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
@@ -238,8 +238,6 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
      */
     public function buildArchiveResponse($filename)
     {
-        $this->tar->setMetadata("Generated by Thelia v" . Thelia::THELIA_VERSION);
-
         if (!is_file($this->cacheFile)) {
             $this->throwFileNotFound($this->cacheFile);
         }
@@ -262,7 +260,7 @@ class TarArchiveBuilder extends AbstractArchiveBuilder
             200,
             [
                 "Content-Type" => $this->getMimeType(),
-                "Content-Disposition" => $filename . "." . $this->getExtension(),
+                "Content-Disposition" => "attachment; filename=\"".$filename . "." . $this->getExtension() ."\"",
             ]
         );
     }
diff --git a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
index 220cd24e4..ab31d2a51 100644
--- a/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
+++ b/core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
@@ -332,7 +332,7 @@ class ZipArchiveBuilder extends AbstractArchiveBuilder
             200,
             [
                 "Content-Type" => $this->getMimeType(),
-                "Content-Disposition" => $filename . "." . $this->getExtension(),
+                "Content-Disposition" => "attachment; filename=\"". $filename . "." . $this->getExtension() ."\"",
             ]
         );
     }