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

Subdef export does not include original file extension anymore

Browse Source
This commit is contained in:
Romain Neutron
2012-04-19 11:05:33 +02:00
parent 8765328811
commit 18707146b7
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/classes/record/adapter.class.php
View File

@@ -826,10 +826,17 @@ class record_adapter implements record_Interface, cache_cacheableInterface
* *
* @return string * @return string
*/ */
public function get_original_name() public function get_original_name($removeExtension = null)
{
if($removeExtension)
{
return pathinfo($this->original_name, PATHINFO_FILENAME);
}
else
{ {
return $this->original_name; return $this->original_name;
} }
}
public function set_original_name($original_name) public function set_original_name($original_name)
{ {
@@ -891,7 +898,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
* *
* @return string * @return string
*/ */
public function get_title($highlight = false, searchEngine_adapter $searchEngine = null) public function get_title($highlight = false, searchEngine_adapter $searchEngine = null, $removeExtension = null)
{ {
$title = ''; $title = '';
$appbox = appbox::get_instance(\bootstrap::getCore()); $appbox = appbox::get_instance(\bootstrap::getCore());
@@ -924,7 +931,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
if (trim($title) === '') if (trim($title) === '')
{ {
$title = trim($this->get_original_name()); $title = trim($this->get_original_name($removeExtension));
} }
$title = $title != "" ? $title : "<i>" . _('reponses::document sans titre') . "</i>"; $title = $title != "" ? $title : "<i>" . _('reponses::document sans titre') . "</i>";

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

@@ -137,7 +137,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() . '_' . $n . '/', $record->get_title(null, null, true) . '_' . $n . '/',
$remain_hd[$base_id] $remain_hd[$base_id]
); );
@@ -459,7 +459,7 @@ class set_export extends set_abstract
$files[$id]['original_name'] = $files[$id]['original_name'] =
$files[$id]['export_name'] = $files[$id]['export_name'] =
$download_element->get_original_name(); $download_element->get_original_name(true);
$files[$id]['original_name'] = $files[$id]['original_name'] =
trim($files[$id]['original_name']) != '' ? trim($files[$id]['original_name']) != '' ?
@@ -472,7 +472,7 @@ class set_export extends set_abstract
if ($rename_title) if ($rename_title)
{ {
$title = strip_tags($download_element->get_title()); $title = strip_tags($download_element->get_title(null, null, true));
$files[$id]['export_name'] = $unicode->remove_nonazAZ09($title, true); $files[$id]['export_name'] = $unicode->remove_nonazAZ09($title, true);
$rename_done = true; $rename_done = true;