Feature Issue ID 0000601: Filter all public pages with only recent elements

It's a draft of the feature witch allows to show only recent elements.
Development are not finished.
Queries and special pages (best rates, tags, etc.) are not modified.
Only main php files about images and categories are ok.

Before to continue, I prefer to determinate a solution between modify cache implementation or hide counters.

Go to http://forum.phpwebgallery.net/viewtopic.php?pid=50015#p50015


git-svn-id: http://piwigo.org/svn/trunk@1648 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 33 insertions, 6 deletions

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index 83f4b7209..36f19ca49 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -54,7 +54,14 @@ SELECT
   FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
   ON id = cat_id and user_id = '.$user['id'].'
   WHERE id_uppercat '.
-  (!isset($page['category']) ? 'is NULL' : '= '.$page['category']).'
+  (!isset($page['category']) ? 'is NULL' : '= '.$page['category']);
+  if ($page['filter_mode'])
+  {
+    $query.= '
+    AND max_date_last > SUBDATE(
+      CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
+  }
+  $query.= '
   ORDER BY rank
 ;';
 }
@@ -77,9 +84,22 @@ while ($row = mysql_fetch_assoc($result))
     $query = '
 SELECT image_id
   FROM '.CATEGORIES_TABLE.' AS c INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic
-    ON ic.category_id = c.id
+    ON ic.category_id = c.id';
+    if ($page['filter_mode'])
+    {
+      $query.= '
+    INNER JOIN '.IMAGES_TABLE.' AS i on ic.image_id = i.id ';
+    }
+    $query.= '
   WHERE uppercats REGEXP \'(^|,)'.$row['id'].'(,|$)\'
-    AND c.id NOT IN ('.$user['forbidden_categories'].')
+    AND c.id NOT IN ('.$user['forbidden_categories'].')';
+    if ($page['filter_mode'])
+    {
+      $query.= '
+    AND i.date_available  > SUBDATE(
+      CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
+    }
+    $query.= '
   ORDER BY RAND()
   LIMIT 0,1
 ;';
@@ -93,10 +113,17 @@ SELECT image_id
   { // searching a random representant among representant of sub-categories
     $query = '
 SELECT representative_picture_id
-  FROM '.CATEGORIES_TABLE.'
+  FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+  ON id = cat_id and user_id = '.$user['id'].'
   WHERE uppercats REGEXP \'(^|,)'.$row['id'].'(,|$)\'
-    AND id NOT IN ('.$user['forbidden_categories'].')
-    AND representative_picture_id IS NOT NULL
+    AND representative_picture_id IS NOT NULL';
+    if ($page['filter_mode'])
+    {
+      $query.= '
+      AND max_date_last > SUBDATE(
+        CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
+    }
+    $query.= '
   ORDER BY RAND()
   LIMIT 0,1
 ;';