From 973e0f8806cd6d569c01977ad5112e16cc7a7f6f Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 15 Nov 2004 23:13:24 +0000 Subject: category random replaced by a more generic category : list. You give a list of element identifiers and it creates a page virtual temporary category. random.php generates a randomized list of element id visible to the user (according to permissions) and redirects to category.php. Major problem : elements order is in id ascending order, I don't know how to change order when having id1,id2,id3 and id2,id3,id1 (the display order is the same) git-svn-id: http://piwigo.org/svn/trunk@605 68402e56-0260-453c-a942-63ccdbb3a9ee --- category.php | 4 +-- include/category_default.inc.php | 4 +++ include/functions_category.inc.php | 42 ++++++++++++------------- picture.php | 4 +++ random.php | 63 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 random.php diff --git a/category.php b/category.php index 516be0238..0fe1ad2a8 100644 --- a/category.php +++ b/category.php @@ -197,7 +197,7 @@ $template->assign_block_vars( $template->assign_block_vars( 'special_cat', array( - 'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=random'), + 'URL' => add_session_id(PHPWG_ROOT_PATH.'random.php'), 'TITLE' => $lang['random_cat_hint'], 'NAME' => $lang['random_cat'] )); @@ -274,7 +274,7 @@ if (isset($page['cat']) ,'most_visited' ,'recent_pics' ,'best_rated' - ,'random' + ,'list' )))) { include(PHPWG_ROOT_PATH.'include/category_default.inc.php'); diff --git a/include/category_default.inc.php b/include/category_default.inc.php index 983ec66be..b092f3c7a 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -105,6 +105,10 @@ while ($row = mysql_fetch_array($result)) { $url_link.= '&search='.$_GET['search']; } + else if ($page['cat'] == 'list') + { + $url_link.= '&list='.$_GET['list']; + } $template->assign_block_vars( 'thumbnails.line.thumbnail', 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)) diff --git a/picture.php b/picture.php index 171bc5e50..8698a0167 100644 --- a/picture.php +++ b/picture.php @@ -209,6 +209,10 @@ if ( $page['cat'] == 'search' ) { $url_up.= "&search=".$_GET['search']; } +if ( $page['cat'] == 'list' ) +{ + $url_up.= "&list=".$_GET['list']; +} $url_admin = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'; $url_admin.= '&cat_id='.$page['cat']; diff --git a/random.php b/random.php new file mode 100644 index 000000000..e8d4f9b41 --- /dev/null +++ b/random.php @@ -0,0 +1,63 @@ + \ No newline at end of file -- cgit v1.2.3