hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect file names for filename containing dots

Browse Source
This commit is contained in:
Thibaud Fabre
2016-06-13 18:55:37 +02:00
parent 1d9ca59c52
commit fab4a6e6d5
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/set/export.php
View File

@@ -399,16 +399,11 @@ SQL;
throw new Exception('No subdefs given');
}
$includeBusinessFields = !!$includeBusinessFields;
$includeBusinessFields = (bool) $includeBusinessFields;
$files = [];
$n_files = 0;
$file_names = [];
$size = 0;
$unicode = new \unicode();
/** @var record_exportElement $download_element */
@@ -433,7 +428,7 @@ SQL;
$files[$id]['original_name'] =
$files[$id]['export_name'] =
$download_element->get_original_name(true);
$download_element->get_original_name(false);
$files[$id]['original_name'] =
trim($files[$id]['original_name']) != '' ?
@@ -441,12 +436,12 @@ SQL;
$infos = pathinfo($files[$id]['original_name']);
$extension = isset($infos['extension']) ? $infos['extension'] : '';
$extension = isset($infos['extension']) ? $infos['extension'] :
substr($files[$id]['original_name'], 0 - strrpos($files[$id]['original_name'], '.'));
if ($rename_title) {
$title = strip_tags($download_element->get_title(null, null, true));
$files[$id]['export_name'] = $unicode->remove_nonazAZ09($title, true, true, true);
$files[$id]['export_name'] = $unicode->remove_nonazAZ09($title, true, true, true) . '.' . $extension;
} else {
$files[$id]["export_name"] = $infos['filename'];
}
@@ -713,7 +708,7 @@ SQL;
$name = $obj["folder"]
. $record["export_name"]
. $obj["ajout"]
. '.' . $obj["exportExt"];
. (isset($obj["exportExt"]) && trim($obj["exportExt"]) != '' ? '.' . $obj["exportExt"] : '');
$archiveFiles[$app['unicode']->remove_diacritics($name)] = $path;
if ($o == 'caption') {