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

feature 2614: pagination on albums

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@18165 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2012-09-23 11:19:26 +00:00
parent 7e33b84e77
commit 4e65d9af46
12 changed files with 147 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/category_cats.inc.php
+15 -23
View File
@@ -22,11 +22,19 @@
// +-----------------------------------------------------------------------+
/**
* This file is included by the main page to show thumbnails for a category
* that have only subcategories or to show recent categories
* This file is included by the main page to show subcategories of a category
* or to show recent categories or main page categories list
*
*/
$selection = array_slice(
$page['categories'],
$page['starta'],
$conf['nb_categories_page']
);
$selection = trigger_event('loc_index_categories_selection', $selection);
// $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
$query = '
SELECT
@@ -38,27 +46,11 @@ SELECT
count_images,
count_categories
FROM '.CATEGORIES_TABLE.' c
INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc ON id = cat_id AND user_id = '.$user['id'];
if ('recent_cats' == $page['section'])
{
$query.= '
WHERE date_last >= '.pwg_db_get_recent_period_expression($user['recent_period']);
}
else
{
$query.= '
WHERE id_uppercat '.(!isset($page['category']) ? 'is NULL' : '= '.$page['category']['id']);
}
$query.= '
'.get_sql_condition_FandF(
array(
'visible_categories' => 'id',
),
'AND'
);
INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc
ON id = cat_id
AND user_id = '.$user['id'].'
WHERE c.id IN('.implode(',', $selection).')';
if ('recent_cats' != $page['section'])
{
$query.= '