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

Merge branch '3.7'

Browse Source
This commit is contained in:
Romain Neutron
2012-12-17 15:30:05 +01:00
parent 5ba4b78062 8aa964d635
commit 0eaa5db98e
25 changed files with 269 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
use Alchemy\Phrasea\Application;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
use Symfony\Component\HttpFoundation\Response;
/**
*
@@ -406,8 +407,6 @@ class set_export extends set_abstract
$includeBusinessFields = !!$includeBusinessFields;
$unicode = new unicode();
$files = array();
$n_files = 0;
@@ -452,7 +451,7 @@ class set_export extends set_abstract
if ($rename_title) {
$title = strip_tags($download_element->get_title(null, null, true));
$files[$id]['export_name'] = $unicode->remove_nonazAZ09($title, true);
$files[$id]['export_name'] = $this->app['unicode']->remove_nonazAZ09($title, true);
$rename_done = true;
} else {
$files[$id]["export_name"] = $infos['filename'];
@@ -610,8 +609,8 @@ class set_export extends set_abstract
$file_names[] = mb_strtolower($name);
$files[$id]["export_name"] = $name;
$files[$id]["export_name"] = $unicode->remove_nonazAZ09($files[$id]["export_name"]);
$files[$id]["original_name"] = $unicode->remove_nonazAZ09($files[$id]["original_name"]);
$files[$id]["export_name"] = $this->app['unicode']->remove_nonazAZ09($files[$id]["export_name"]);
$files[$id]["original_name"] = $this->app['unicode']->remove_nonazAZ09($files[$id]["original_name"]);
$i = 0;
$name = utf8_decode($files[$id]["export_name"]);
@@ -712,8 +711,6 @@ class set_export extends set_abstract
random::updateToken($app, $token, serialize($list));
$unicode = new \unicode();
$toRemove = array();
foreach ($files as $record) {
@@ -726,7 +723,7 @@ class set_export extends set_abstract
. $obj["ajout"]
. '.' . $obj["exportExt"];
$name = $unicode->remove_diacritics($name);
$name = $app['unicode']->remove_diacritics($name);
$zip->addFile($path, $name);
@@ -744,7 +741,6 @@ class set_export extends set_abstract
$zip->close();
$list['complete'] = true;
$unicode = null;
random::updateToken($app, $token, serialize($list));
@@ -764,10 +760,10 @@ class set_export extends set_abstract
*/
public static function stream_file(\registry $registry, $file, $exportname, $mime, $disposition = 'inline')
{
$response = new Symfony\Component\HttpFoundation\Response();
$response = new Response();
$disposition = $disposition === 'attachment' ? ResponseHeaderBag::DISPOSITION_ATTACHMENT : ResponseHeaderBag::DISPOSITION_INLINE;
$headerDisposition = $response->headers->makeDisposition($disposition, $exportname);
$headerDisposition = $response->headers->makeDisposition($disposition, $exportname, $this->app['unicode']->remove_nonazAZ09($exportname));
if (is_file($file)) {
if ($registry->get('GV_modxsendfile')) {