Changeset 1677 for trunk/include/functions_notification.inc.php
- Timestamp:
- Dec 21, 2006, 10:38:20 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions_notification.inc.php
r1639 r1677 31 31 32 32 /* 33 * get standard sql where in order to 34 * restict an filter caregories and images 35 * 36 * IMAGE_CATEGORY_TABLE muste named ic in the query 37 * 38 * @param none 39 * 40 * @return string sql where 41 */ 42 function get_std_sql_where_restrict_filter($prefix_condition, $force_one_condition = false) 43 { 44 return get_sql_condition_FandF 45 ( 46 array 47 ( 48 'forbidden_categories' => 'ic.category_id', 49 'visible_categories' => 'ic.category_id', 50 'visible_images' => 'ic.image_id' 51 ), 52 $prefix_condition, 53 $force_one_condition 54 ); 55 } 56 57 /* 33 58 * Execute custom notification query 34 59 * … … 54 79 AND c.validation_date > \''.$start.'\' 55 80 AND c.validation_date <= \''.$end.'\' 56 AND category_id NOT IN ('.$user['forbidden_categories'].')81 '.get_std_sql_where_restrict_filter('AND').' 57 82 ;'; 58 83 break; … … 67 92 case 'new_elements': 68 93 $query = ' 69 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id94 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = id 70 95 WHERE date_available > \''.$start.'\' 71 96 AND date_available <= \''.$end.'\' 72 AND category_id NOT IN ('.$user['forbidden_categories'].')97 '.get_std_sql_where_restrict_filter('AND').' 73 98 ;'; 74 99 break; 75 100 case 'updated_categories': 76 101 $query = ' 77 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id102 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = id 78 103 WHERE date_available > \''.$start.'\' 79 104 AND date_available <= \''.$end.'\' 80 AND category_id NOT IN ('.$user['forbidden_categories'].')105 '.get_std_sql_where_restrict_filter('AND').' 81 106 ;'; 82 107 break; … … 424 449 global $conf, $user; 425 450 426 $where_sql = 'WHERE category_id NOT IN ('.$user['forbidden_categories'].')';451 $where_sql = get_std_sql_where_restrict_filter('WHERE', true); 427 452 428 453 $query = ' … … 430 455 COUNT(DISTINCT id) nb_elements, 431 456 COUNT(DISTINCT category_id) nb_cats 432 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id457 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id 433 458 '.$where_sql.' 434 459 GROUP BY date_available … … 449 474 $query = ' 450 475 SELECT DISTINCT id, path, name, tn_ext 451 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id476 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id 452 477 '.$where_sql.' 453 478 AND date_available="'.$dates[$i]['date_available'].'" … … 467 492 $query = ' 468 493 SELECT DISTINCT c.uppercats, COUNT(DISTINCT i.id) img_count 469 FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON i.id=image_id494 FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id=image_id 470 495 INNER JOIN '.CATEGORIES_TABLE.' c ON c.id=category_id 471 496 '.$where_sql.'
Note: See TracChangeset
for help on using the changeset viewer.