iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

feature #379, multiple format, download original as format

Browse Source 
If multiple format feature is enabled, always put the original file in the formats list.
This commit is contained in:
plegall
2015-12-30 16:04:32 +01:00
parent 99b1fd2704
commit 7b653c04d6
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
picture.php
View File

@@ -671,36 +671,33 @@ SELECT *
WHERE image_id = '.$picture['current']['id'].'
;';
$formats = query2array($query);
// let's add the original as a format among others. It will just have a
// specific download URL
array_unshift(
$formats,
array(
'download_url' => $picture['current']['download_url'],
'ext' => get_extension($picture['current']['file']),
'filesize' => $picture['current']['filesize'],
)
);
if (!empty($formats))
foreach ($formats as &$format)
{
// let's add the original as a format among others. It will just have
// a specific download URL
array_unshift(
$formats,
array(
'download_url' => $picture['current']['download_url'],
'ext' => get_extension($picture['current']['file']),
'filesize' => $picture['current']['filesize'],
)
);
foreach ($formats as &$format)
if (!isset($format['download_url']))
{
if (!isset($format['download_url']))
{
$format['download_url'] = 'action.php?format='.$format['format_id'].'&download';
}
$format['label'] = strtoupper($format['ext']);
$lang_key = 'format '.strtoupper($format['ext']);
if (isset($lang[$lang_key]))
{
$format['label'] = $lang[$lang_key];
}
$format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024);
$format['download_url'] = 'action.php?format='.$format['format_id'].'&download';
}
$format['label'] = strtoupper($format['ext']);
$lang_key = 'format '.strtoupper($format['ext']);
if (isset($lang[$lang_key]))
{
$format['label'] = $lang[$lang_key];
}
$format['filesize'] = sprintf('%.1fMB', $format['filesize']/1024);
}
$template->append('current', array('formats' => $formats), true);