diff options
Diffstat (limited to '')
| -rw-r--r-- | include/functions_category.inc.php | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 15cb21d16..330137d6d 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -66,7 +66,7 @@ function check_restrictions( $category_id ) * - equals 'recent_pics' * - equals 'recent_cats' * - equals 'calendar' - * - equals 'random' + * - equals 'list' * * The function fills the global var $page['cat'] and returns nothing * @@ -99,8 +99,7 @@ function check_cat_id( $cat ) or $cat == 'best_rated' or $cat == 'recent_pics' or $cat == 'recent_cats' - or $cat == 'calendar' - or $cat == 'random' ) + or $cat == 'calendar' ) { $page['cat'] = $cat; } @@ -108,6 +107,12 @@ function check_cat_id( $cat ) { $page['cat'] = $cat; } + if ($cat == 'list' + and isset($_GET['list']) + and preg_match('/^\d+(,\d+)*$/', $_GET['list'])) + { + $page['cat'] = 'list'; + } } } @@ -434,7 +439,7 @@ SELECT galleries_url // - most visited pictures // - best rated pictures // - recent pictures -// - random pictures +// - defined list (used for random) // 3. determination of the title of the page // 4. creation of the navigation bar function initialize_category( $calling_page = 'category' ) @@ -467,12 +472,13 @@ function initialize_category( $calling_page = 'category' ) } else { - if ( $page['cat'] == 'search' - or $page['cat'] == 'most_visited' - or $page['cat'] == 'recent_pics' - or $page['cat'] == 'recent_cats' - or $page['cat'] == 'best_rated' - or $page['cat'] == 'calendar' ) + if ($page['cat'] == 'search' + or $page['cat'] == 'most_visited' + or $page['cat'] == 'recent_pics' + or $page['cat'] == 'recent_cats' + or $page['cat'] == 'best_rated' + or $page['cat'] == 'calendar' + or $page['cat'] == 'list') { // we must not show pictures of a forbidden category if ( $user['forbidden_categories'] != '' ) @@ -788,23 +794,17 @@ SELECT COUNT(1) AS count $page['nb_image_page'] = $conf['top_number'] - $page['start']; } } - else if ($page['cat'] == 'random') + else if ($page['cat'] == 'list') { $page['title'] = $lang['random_cat']; + $page['where'] = 'WHERE 1=1'; if (isset($forbidden)) { - $page['where'] = 'WHERE '.$forbidden; - } - else - { - $page['where'] = 'WHERE 1=1'; + $page['where'].= ' AND '.$forbidden; } - - $conf['order_by'] = ' ORDER BY RAND()'; - - $page['cat_nb_images'] = $conf['top_number']; - $page['nb_image_page'] = $page['cat_nb_images']; + $page['where'].= ' AND image_id IN ('.$_GET['list'].')'; + $page['cat_nb_images'] = count(explode(',', $_GET['list'])); } if (isset($query)) |