- Timestamp:
- Nov 16, 2004, 12:13:24 AM (20 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/category.php
r602 r605 198 198 'special_cat', 199 199 array( 200 'URL' => add_session_id(PHPWG_ROOT_PATH.' category.php?cat=random'),200 'URL' => add_session_id(PHPWG_ROOT_PATH.'random.php'), 201 201 'TITLE' => $lang['random_cat_hint'], 202 202 'NAME' => $lang['random_cat'] … … 275 275 ,'recent_pics' 276 276 ,'best_rated' 277 ,' random'277 ,'list' 278 278 )))) 279 279 { -
trunk/include/category_default.inc.php
r602 r605 106 106 $url_link.= '&search='.$_GET['search']; 107 107 } 108 else if ($page['cat'] == 'list') 109 { 110 $url_link.= '&list='.$_GET['list']; 111 } 108 112 109 113 $template->assign_block_vars( -
trunk/include/functions_category.inc.php
r603 r605 67 67 * - equals 'recent_cats' 68 68 * - equals 'calendar' 69 * - equals ' random'69 * - equals 'list' 70 70 * 71 71 * The function fills the global var $page['cat'] and returns nothing … … 100 100 or $cat == 'recent_pics' 101 101 or $cat == 'recent_cats' 102 or $cat == 'calendar' 103 or $cat == 'random' ) 102 or $cat == 'calendar' ) 104 103 { 105 104 $page['cat'] = $cat; … … 108 107 { 109 108 $page['cat'] = $cat; 109 } 110 if ($cat == 'list' 111 and isset($_GET['list']) 112 and preg_match('/^\d+(,\d+)*$/', $_GET['list'])) 113 { 114 $page['cat'] = 'list'; 110 115 } 111 116 } … … 435 440 // - best rated pictures 436 441 // - recent pictures 437 // - random pictures442 // - defined list (used for random) 438 443 // 3. determination of the title of the page 439 444 // 4. creation of the navigation bar … … 468 473 else 469 474 { 470 if ( $page['cat'] == 'search' 471 or $page['cat'] == 'most_visited' 472 or $page['cat'] == 'recent_pics' 473 or $page['cat'] == 'recent_cats' 474 or $page['cat'] == 'best_rated' 475 or $page['cat'] == 'calendar' ) 475 if ($page['cat'] == 'search' 476 or $page['cat'] == 'most_visited' 477 or $page['cat'] == 'recent_pics' 478 or $page['cat'] == 'recent_cats' 479 or $page['cat'] == 'best_rated' 480 or $page['cat'] == 'calendar' 481 or $page['cat'] == 'list') 476 482 { 477 483 // we must not show pictures of a forbidden category … … 789 795 } 790 796 } 791 else if ($page['cat'] == ' random')797 else if ($page['cat'] == 'list') 792 798 { 793 799 $page['title'] = $lang['random_cat']; 794 800 801 $page['where'] = 'WHERE 1=1'; 795 802 if (isset($forbidden)) 796 803 { 797 $page['where'] = 'WHERE '.$forbidden; 798 } 799 else 800 { 801 $page['where'] = 'WHERE 1=1'; 802 } 803 804 $conf['order_by'] = ' ORDER BY RAND()'; 805 806 $page['cat_nb_images'] = $conf['top_number']; 807 $page['nb_image_page'] = $page['cat_nb_images']; 804 $page['where'].= ' AND '.$forbidden; 805 } 806 $page['where'].= ' AND image_id IN ('.$_GET['list'].')'; 807 $page['cat_nb_images'] = count(explode(',', $_GET['list'])); 808 808 } 809 809 -
trunk/picture.php
r602 r605 209 209 { 210 210 $url_up.= "&search=".$_GET['search']; 211 } 212 if ( $page['cat'] == 'list' ) 213 { 214 $url_up.= "&list=".$_GET['list']; 211 215 } 212 216
Note: See TracChangeset
for help on using the changeset viewer.