Changeset 3916 for extensions/piclens

Timestamp:

Sep 24, 2009, 11:44:02 PM (15 years ago)

Author:

tiico

Message:

fix bug 0001170 + some sql corrections on specials pages

File:

• extensions/piclens/generate_rss.php (modified) (5 diffs)

extensions/piclens/generate_rss.php

@@ -95 +95 @@
                                                 img.date_available >= SUBDATE(
                                                 CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY) '
-                                                .$forbidden
-                                                .' '.$conf['order_by'].';';
+                    .get_sql_condition_FandF
+                                                (
+                                                        array('visible_images' => 'id'),
+                                                        'AND'
+                                                )
+                                        .' '.$conf['order_by'].';';
                 }
                 // Plus vues
@@ -115 +119 @@
                                                 CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY
                                                 )
-                                                '.get_sql_condition_FandF
-                                                        (
-                                                                array('visible_categories' => 'id',),
-                                                        'AND'
-                                                        ).'
-                                                ;';
+                    '.$forbidden
+                    .';';
                 }
                 
@@ -153 +153 @@
                                         .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id'
                                         .' WHERE img.average_rate IS NOT NULL '
-                                        .$forbidden
+                                        .get_sql_condition_FandF
+                                                (
+                                                        array('visible_images' => 'id'),
+                                                        'AND'
+                                                )
                                         .' ORDER BY average_rate DESC, id ASC'
                                         .' LIMIT 0, '.$conf['top_number'].';';
@@ -165 +169 @@
                         $query = 'SELECT img.id, img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 
                                           img.comment, img.author, img.hit ,img.filesize, img.average_rate, img.has_high, img.path, 
-                                          img.level,  '
+                                          img.level  '
                                         .' FROM '.FAVORITES_TABLE.' AS fav '
                                         .' INNER JOIN '.IMAGES_TABLE.' AS img ON fav.image_id = img.id'
@@ -201 +205 @@
                 $items = array_intersect($items, $images);
               }
-
+                $items = array_unique($items);
+//                foreach ($items as $item)
+//                echo "item=".implode(',', $items);
                         // $cat need to bo not null...
                         array_push($cat, "1");
-                        $query = 'SELECT img.id, img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 
+                        $query = 'SELECT distinct(img.id), img.file, img.date_available, img.date_creation, img.tn_ext, img.name, 
                                           img.comment, img.author, img.hit ,img.filesize, img.average_rate, img.has_high, img.path, 
-                                          img.level , ic.category_id, cat.name AS catname, cat.comment AS catcomment, cat.rank, cat.status, 
-                                          cat.visible, cat.uppercats, cat.permalink, cat.dir '
+                                          img.level  '
                                         .' FROM '.IMAGES_TABLE.' AS img '
-                                        .' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON img.id = ic.image_id'
-                                        .' INNER JOIN '.CATEGORIES_TABLE.' AS cat ON ic.category_id = cat.id '
                                         .' WHERE img.id IN ('.implode(',', $items).') '
-                    .$forbidden
+
+                                        .' '.get_sql_condition_FandF
+                                                (
+                                                        array('visible_images' => 'id'),
+                                                        'AND'
+                                                )
                                         .' '.$conf['order_by'].';';
                 }