archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 2397 added: add details about the album thumbnail for extra templates.

Browse source 
Algorithm changed for FILE_HAS_HD : we don't care about the $user['enabled_high']

Fields added in category_default : high_filesize, high_width, high_height, rating_score

We send the same fields on category_cats but for album thumbnail only.


git-svn-id: http://piwigo.org/svn/branches/2.3@12545 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2011-11-04 23:49:03 +00:00
parent a9d3ee0e4d
commit ff8e5dc9e3
2 changed files with 50 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/category_cats.inc.php
View file

@ -176,11 +176,11 @@ if ($page['section']=='recent_cats')
}
if (count($categories) > 0)
{
$thumbnail_src_of = array();
$infos_of_image = array();
$new_image_ids = array();
$query = '
SELECT id, path, tn_ext, level
SELECT *
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $image_ids).')
;';
@ -189,7 +189,8 @@ SELECT id, path, tn_ext, level
{
if ($row['level'] <= $user['level'])
{
$thumbnail_src_of[$row['id']] = get_thumbnail_url($row);
$row['tn_src'] = get_thumbnail_url($row);
$infos_of_image[$row['id']] = $row;
}
else
{
@ -228,14 +229,15 @@ SELECT id, path, tn_ext, level
if (count($new_image_ids) > 0)
{
$query = '
SELECT id, path, tn_ext
SELECT *
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $new_image_ids).')
;';
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
$thumbnail_src_of[$row['id']] = get_thumbnail_url($row);
$row['tn_src'] = get_thumbnail_url($row);
$infos_of_image[$row['id']] = $row;
}
}
}
@ -304,10 +306,12 @@ if (count($categories) > 0)
$name = $category['name'];
}
$representative_infos = $infos_of_image[ $category['representative_picture_id'] ];
$tpl_var =
array(
'ID' => $category['id'],
'TN_SRC' => $thumbnail_src_of[$category['representative_picture_id']],
'TN_SRC' => $representative_infos['tn_src'],
'TN_ALT' => strip_tags($category['name']),
'URL' => make_index_url(
@ -329,6 +333,23 @@ if (count($categories) > 0)
@$category['comment'],
'subcatify_category_description')),
'NAME' => $name,
// Extra fields for usage in extra themes
'FILE_PATH' => $representative_infos['path'],
'FILE_POSTED' => $representative_infos['date_available'],
'FILE_CREATED' => $representative_infos['date_creation'],
'FILE_DESC' => $representative_infos['comment'],
'FILE_AUTHOR' => $representative_infos['author'],
'FILE_HIT' => $representative_infos['hit'],
'FILE_SIZE' => $representative_infos['filesize'],
'FILE_WIDTH' => $representative_infos['width'],
'FILE_HEIGHT' => $representative_infos['height'],
'FILE_METADATE' => $representative_infos['date_metadata_update'],
'FILE_HAS_HD' => $representative_infos['has_high'],
'FILE_HD_WIDTH' => $representative_infos['high_width'],
'FILE_HD_HEIGHT' => $representative_infos['high_height'],
'FILE_HD_FILESIZE' => $representative_infos['high_filesize'],
'FILE_RATING_SCORE' => $representative_infos['rating_score'],
);
if ($conf['index_new_icon'])
{

43
include/category_default.inc.php
View file

@ -111,28 +111,31 @@ foreach ($pictures as $row)
$name = get_picture_title($row);
$tpl_var =
array(
'ID' => $row['id'],
'TN_SRC' => get_thumbnail_url($row),
'TN_ALT' => htmlspecialchars(strip_tags($name)),
'TN_TITLE' => get_thumbnail_title($row),
'URL' => $url,
$tpl_var = array(
'ID' => $row['id'],
'TN_SRC' => get_thumbnail_url($row),
'TN_ALT' => htmlspecialchars(strip_tags($name)),
'TN_TITLE' => get_thumbnail_title($row),
'URL' => $url,
/* Fields for template-extension usage */
'FILE_PATH' => $row['path'],
'FILE_POSTED' => $row['date_available'],
'FILE_CREATED' => $row['date_creation'],
'FILE_DESC' => $row['comment'],
'FILE_AUTHOR' => $row['author'],
'FILE_HIT' => $row['hit'],
'FILE_SIZE' => $row['filesize'],
'FILE_WIDTH' => $row['width'],
'FILE_HEIGHT' => $row['height'],
'FILE_METADATE' => $row['date_metadata_update'],
'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
true:false, /* lack of include/functions_picture.inc.php */
// Extra fields for usage in extra themes
'FILE_PATH' => $row['path'],
'FILE_POSTED' => $row['date_available'],
'FILE_CREATED' => $row['date_creation'],
'FILE_DESC' => $row['comment'],
'FILE_AUTHOR' => $row['author'],
'FILE_HIT' => $row['hit'],
'FILE_SIZE' => $row['filesize'],
'FILE_WIDTH' => $row['width'],
'FILE_HEIGHT' => $row['height'],
'FILE_METADATE' => $row['date_metadata_update'],
'FILE_HAS_HD' => $row['has_high'],
'FILE_HD_WIDTH' => $row['high_width'],
'FILE_HD_HEIGHT' => $row['high_height'],
'FILE_HD_FILESIZE' => $row['high_filesize'],
'FILE_RATING_SCORE' => $row['rating_score'],
);
if ($conf['index_new_icon'])
{
$tpl_var['icon_ts'] = get_icon($row['date_available']);