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

It's a finalized version.
Obsolete code of draft are removed.

You can filter categories and images with recent date period on your screen selection.
In the future, filter could be easy done on other type data (plugin?)

You can flat categories and sub-categories with a recent date period of your choice.

Next, perhaps, a panel to choice recent date for the 2 features.

On draft, there have problem with MySql 5, be careful!

Css problem not resolved:
  - Menu "Categories" is bad centered
  - Icon on dark too on the top


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

1 files changed, 28 insertions, 17 deletions

diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 4ae2b126c..bde0944e7 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
 // | file          : $Id$
@@ -44,6 +44,8 @@ function check_restrictions($category_id)
 {
   global $user;
 
+  // $filter['visible_categories'] and $filter['visible_images']
+  // are not used because it's not necessary (filter <> restriction)
   if (in_array($category_id, explode(',', $user['forbidden_categories'])))
   {
     access_denied();
@@ -52,7 +54,7 @@ function check_restrictions($category_id)
 
 function get_categories_menu()
 {
-  global $page, $user;
+  global $page, $user, $filter;
 
   $query = '
 SELECT ';
@@ -65,28 +67,34 @@ SELECT ';
 
   // $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
   $query.= '
-  FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
   ON id = cat_id and user_id = '.$user['id'];
-  if ($page['filter_local_mode'])
+
+  // Always expand when filter is activated
+  if (!$user['expand'] and !$filter['enabled'])
   {
     $query.= '
-where max_date_last > SUBDATE(
-  CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
+WHERE
+(id_uppercat is NULL';
+    if (isset($page['category']))
+    {
+      $query.= ' OR id_uppercat IN ('.$page['uppercats'].')';
+    }
+    $query.= ')';
   }
   else
   {
-    // Always expand when filter_local_mode is activated
-    if (!$user['expand'] and !$user['filter_global_mode'])
-    {
-      $query.= '
-      WHERE (id_uppercat is NULL';
-      if (isset($page['category']))
-      {
-        $query.= ' OR id_uppercat IN ('.$page['uppercats'].')';
-      }
-      $query.= ')';
-    }
+    $query.= '
+  '.get_sql_condition_FandF
+    (
+      array
+        (
+          'visible_categories' => 'id',
+        ),
+      'WHERE'
+    );
   }
+
   $query.= '
 ;';
 
@@ -98,6 +106,9 @@ where max_date_last > SUBDATE(
   }
   usort($cats, 'global_rank_compare');
 
+  // Update filtered data
+  update_cats_with_filtered_data($cats);
+
   return get_html_menu_category($cats);
 }