diff --git a/lib/classes/record/exportElement.class.php b/lib/classes/record/exportElement.class.php index 7a397399fe..5abce18723 100644 --- a/lib/classes/record/exportElement.class.php +++ b/lib/classes/record/exportElement.class.php @@ -60,6 +60,12 @@ class record_exportElement extends record_adapter public function __construct(Application $app, $sbas_id, $record_id, $directory = '', $remain_hd = false) { $this->directory = $directory; + + if ($this->directory) { + $unicode = new \unicode(); + $this->directory = $unicode->remove_nonazAZ09($this->directory) . '/'; + } + $this->remain_hd = $remain_hd; $this->size = array(); parent::__construct($app, $sbas_id, $record_id); diff --git a/lib/classes/set/export.class.php b/lib/classes/set/export.class.php index 14d9b49201..c91a5a1448 100644 --- a/lib/classes/set/export.class.php +++ b/lib/classes/set/export.class.php @@ -62,7 +62,7 @@ class set_export extends set_abstract /* @var $repository \Repositories\BasketRepository */ $Basket = $repository->findUserBasket($this->app, $sstid, $app['phraseanet.user'], false); - $this->exportName = str_replace(' ', '_', $Basket->getName()) . "_" . date("Y-n-d"); + $this->exportName = str_replace(array(' ', '\\', '/'), '_', $Basket->getName()) . "_" . date("Y-n-d"); foreach ($Basket->getElements() as $basket_element) { /* @var $basket_element \Entities\BasketElement */ @@ -82,7 +82,7 @@ class set_export extends set_abstract $app, $basket_element->getRecord($this->app)->get_sbas_id(), $record_id, - $Basket->getName() . '/', + $Basket->getName(), $remain_hd[$base_id] ); @@ -122,7 +122,7 @@ class set_export extends set_abstract $app, $child_basrec->get_sbas_id(), $record_id, - $record->get_title(null, null, true) . '_' . $n . '/', + $record->get_title(null, null, true) . '_' . $n, $remain_hd[$base_id] );