adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 01:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #626 related albums (menu, combine, url)

Browse Source 
* ability to combine albums in URL index.php?/category/1/2/3 will consider 1 as $page['category'] and {2,3} as $page['combined_categories']

* new menu block "related albums" which displays only the hierarchy of albums related to the current set of photos, excluding current album(s). In the hierarchy, only the related albums have a link, not ancestors
This commit is contained in:
plegall
2020-11-09 13:00:01 +01:00
parent 35f0450699
commit 4f3880af89
9 changed files with 388 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_url.inc.php
+42 -2
View File
@@ -348,6 +348,18 @@ function make_section_in_url($params)
{
$section_string.= $params['category']['permalink'];
}
if (isset($params['combined_categories']))
{
foreach ($params['combined_categories'] as $category)
{
$section_string.= '/'.$category['id'];
if ( $conf['category_url_style']=='id-name' )
{
$section_string.= '-'.str2url($category['name']);
}
}
}
}
break;
@@ -421,13 +433,23 @@ function parse_section_url( $tokens, &$next_token)
$page['section'] = 'categories';
$next_token++;
if (isset($tokens[$next_token]) )
$i = $next_token;
while (isset($tokens[$next_token]))
{
if (preg_match('/^(\d+)(?:-(.+))?$/', $tokens[$next_token], $matches))
{
if ( isset($matches[2]) )
$page['hit_by']['cat_url_name'] = $matches[2];
$page['category'] = $matches[1];
if (!isset($page['category']))
{
$page['category'] = $matches[1];
}
else
{
$page['combined_categories'][] = $matches[1];
}
$next_token++;
}
else
@@ -480,6 +502,24 @@ function parse_section_url( $tokens, &$next_token)
}
$page['category']=$result;
}
if (isset($page['combined_categories']))
{
$combined_categories = array();
foreach ($page['combined_categories'] as $cat_id)
{
$result = get_cat_info($cat_id);
if (empty($result))
{
page_not_found(l10n('Requested album does not exist'));
}
$combined_categories[] = $result;
}
$page['combined_categories'] = $combined_categories;
}
}
elseif ( 'tags' == @$tokens[$next_token] )
{