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

Fix #983 : Fix download of basket containing slash in their titles

Browse Source
This commit is contained in:
Romain Neutron
2012-11-05 14:42:49 +01:00
parent 06ba198e86
commit c1f8f0bb8a
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/record/exportElement.class.php
View File

@@ -58,6 +58,12 @@ class record_exportElement extends record_adapter
public function __construct($sbas_id, $record_id, $directory = '', $remain_hd = false) public function __construct($sbas_id, $record_id, $directory = '', $remain_hd = false)
{ {
$this->directory = $directory; $this->directory = $directory;
if ($this->directory) {
$unicode = new \unicode();
$this->directory = $unicode->remove_nonazAZ09($this->directory) . '/';
}
$this->remain_hd = $remain_hd; $this->remain_hd = $remain_hd;
$this->size = array(); $this->size = array();
parent::__construct($sbas_id, $record_id); parent::__construct($sbas_id, $record_id);

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

@@ -82,7 +82,7 @@ class set_export extends set_abstract
new record_exportElement( new record_exportElement(
$basket_element->getRecord()->get_sbas_id(), $basket_element->getRecord()->get_sbas_id(),
$record_id, $record_id,
$Basket->getName() . '/', $Basket->getName(),
$remain_hd[$base_id] $remain_hd[$base_id]
); );
@@ -120,7 +120,7 @@ class set_export extends set_abstract
new record_exportElement( new record_exportElement(
$child_basrec->get_sbas_id(), $child_basrec->get_sbas_id(),
$record_id, $record_id,
$record->get_title(null, null, true) . '_' . $n . '/', $record->get_title(null, null, true) . '_' . $n,
$remain_hd[$base_id] $remain_hd[$base_id]
); );

2
www/include/download.php
View File

@@ -47,7 +47,7 @@ if ($parm["ssttid"] != "") {
/* @var $repository \Repositories\BasketRepository */ /* @var $repository \Repositories\BasketRepository */
$basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser(), false); $basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser(), false);
$exportname = str_replace(' ', '_', $basket->getName()) . "_" . date("Y-n-d"); $exportname = str_replace(array(' ', '\\', '/'), '_', $basket->getName()) . "_" . date("Y-n-d");
} }
$list['export_name'] = $exportname . '.zip'; $list['export_name'] = $exportname . '.zip';