Changeset 6597 for trunk/include
- Timestamp:
- Jun 24, 2010, 8:42:39 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions_notification.inc.php
r6363 r6597 72 72 FROM '.COMMENTS_TABLE.' AS c 73 73 , '.IMAGE_CATEGORY_TABLE.' AS ic 74 WHERE c.image_id = ic.image_id 75 AND c.validation_date > \''.$start.'\' 76 AND c.validation_date <= \''.$end.'\' 77 '.get_std_sql_where_restrict_filter('AND').' 74 WHERE c.image_id = ic.image_id'; 75 if (!empty($start)) 76 { 77 $query .= ' 78 AND c.validation_date > \''.$start.'\''; 79 } 80 if (!empty($end)) 81 { 82 $query .= ' 83 AND c.validation_date <= \''.$end.'\''; 84 } 85 $query .= get_std_sql_where_restrict_filter('AND').' 78 86 ;'; 79 87 break; … … 81 89 $query = ' 82 90 FROM '.COMMENTS_TABLE.' 83 WHERE date> \''.$start.'\' AND date <= \''.$end.'\' 84 AND validated = \'false\' 91 WHERE 1=1'; 92 if (!empty($start)) 93 { 94 $query .= ' AND date> \''.$start.'\''; 95 } 96 if (!empty($end)) 97 { 98 $query .= ' AND date <= \''.$end.'\''; 99 } 100 $query .= ' AND validated = \'false\' 85 101 ;'; 86 102 break; … … 88 104 $query = ' 89 105 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = id 90 WHERE date_available > \''.$start.'\' 91 AND date_available <= \''.$end.'\' 92 '.get_std_sql_where_restrict_filter('AND', 'id').' 106 WHERE 1=1'; 107 if (!empty($start)) 108 { 109 $query .= ' AND date_available > \''.$start.'\''; 110 } 111 if (!empty($end)) 112 { 113 $query .= ' AND date_available <= \''.$end.'\''; 114 } 115 $query .= get_std_sql_where_restrict_filter('AND', 'id').' 93 116 ;'; 94 117 break; … … 96 119 $query = ' 97 120 FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = id 98 WHERE date_available > \''.$start.'\' 99 AND date_available <= \''.$end.'\' 100 '.get_std_sql_where_restrict_filter('AND', 'id').' 121 WHERE 1=1'; 122 if (!empty($start)) 123 { 124 $query .= ' AND date_available > \''.$start.'\''; 125 } 126 if (!empty($end)) 127 { 128 $query .= ' AND date_available <= \''.$end.'\''; 129 } 130 $query .= get_std_sql_where_restrict_filter('AND', 'id').' 101 131 ;'; 102 132 break; … … 104 134 $query = ' 105 135 FROM '.USER_INFOS_TABLE.' 106 WHERE registration_date > \''.$start.'\' 107 AND registration_date <= \''.$end.'\' 136 WHERE 1=1'; 137 if (!empty($start)) 138 { 139 $query .= ' AND registration_date > \''.$start.'\''; 140 } 141 if (!empty($end)) 142 { 143 $query .= ' AND registration_date <= \''.$end.'\''; 144 } 145 $query .= ' 108 146 ;'; 109 147 break; … … 459 497 { // get some thumbnails ... 460 498 $query = ' 461 SELECT DISTINCTid, path, name, tn_ext, file499 SELECT id, path, name, tn_ext, file 462 500 FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id 463 501 '.$where_sql.' 464 AND date_available= "'.$dates[$i]['date_available'].'"502 AND date_available=\''.$dates[$i]['date_available'].'\' 465 503 AND tn_ext IS NOT NULL 466 504 ORDER BY '.DB_RANDOM_FUNCTION.'() … … 478 516 {// get some categories ... 479 517 $query = ' 480 SELECT DISTINCTc.uppercats, COUNT(DISTINCT i.id) img_count518 SELECT c.uppercats, COUNT(DISTINCT i.id) img_count 481 519 FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id=image_id 482 520 INNER JOIN '.CATEGORIES_TABLE.' c ON c.id=category_id 483 521 '.$where_sql.' 484 AND date_available= "'.$dates[$i]['date_available'].'"485 GROUP BY category_id 522 AND date_available=\''.$dates[$i]['date_available'].'\' 523 GROUP BY category_id, c.uppercats 486 524 ORDER BY img_count DESC 487 525 LIMIT '.$max_cats.'
Note: See TracChangeset
for help on using the changeset viewer.