Changeset 1677

Timestamp:

Dec 21, 2006, 10:38:20 PM (17 years ago)

Author:

rub

Message:

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

Location:

trunk

Files:

• action.php (modified) (2 diffs)
• comments.php (modified) (3 diffs)
• include/category_cats.inc.php (modified) (5 diffs)
• include/category_default.inc.php (modified) (2 diffs)
• include/common.inc.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (3 diffs)
• include/filter.inc.php (added)
• include/functions_calendar.inc.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (5 diffs)
• include/functions_filter.inc.php (added)
• include/functions_html.inc.php (modified) (1 diff)
• include/functions_notification.inc.php (modified) (7 diffs)
• include/functions_search.inc.php (modified) (3 diffs)
• include/functions_tag.inc.php (modified) (3 diffs)
• include/functions_url.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (10 diffs)
• include/menubar.inc.php (modified) (1 diff)
• include/page_header.php (modified) (1 diff)
• include/section_init.inc.php (modified) (9 diffs)
• include/user.inc.php (modified) (2 diffs)
• index.php (modified) (5 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (3 diffs)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (3 diffs)
• picture.php (modified) (1 diff)
• random.php (modified) (1 diff)
• search.php (modified) (2 diffs)
• services/recent.php (modified) (1 diff)
• tags.php (modified) (1 diff)
• template/yoga/default-colors.css (modified) (1 diff)
• template/yoga/header.tpl (modified) (1 diff)
• template/yoga/icon/flat_recent_cat.png (added)
• template/yoga/icon/normal_mode.png (modified) (previous)
• template/yoga/icon/note.png (added)
• template/yoga/icon/start_filter.png (moved) (moved from trunk/template/yoga/icon/start_filter_mode.png)
• template/yoga/icon/stop_filter.png (moved) (moved from trunk/template/yoga/icon/stop_filter_mode.png)
• template/yoga/index.tpl (modified) (1 diff)
• template/yoga/menubar.tpl (modified) (1 diff)
• template/yoga/theme/clear/theme.css (modified) (1 diff)
• template/yoga/theme/dark/theme.css (modified) (1 diff)
• web_service.php (modified) (2 diffs)

trunk/action.php

@@ -82 +82 @@
 }
 
+// $filter['visible_categories'] and $filter['visible_images']
+// are not used because it's not necessary (filter <> restriction)
 $query='
 SELECT id FROM '.CATEGORIES_TABLE.'
@@ -87 +89 @@
   ON category_id=id
   WHERE image_id='.$id.'
-  AND category_id NOT IN ('.$user['forbidden_categories'].')
+.'get_sql_condition_FandF(array('forbidden_categories' => 'category_id'), 'AND').'
   LIMIT 1
 ;';

trunk/comments.php

@@ -217 +217 @@
 $query = '
 SELECT id,name,uppercats,global_rank
-  FROM '.CATEGORIES_TABLE;
-if ($user['forbidden_categories'] != '')
-{
-  $query.= '
-    WHERE id NOT IN ('.$user['forbidden_categories'].')';
-}
-$query.= '
+  FROM '.CATEGORIES_TABLE.'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'id',
+        'visible_categories' => 'id'
+      ),
+    'WHERE'
+  ).'
 ;';
 display_select_cat_wrapper($query, array(@$_GET['cat']), $blockname, true);
@@ -309 +312 @@
     AND '.$page['author_clause'].'
     AND '.$page['keyword_clause'].'
-    AND '.$page['status_clause'];
-if ($user['forbidden_categories'] != '')
-{
-  $query.= '
-    AND category_id NOT IN ('.$user['forbidden_categories'].')';
-}
-$query.= '
+    AND '.$page['status_clause'].'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'ic.image_id'
+      ),
+    'AND'
+  ).'
 ;';
 list($counter) = mysql_fetch_row(pwg_query($query));
@@ -355 +362 @@
     AND '.$page['author_clause'].'
     AND '.$page['keyword_clause'].'
-    AND '.$page['status_clause'];
-if ($user['forbidden_categories'] != '')
-{
-  $query.= '
-    AND category_id NOT IN ('.$user['forbidden_categories'].')';
-}
-$query.= '
+    AND '.$page['status_clause'].'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'ic.image_id'
+      ),
+    'AND'
+  ).'
   GROUP BY comment_id
   ORDER BY '.$page['sort_by'].' '.$page['sort_order'];

trunk/include/category_cats.inc.php

@@ -43 +43 @@
   WHERE date_last > SUBDATE(
     CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY
-  );';
+  )
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'visible_categories' => 'id',
+      ),
+    'AND'
+  ).'
+;';
 }
 else
@@ -55 +64 @@
   ON id = cat_id and user_id = '.$user['id'].'
   WHERE id_uppercat '.
-  (!isset($page['category']) ? 'is NULL' : '= '.$page['category']);
-  if ($page['filter_local_mode'])
-  {
-    $query.= '
-    AND max_date_last > SUBDATE(
-      CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
-  }
-  $query.= '
+  (!isset($page['category']) ? 'is NULL' : '= '.$page['category']).'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'visible_categories' => 'id',
+      ),
+    'AND'
+  ).'
   ORDER BY rank
 ;';
@@ -86 +96 @@
   FROM '.CATEGORIES_TABLE.' AS c INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic
     ON ic.category_id = c.id';
-    if ($page['filter_local_mode'] or $user['filter_global_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'].')';
-    if ($page['filter_local_mode'] or $user['filter_global_mode'])
-    {
-      $query.= '
-    AND i.date_available  > SUBDATE(
-      CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
-    }
-    $query.= '
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'c.id',
+        'visible_categories' => 'c.id',
+        'visible_images' => 'image_id'
+      ),
+    'AND'
+  ).'
   ORDER BY RAND()
   LIMIT 0,1
@@ -117 +124 @@
   ON id = cat_id and user_id = '.$user['id'].'
   WHERE uppercats REGEXP \'(^|,)'.$row['id'].'(,|$)\'
-    AND representative_picture_id IS NOT NULL';
-    if ($page['filter_local_mode'] or $user['filter_global_mode'])
-    {
-      $query.= '
-      AND max_date_last > SUBDATE(
-        CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
-    }
-    $query.= '
+    AND representative_picture_id IS NOT NULL
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'visible_categories' => 'id',
+      ),
+    'AND'
+  ).'
   ORDER BY RAND()
   LIMIT 0,1
@@ -162 +170 @@
 if (count($categories) > 0)
 {
+  // Update filtered data
+  update_cats_with_filtered_data($categories);
+
   if ($conf['subcatify'])
   {

trunk/include/category_default.inc.php

@@ -3 +3 @@
 // | 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)
@@ -47 +47 @@
 SELECT *
   FROM '.IMAGES_TABLE.'
-  WHERE id IN ('.implode(',', $selection).')';
-  if ($page['filter_local_mode'] or $user['filter_global_mode'])
-  {
-    $query.= '
-    AND date_available  > SUBDATE(
-      CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
-  }
-  $query.= ';';
+  WHERE id IN ('.implode(',', $selection).')
+;';
   $result = pwg_query($query);
   while ($row = mysql_fetch_assoc($result))

trunk/include/common.inc.php

@@ -113 +113 @@
 $lang = array();
 $header_msgs = array();
+$header_notes = array();
 
 @include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
@@ -229 +230 @@
 }
 
+if (!defined('IN_ADMIN') or !IN_ADMIN)
+{
+  include(PHPWG_ROOT_PATH.'include/functions_filter.inc.php');
+  include(PHPWG_ROOT_PATH.'include/filter.inc.php');
+}
+
+if (isset($conf['header_notes']))
+{
+  $header_notes = array_merge($header_notes, $conf['header_notes']);
+}
+
 // default event handlers
 add_event_handler('render_comment_content', 'parse_comment_content');

trunk/include/config_default.inc.php

@@ -175 +175 @@
 $conf['links'] = array();
 
+// List of notes to display on all header page
+// example $conf['header_notes']  = array('Test', 'Hello');
+$conf['header_notes']  = array();
+
 // show_thumbnail_caption : on thumbnails page, show thumbnail captions ?
 $conf['show_thumbnail_caption'] = true;
@@ -544 +548 @@
 
 // +-----------------------------------------------------------------------+
-// | Set default for Web Service                                              |
+// | Set default for Web Service                                           |
 // +-----------------------------------------------------------------------+
 
@@ -562 +566 @@
   $conf['ws_durations'] = array(3650,1825,730,365,182,91,30,15,10,7,5,1,0); 
 
+// +-----------------------------------------------------------------------+
+// | Filter                                                                |
+// +-----------------------------------------------------------------------+
+// Pages where filter is enabled
+// Other pages cancel current filter
+$conf['filter_pages'] = array
+  (
+    'about.php', 'action.php', 'admin.php', 'comments.php', 
+    'index.php', 'picture.php', 'popuphelp.php', 'profile.php', 
+    'qsearch.php', 'random.php', 'register.php', 'search.php', 
+    'search_rules.php', 'tags.php', 'upload.php'
+  );
+
 ?>

trunk/include/functions_calendar.inc.php

@@ -30 +30 @@
 function initialize_calendar()
 {
-  global $page, $conf, $user, $template;
+  global $page, $conf, $user, $template, $filter;
 
 //------------------ initialize the condition on items to take into account ---
@@ -59 +59 @@
     {
       $inner_sql .= '
-WHERE category_id NOT IN ('.$user['forbidden_categories'].')';
+    '.get_sql_condition_FandF
+      (
+        array
+          (
+            'forbidden_categories' => 'category_id',
+            'visible_categories' => 'category_id',
+            'visible_images' => 'image_id'
+          ),
+        'WHERE', true
+      );
     }
   }

trunk/include/functions_category.inc.php

@@ -3 +3 @@
 // | 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)
@@ -45 +45 @@
   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'])))
   {
@@ -53 +55 @@
 function get_categories_menu()
 {
-  global $page, $user;
+  global $page, $user, $filter;
 
   $query = '
@@ -66 +68 @@
   // $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 +106 @@
   }
   usort($cats, 'global_rank_compare');
+
+  // Update filtered data
+  update_cats_with_filtered_data($cats);
 
   return get_html_menu_category($cats);

trunk/include/functions_html.inc.php

@@ -289 +289 @@
       $output.= '<a class=""';
       $output.= ' href="'
-            .make_index_url(
+            .duplicate_index_url(
                 array(
                   'category'=>$id,
                   'cat_name'=>$name
-                  )
+                  ),
+                array('start')
               )
             .'">';

trunk/include/functions_notification.inc.php

@@ -31 +31 @@
 
 /*
+ * get standard sql where in order to 
+ * restict an filter caregories and images
+ *
+ * IMAGE_CATEGORY_TABLE muste named ic in the query
+ *
+ * @param none
+ *
+ * @return string sql where
+ */
+function get_std_sql_where_restrict_filter($prefix_condition, $force_one_condition = false)
+{
+  return get_sql_condition_FandF
+          (
+            array
+              (
+                'forbidden_categories' => 'ic.category_id',
+                'visible_categories' => 'ic.category_id',
+                'visible_images' => 'ic.image_id'
+              ),
+            $prefix_condition,
+            $force_one_condition
+          );
+}
+
+/*
  * Execute custom notification query
  *
@@ -54 +79 @@
     AND c.validation_date > \''.$start.'\'
     AND c.validation_date <= \''.$end.'\'
-    AND category_id NOT IN ('.$user['forbidden_categories'].')
+      '.get_std_sql_where_restrict_filter('AND').'
 ;';
       break;
@@ -67 +92 @@
     case 'new_elements':
       $query = '
-  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id
+  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = id
   WHERE date_available > \''.$start.'\'
     AND date_available <= \''.$end.'\'
-    AND category_id NOT IN ('.$user['forbidden_categories'].')
+      '.get_std_sql_where_restrict_filter('AND').'
 ;';
       break;
     case 'updated_categories':
       $query = '
-  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id
+  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON image_id = id
   WHERE date_available > \''.$start.'\'
     AND date_available <= \''.$end.'\'
-    AND category_id NOT IN ('.$user['forbidden_categories'].')
+      '.get_std_sql_where_restrict_filter('AND').'
 ;';
       break;
@@ -424 +449 @@
   global $conf, $user;
 
-  $where_sql = 'WHERE category_id NOT IN ('.$user['forbidden_categories'].')';
+  $where_sql = get_std_sql_where_restrict_filter('WHERE', true);
 
   $query = '
@@ -430 +455 @@
       COUNT(DISTINCT id) nb_elements,
       COUNT(DISTINCT category_id) nb_cats
-  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id
+  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id
   '.$where_sql.'
   GROUP BY date_available
@@ -449 +474 @@
       $query = '
 SELECT DISTINCT id, path, name, tn_ext
-  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id
+  FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id
   '.$where_sql.'
     AND date_available="'.$dates[$i]['date_available'].'"
@@ -467 +492 @@
       $query = '
 SELECT DISTINCT c.uppercats, COUNT(DISTINCT i.id) img_count
-  FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON i.id=image_id
+  FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id=image_id
     INNER JOIN '.CATEGORIES_TABLE.' c ON c.id=category_id
   '.$where_sql.'

trunk/include/functions_search.inc.php

@@ -336 +336 @@
 function get_quick_search_results($q)
 {
-  global $user, $page;
+  global $user, $page, $filter;
   $search_results = array();
 
@@ -385 +385 @@
     INNER JOIN
   '.CATEGORIES_TABLE.' c on c.id=ic.category_id
-WHERE category_id NOT IN ('.$user['forbidden_categories'].')
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'ic.image_id'
+      ),
+    'WHERE'
+  ).'
 GROUP BY i.id';
 
@@ -428 +437 @@
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
   WHERE id IN ('.implode(',', array_keys($by_tag_weights) ).')
-    AND category_id NOT IN ('.$user['forbidden_categories'].')';
-
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'ic.image_id'
+      ),
+    'AND'
+  );
     $allowed_image_ids = array_from_query( $query, 'id');
     $by_tag_weights = array_intersect_key($by_tag_weights, array_flip($allowed_image_ids));

trunk/include/functions_tag.inc.php

@@ -38 +38 @@
  * @return array
  */
-function get_available_tags($forbidden_categories = null)
+function get_available_tags()
 {
   // we can find top fatter tags among reachable images
@@ -46 +46 @@
     INNER JOIN '.TAGS_TABLE.' ON tag_id = id';
 
-  if (!is_null($forbidden_categories))
+  $where_tag_img =
+    get_sql_condition_FandF
+    (
+      array
+        (
+          'forbidden_categories' => 'category_id',
+          'visible_categories' => 'category_id',
+          'visible_images' => 'image_id'
+        ),
+      'WHERE'
+    );
+
+  if (!is_null($where_tag_img))
   {
     // first we need all reachable image ids
@@ -52 +64 @@
 SELECT DISTINCT image_id
   FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE category_id NOT IN ('.implode(',', $forbidden_categories).')
+  '.$where_tag_img.'
 ;';
     $image_ids = array_from_query($images_query, 'image_id');

trunk/include/functions_url.inc.php

@@ -265 +265 @@
   }
 
+  if (isset($params['flat_recent_cat']) and $params['flat_recent_cat'] > 0)
+  {
+    $url.= '/flat_recent_cat-'.$params['flat_recent_cat'];
+  }
+
   if (isset($params['start']) and $params['start'] > 0)
   {

trunk/include/functions_user.inc.php

@@ -144 +144 @@
 }
 
-function build_user( $user_id, $use_cache, $filter_global_mode = false )
+function build_user( $user_id, $use_cache )
 {
   global $conf;
-
   $user['id'] = $user_id;
-  $user = array_merge( $user, getuserdata($user_id, $use_cache, $filter_global_mode) );
+  $user = array_merge( $user, getuserdata($user_id, $use_cache) );
   if ( $user['id'] == $conf['guest_id'])
   {
@@ -168 +167 @@
     $user['is_the_guest']=false;
   }
-
   // calculation of the number of picture to display per page
   $user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
@@ -199 +197 @@
  * @param array
  */
-function getuserdata($user_id, $use_cache, $filter_global_mode = false )
+function getuserdata($user_id, $use_cache)
 {
   global $conf;
@@ -268 +266 @@
   if ($use_cache)
   {
-    $userdata['filter_global_mode'] = $filter_global_mode;
-
     if (!isset($userdata['need_update'])
         or !is_bool($userdata['need_update'])
-        or $userdata['need_update'] == true
-        or $filter_global_mode  // not optimize condition RubTag
-       )
+        or $userdata['need_update'] == true)
     {
       $userdata['forbidden_categories'] =
         calculate_permissions($userdata['id'], $userdata['status']);
 
-      update_user_cache_categories($userdata);
+      update_user_cache_categories($userdata['id'], $userdata['forbidden_categories']);
 
       // Set need update are done
-      $userdata['need_update'] = $userdata['filter_global_mode']; // for draft always update RubTag
+      $userdata['need_update'] = false;
+
+      // Indicate update done
+      $userdata['need_update_done'] = true;
 
       $query = '
@@ -307 +304 @@
       pwg_query($query);
     }
-
-    {
+    else
+    {
+      // Indicate update not done
+      $userdata['need_update_done'] = false;
     }
   }
@@ -329 +328 @@
   }
 
+  // $filter['visible_categories'] and $filter['visible_images']
+  // must be not used because filter <> restriction
   // retrieving images allowed : belonging to at least one authorized
   // category
@@ -336 +337 @@
     ON f.image_id = ic.image_id
   WHERE f.user_id = '.$user['id'].'
-    AND ic.category_id NOT IN ('.$user['forbidden_categories'].')
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'ic.category_id',
+      ),
+    'AND'
+  ).'
 ;';
   $result = pwg_query($query);
@@ -455 +463 @@
 
 /**
- * compute data of categories branches
+ * compute data of categories branches (one branch only)
  */
 function compute_branch_cat_data(&$cats, &$list_cat_id, &$level, &$ref_level)
@@ -497 +505 @@
 
 /**
+ * compute data of categories branches
+ */
+function compute_categories_data(&$cats)
+{
+  $ref_level = 0;
+  $level = 0;
+  $list_cat_id = array();
+
+  foreach ($cats as $id => $category)
+  {
+    // Compute
+    $level = substr_count($category['global_rank'], '.') + 1;
+    if ($level > $ref_level)
+    {
+      array_push($list_cat_id, $id);
+    }
+    else
+    {
+      compute_branch_cat_data($cats, $list_cat_id, $level, $ref_level);
+      array_push($list_cat_id, $id);
+    }
+    $ref_level = $level;
+  }
+
+  $level = 1;
+  compute_branch_cat_data($cats, $list_cat_id, $level, $ref_level);
+}
+
+/**
+ * get computed array of categories
+ *
+ * @param int user_id
+ * @param list user_forbidden_categories
+ * @param bool filter_enabled
+ * @param int recent_period
+ * @return array
+ */
+function get_computed_categories($user_id, $user_forbidden_categories, $filter_enabled, $recent_period = 0)
+{
+  $query = '
+SELECT
+  c.id cat_id,
+  date_last max_date_last,
+  nb_images count_images,
+  global_rank';
+
+  if (!$filter_enabled)
+  {
+    $query.= '
+FROM '.CATEGORIES_TABLE.' as c';
+  }
+  else
+  {
+    // Count by date_available to avoid count null
+    $query.= ',
+  count(date_available) filtered_count_images,
+  max(date_available) max_date_available
+FROM '.CATEGORIES_TABLE.' as c
+    LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.category_id = c.id
+    LEFT JOIN '.IMAGES_TABLE.' AS i
+      ON ic.image_id = i.id AND 
+          i.date_available > SUBDATE(CURRENT_DATE,INTERVAL '.$recent_period.' DAY)';
+  }
+
+  if ($user_forbidden_categories != '')
+  {
+    $query.= '
+WHERE
+  c.id NOT IN ('.$user_forbidden_categories.')';
+  }
+
+  if ($filter_enabled)
+  {
+    $query.= '
+GROUP BY
+  c.id';
+  }
+  $query.= ';';
+
+  $result = pwg_query($query);
+
+  $cats = array();
+  while ($row = mysql_fetch_assoc($result))
+  {
+    $row['user_id'] = $user_id;
+    $row['count_categories'] = 0;
+    if ($filter_enabled)
+    {
+      $row['nb_images'] = $row['filtered_count_images'];
+      $row['count_images'] = $row['filtered_count_images'];
+      $row['max_date_last'] = $row['max_date_available'];
+    }
+    $cats += array($row['cat_id'] => $row);
+  }
+  usort($cats, 'global_rank_compare');
+
+  compute_categories_data($cats);
+
+  if ($filter_enabled)
+  {
+    $cat_tmp = $cats;
+    $cats = array();
+  
+    foreach ($cat_tmp as $category)
+    {
+      if (!empty($category['max_date_last']))
+      {
+        // Re-init counters
+        $category['count_categories'] = 0;
+        $category['nb_images'] = $category['filtered_count_images'];
+        $category['count_images'] = $category['filtered_count_images'];
+        // Keep category
+        $cats[$category['cat_id']] = $category;
+        
+      }
+    }
+    // Compute a second time
+    compute_categories_data($cats);
+  }
+
+  return $cats;
+}
+
+/**
  * update data of user_cache_categories
  *
- * @param array userdata
+ * @param int user_id
+ * @param list user_forbidden_categories
+ * @param bool filter_enabled
  * @return null
  */
-function update_user_cache_categories(&$userdata)
+function update_user_cache_categories($user_id, $user_forbidden_categories)
 {
   // delete user cache
   $query = '
 DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
-  WHERE user_id = '.$userdata['id'].'
+  WHERE user_id = '.$user_id.'
 ;';
   pwg_query($query);
 
-  /*$query = '
-SELECT id cat_id, date_last max_date_last, nb_images count_images, global_rank
-  FROM '.CATEGORIES_TABLE;
-  if ($userdata['forbidden_categories'] != '')
-  {
-    $query.= '
-    WHERE id NOT IN ('.$userdata['forbidden_categories'].')';
-  }
-  $query.= ';';*/
-
-
-  $query = '
-SELECT c.id cat_id, date_last max_date_last, nb_images count_images, global_rank';
-
-  if (!$userdata['filter_global_mode'])
-  {
-    $query.= '
-  FROM '.CATEGORIES_TABLE.' as C';
-  }
-  else
-  {
-    // Count by date_available to avoid count null
-    $query.= ', count(date_available) filtered_count_images, max(date_available) max_date_available
-  FROM '.CATEGORIES_TABLE.' as C
-    LEFT JOIN '.IMAGE_CATEGORY_TABLE.' AS ic
-    ON ic.category_id = c.id LEFT JOIN '.IMAGES_TABLE.' AS i 
-    ON ic.image_id = i.id AND i.date_available  > SUBDATE(
-      CURRENT_DATE,INTERVAL '.$userdata['recent_period'].' DAY)';
-  }
-
-  if ($userdata['forbidden_categories'] != '')
-  {
-    $query.= '
-    WHERE C.id NOT IN ('.$userdata['forbidden_categories'].')';
-  }
-
-  if ($userdata['filter_global_mode'])
-  {
-    $query.= '
-  GROUP BY c.id';
-  }
-  $query.= ';';
-
-  $result = pwg_query($query);
-
-  $cats = array();
-  while ($row = mysql_fetch_assoc($result))
-  {
-    $row['user_id'] = $userdata['id'];
-    $row['count_categories'] = 0;
-    if ($userdata['filter_global_mode'])
-    {
-      $row['count_images'] = $row['filtered_count_images'];
-      $row['max_date_last'] = $row['max_date_available'];
-    }
-    $cats += array($row['cat_id'] => $row);
-  }
-  usort($cats, 'global_rank_compare');
-
-  $ref_level = 0;
-  $level = 0;
-  $list_cat_id = array();
-
-  foreach ($cats as $id => $category)
-  {
-    // Compute
-    $level = substr_count($category['global_rank'], '.') + 1;
-    if ($level > $ref_level)
-    {
-      array_push($list_cat_id, $id);
-    }
-    else
-    {
-      compute_branch_cat_data($cats, $list_cat_id, $level, $ref_level);
-      array_push($list_cat_id, $id);
-    }
-    $ref_level = $level;
-  }
-
-  $level = 1;
-  compute_branch_cat_data($cats, $list_cat_id, $level, $ref_level);
-
-  if ($userdata['filter_global_mode'])
-  {
-    $forbidden_cats = array();
-    $forbidden_cats = explode(',', $userdata['forbidden_categories']);
-    $cat_tmp = $cats;
-    $cats = array();
-  
-    foreach ($cat_tmp as $cat_id => $category)
-    {
-      if (empty($category['max_date_last']))
-      {
-        array_push($forbidden_cats, $category['cat_id']);
-      }
-      else
-      {
-        array_push($cats, $category);
-      }
-    }
-    $userdata['forbidden_categories'] = implode(',', array_unique($forbidden_cats));
-  }
+  $cats = get_computed_categories($user_id, $user_forbidden_categories, false);
 
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
@@ -1015 +1048 @@
 }
 
+/*
+ * Compute sql where condition with restrict and filter data
+ *
+ * FandF: Forbidden and Filters
+ *
+ * @param $condition_fields array: 
+ *            keys are condition to aply and 
+ *            values are sql field to use
+ *            array('forbidden_categories' => 'ic.category_id')
+ *        $prefix_condition string:
+ *            this value are concatenated if sql is not empty
+ *        $force_one_condition:
+ *            if there are not condition , use this condition "1 = 1"
+ *
+ * @return string sql where/conditions
+ */
+function get_sql_condition_FandF($condition_fields, $prefix_condition = null, $force_one_condition = false)
+{
+  global $user, $filter;
+
+  $sql_list = array();
+
+  foreach ($condition_fields as $condition => $field_name)
+  {
+    switch($condition)
+    {
+      case 'forbidden_categories':
+        if (!empty($user['forbidden_categories']))
+        {
+          $sql_list[] = $field_name.' NOT IN ('.$user['forbidden_categories'].')';
+        }
+        break;
+
+      case 'visible_categories':
+        if (!empty($filter['visible_categories']))
+        {
+          $sql_list[] = $field_name.' IN ('.$filter['visible_categories'].')';
+        }
+        break;
+
+      case 'visible_images':
+        if (!empty($filter['visible_images']))
+        {
+          $sql_list[] = $field_name.' IN ('.$filter['visible_images'].')';
+        }
+        break;
+
+      default:
+        die('Unknow condition');
+        break;
+
+    }
+  }
+
+  if (count($sql_list) > 0)
+  {
+    $sql = '('.implode(' AND ', $sql_list).')';
+  }
+  else
+  {
+    if ($force_one_condition)
+    {
+      $sql = '1 = 1';
+    }
+    else
+    {
+      $sql = '';
+    }
+  }
+
+  if (isset($prefix_condition) and !empty($sql))
+  {
+    $sql = $prefix_condition.' '.$sql;
+  }
+
+  return $sql;
+}
+
 ?>

trunk/include/menubar.inc.php

@@ -64 +64 @@
     );
 }
+
+//------------------------------------------------------------------------ filter
+if ($filter['enabled'])
+{
+  $template->assign_block_vars(
+    'stop_filter',
+    array(
+      'URL' => add_url_params(make_index_url(array()), array('filter' => 'stop'))
+      )
+    );
+}
+else
+{
+  $template->assign_block_vars(
+    'start_filter',
+    array(
+      'URL' => add_url_params(make_index_url(array()), array('filter' => 'start'))
+      )
+    );
+}
+
+
 //------------------------------------------------------------------------ tags
 if ('tags' == $page['section'])

trunk/include/page_header.php

@@ -61 +61 @@
   $template->assign_block_vars( 'header_meta', $header_infos);
 }
+
+// Header notes
+if (count($header_notes) > 0)
+{
+  $template->assign_block_vars('header_notes', array());
+  foreach ($header_notes as $header_note)
+  {
+    $template->assign_block_vars('header_notes.header_note',
+                                 array('HEADER_NOTE' => $header_note));
+  }
+}
+
 // refresh
 if ( isset( $refresh ) and intval($refresh) >= 0

trunk/include/section_init.inc.php

@@ -268 +268 @@
   }
 
+  if (preg_match('/^flat_recent_cat-(\d+)/', $tokens[$i], $matches))
+  {
+    // indicate a special list of images
+    $page['flat_recent_cat'] = $matches[1];
+  }
+
   if (preg_match('/^(posted|created)/', $tokens[$i] ))
   {
@@ -326 +332 @@
       $page,
       array(
-        'comment'          => $result['comment'],
-        'cat_dir'          => $result['dir'],
-        'cat_name'         => $result['name'],
-        'cat_site_id'      => $result['site_id'],
-        'cat_uploadable'   => $result['uploadable'],
-        'cat_commentable'  => $result['commentable'],
-        'cat_id_uppercat'  => $result['id_uppercat'],
-        'uppercats'        => $result['uppercats'],
-
-        'title' => get_cat_display_name($result['name'], '', false),
-        )
-      );
-
-    if (!isset($page['chronology_field']))
-    {
-      if ( !empty($result['image_order']) and !isset($page['super_order_by']) )
+        'comment'            => $result['comment'],
+        'cat_dir'            => $result['dir'],
+        'cat_name'           => $result['name'],
+        'cat_site_id'        => $result['site_id'],
+        'cat_uploadable'     => $result['uploadable'],
+        'cat_commentable'    => $result['commentable'],
+        'cat_id_uppercat'    => $result['id_uppercat'],
+        'uppercats'          => $result['uppercats'],
+        'title'             => 
+          get_cat_display_name($result['name'], '', false),
+        'thumbnails_include' => 
+          (($result['nb_images'] > 0) or (isset($page['flat_recent_cat'])))
+          ? 'include/category_default.inc.php'
+          : 'include/category_cats.inc.php'
+        )
+      );
+  }
+  else
+  {
+    $page['title'] = $lang['no_category'];
+    $page['thumbnails_include'] = 
+      (isset($page['flat_recent_cat']))
+          ? 'include/category_default.inc.php'
+          : 'include/category_cats.inc.php';
+  }
+
+  if (isset($page['flat_recent_cat']))
+  {
+    $page['title'] = $lang['recent_pics_cat'].' : '.$page['title'] ;
+  }
+
+  if 
+    (
+      (!isset($page['chronology_field'])) and
+      (
+        (isset($page['category'])) or 
+        (isset($page['flat_recent_cat']))
+      )
+    )
+  {
+    if ( !empty($result['image_order']) and !isset($page['super_order_by']) )
+    {
+      $conf[ 'order_by' ] = ' ORDER BY '.$result['image_order'];
+    }
+
+    if (isset($page['flat_recent_cat']))
+    {
+      // flat recent categories mode
+        $query = '
+SELECT
+  DISTINCT(ic.image_id)
+FROM '.IMAGES_TABLE.' AS i
+       INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id = ic.image_id
+       INNER JOIN '.CATEGORIES_TABLE.' AS c ON ic.category_id = c.id
+WHERE
+  date_available  > SUBDATE(
+      CURRENT_DATE,INTERVAL '.$page['flat_recent_cat'].' DAY)'.
+  (isset($page['category']) ? '
+  AND uppercats REGEXP \'(^|,)'.$page['category'].'(,|$)\'' : '' ).'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'image_id'
+      ),
+    'AND'
+  ).'
+;';
+
+      $where_sql = array_from_query($query, 'image_id');
+      if (!empty($where_sql))
       {
-        $conf[ 'order_by' ] = ' ORDER BY '.$result['image_order'];
+        $where_sql = 'image_id in ('.implode(',', $where_sql).')';
       }
-
+    }
+    else
+    {
+      // Normal mode
+      $where_sql = 'category_id = '.$page['category'];
+    }
+
+    if (!empty($where_sql))
+    {
+      // Main query
       $query = '
 SELECT image_id
   FROM '.IMAGE_CATEGORY_TABLE.'
     INNER JOIN '.IMAGES_TABLE.' ON id = image_id
-  WHERE category_id = '.$page['category'].'
+  WHERE
+    '.$where_sql.'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'image_id'
+      ),
+    'AND'
+  ).'
   '.$conf['order_by'].'
 ;';
+
       $page['items'] = array_from_query($query, 'image_id');
-
-      $page['thumbnails_include'] =
-        $result['nb_images'] > 0
-        ? 'include/category_default.inc.php'
-        : 'include/category_cats.inc.php';
-    } //otherwise the calendar will requery all subitems
-  }
-  else
-  {
-    $page['title'] = $lang['no_category'];
-    $page['thumbnails_include'] = 'include/category_cats.inc.php';
-  }
+    }
+    else
+    {
+      $page['items'] = array();
+    }
+  } //otherwise the calendar will requery all subitems
 }
 // special sections
 else
 {
-  if (!empty($user['forbidden_categories']))
-  {
-    $forbidden =
-      ' category_id NOT IN ('.$user['forbidden_categories'].')';
-  }
-  else
-  {
-    $forbidden = ' 1 = 1';
-  }
+  $forbidden = 
+    get_sql_condition_FandF
+    (
+      array
+        (
+          'forbidden_categories' => 'category_id',
+          'visible_categories' => 'category_id',
+          'visible_images' => 'image_id'
+        ),
+      'AND'
+    );
+
 // +-----------------------------------------------------------------------+
 // |                            tags section                               |
@@ -401 +482 @@
   FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' ON image_id=id
   WHERE image_id IN ('.implode(',', $items).')
-    AND '.$forbidden.
+    '.$forbidden.
     $conf['order_by'].'
 ;';
@@ -435 +516 @@
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
   WHERE id IN ('.implode(',', $search_result['items']).')
-    AND '.$forbidden.'
+    '.$forbidden.'
   '.$conf['order_by'].'
 ;';
@@ -465 +546 @@
     INNER JOIN '.IMAGES_TABLE.' ON image_id = id
   WHERE user_id = '.$user['id'].'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'visible_images' => 'image_id'
+      ),
+    'AND'
+  ).'
   '.$conf['order_by'].'
 ;';
@@ -488 +577 @@
   WHERE date_available > \''.
       date('Y-m-d', time() - 60*60*24*$user['recent_period']).'\'
-    AND '.$forbidden.'
+    '.$forbidden.'
   '.$conf['order_by'].'
 ;';
@@ -527 +616 @@
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
   WHERE hit > 0
-    AND '.$forbidden.'
+    '.$forbidden.'
     '.$conf['order_by'].'
   LIMIT 0, '.$conf['top_number'].'
@@ -555 +644 @@
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
   WHERE average_rate IS NOT NULL
-    AND '.$forbidden.'
+    '.$forbidden.'
     '.$conf['order_by'].'
   LIMIT 0, '.$conf['top_number'].'
@@ -579 +668 @@
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
   WHERE image_id IN ('.implode(',', $page['list']).')
-    AND '.$forbidden.'
+    '.$forbidden.'
   '.$conf['order_by'].'
 ;';

trunk/include/user.inc.php

@@ -3 +3 @@
 // | 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)
@@ -71 +71 @@
 }
 
-if (isset($_GET['filter_global_mode']))
-{
-  $user['filter_global_mode'] = ($_GET['filter_global_mode'] == 'start');
-  pwg_set_session_var('filter_global_mode', $user['filter_global_mode']);
-}
-else
-{
-  $user['filter_global_mode'] = pwg_get_session_var('filter_global_mode', false);
-}
-
 $user = build_user( $user['id'],
-          ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true, // use cache ?
-          $user['filter_global_mode'] // filter_global_mode ?
+          ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
          );
 

trunk/index.php

@@ -107 +107 @@
 }
 
-if (isset($_GET['filter_local_mode']))
-{
-  $page['filter_local_mode'] = ($_GET['filter_local_mode'] == 'start');
-}
-else
-{
-  $page['filter_local_mode'] = pwg_get_session_var('filter_local_mode', false);
-}
-
-$page['filter_local_mode'] = (($page['filter_local_mode']) and
-                              ($page['section'] == 'categories') and
-                              (!isset($page['chronology_field'])));
-pwg_set_session_var('filter_local_mode', $page['filter_local_mode']);
-
-if ($page['filter_local_mode'])
-{
-  $template->assign_block_vars(
-    'stop_filter_local_mode',
-    array(
-      'URL' => add_url_params(duplicate_index_url(array(), array('start')), array('filter_local_mode' => 'stop'))
-      )
-    );
-}
-else
-{
-  $template->assign_block_vars(
-    'start_filter_local_mode',
-    array(
-      'URL' => add_url_params(duplicate_index_url(array(), array('start')), array('filter_local_mode' => 'start'))
-      )
-    );
-}
-
-if (isset($_GET['filter_global_mode']))
-{
-  $user['filter_global_mode'] = ($_GET['filter_global_mode'] == 'start');
-  pwg_set_session_var('filter_global_mode', $user['filter_global_mode']);
-}
-else
-{
-  $user['filter_global_mode'] = pwg_get_session_var('filter_global_mode', false);
-}
-
-if ($user['filter_global_mode'])
-{
-  $template->assign_block_vars(
-    'stop_filter_global_mode',
-    array(
-      'URL' => add_url_params(duplicate_index_url(array(), array('start')), array('filter_global_mode' => 'stop'))
-      )
-    );
-}
-else
-{
-  $template->assign_block_vars(
-    'start_filter_global_mode',
-    array(
-      'URL' => add_url_params(duplicate_index_url(array(), array('start')), array('filter_global_mode' => 'start'))
+if (isset($page['flat_recent_cat']) or isset($page['chronology_field']))
+{
+  $template->assign_block_vars(
+    'mode_normal',
+    array(
+      'URL' => duplicate_index_url( array(), array('chronology_field', 'start', 'flat_recent_cat') )
+      )
+    );
+}
+
+if (!isset($page['flat_recent_cat']))
+{
+  $template->assign_block_vars(
+    'flat_recent_cat',
+    array(
+      'URL' => duplicate_index_url(array('flat_recent_cat' => $user['recent_period']), array('start', 'chronology_field'))
       )
     );
@@ -180 +138 @@
     'mode_created',
     array(
-      'URL' => duplicate_index_url( $chronology_params, array('start') )
+      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat_recent_cat') )
       )
     );
@@ -188 +146 @@
     'mode_posted',
     array(
-      'URL' => duplicate_index_url( $chronology_params, array('start') )
+      'URL' => duplicate_index_url( $chronology_params, array('start', 'flat_recent_cat') )
       )
     );
@@ -194 +152 @@
 else
 {
-  $template->assign_block_vars(
-    'mode_normal',
-    array(
-      'URL' => duplicate_index_url( array(), array('chronology_field','start') )
-      )
-    );
-
   if ($page['chronology_field'] == 'created')
   {
@@ -211 +162 @@
   $url = duplicate_index_url(
             array('chronology_field'=>$chronology_field ),
-            array('chronology_date', 'start')
+            array('chronology_date', 'start', 'flat_recent_cat')
           );
   $template->assign_block_vars(

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -3 +3 @@
 // | 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)
@@ -491 +491 @@
 $lang['maxwidth'] = 'Maximum width of the pictures';
 $lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
-$lang['start_filter_local_mode_hint'] = '[local] displays only recent elements';
-$lang['stop_filter_local_mode_hint'] = '[local] return to display all elements';
-$lang['start_filter_global_mode_hint'] = '[global] displays only recent elements';
-$lang['stop_filter_global_mode_hint'] = '[global] return to display all elements';
+$lang['flat_recent_cat_hint'] = 'display recent elements of categories and sub-categories';
+$lang['start_filter_hint'] = 'displays only recent elements';
+$lang['stop_filter_hint'] = 'return to display all elements';
 $lang['mode_created_hint'] = 'displays a calendar by creation date';
 $lang['mode_normal_hint'] = 'return to normal view mode';
@@ -614 +613 @@
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
+$lang['note_filter_day'] = 'The whole of the elements are filtered in order to diplay the recent elements of less %s day.';
+$lang['note_filter_days'] = 'The whole of the elements are filtered in order to diplay the recent elements of less %s days.';
 ?>

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -3 +3 @@
 // | 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)
@@ -491 +491 @@
 $lang['maxwidth'] = 'Largeur maximum des images';
 $lang['maxwidth_error'] = 'La largeur des images doit être supérieure à 50';
-$lang['start_filter_local_mode_hint'] = '[local] afficher que les éléments récents';
-$lang['stop_filter_local_mode_hint'] = '[local] retourner à l\'affichage de tous les éléments';
-$lang['start_filter_global_mode_hint'] = '[global] afficher que les éléments récents';
-$lang['stop_filter_global_mode_hint'] = '[global] retourner à l\'affichage de tous les éléments';
+$lang['flat_recent_cat_hint'] = 'affiche les éléments récents des catégories et des sous-catégories';
+$lang['start_filter_hint'] = 'afficher que les éléments récents';
+$lang['stop_filter_hint'] = 'retourner à l\'affichage de tous les éléments';
 $lang['mode_created_hint'] = 'afficher un calendrier par date de création';
 $lang['mode_normal_hint'] = 'retourner à la vue normale';
@@ -615 +614 @@
 $lang['w_month'] = 'Mois';
 $lang['yes'] = 'Oui';
+$lang['note_filter_day'] = 'L\'ensemble des éléments est filtré pour n\'afficher que les éléments récents de moins de %d jour.';
+$lang['note_filter_days'] = 'L\'ensemble des éléments est filtré pour n\'afficher que les éléments récents de moins de %d jours.';
 ?>

trunk/picture.php

@@ -249 +249 @@
     INNER JOIN '.CATEGORIES_TABLE.' ON category_id = id
   WHERE image_id = '.$page['image_id'].'
-    AND category_id NOT IN ('.$user['forbidden_categories'].')
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id'
+      ),
+    'AND'
+  ).'
 ;';
 $result = pwg_query($query);

trunk/random.php

@@ -46 +46 @@
   FROM '.IMAGES_TABLE.'
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
-  '.(
-    $user['forbidden_categories'] != ''
-      ? 'WHERE category_id NOT IN ('.$user['forbidden_categories'].')'
-      : ''
-    ).'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'id'
+      ),
+    'WHERE'
+  ).'
   ORDER BY RAND(NOW())
   LIMIT 0, '.$conf['top_number'].'

trunk/search.php

@@ -188 +188 @@
   );
 
-$available_tags = get_available_tags(
-      isset($user['forbidden_categories'])
-      ? explode(',', $user['forbidden_categories'])
-      : null
-      );
+$available_tags = get_available_tags();
 
 if (count($available_tags) > 0)
@@ -214 +210 @@
 $query = '
 SELECT name,id,date_last,nb_images,global_rank,uppercats
-  FROM '.CATEGORIES_TABLE;
-if ($user['forbidden_categories'] != '')
-{
-  $query.= '
-  WHERE id NOT IN ('.$user['forbidden_categories'].')';
-}
-$query.= '
+  FROM '.CATEGORIES_TABLE.'
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'id',
+        'visible_categories' => 'id'
+      ),
+    'WHERE'
+  ).'
 ;';
 

trunk/services/recent.php

@@ -1 +1 @@
 <?php
 
-$where = ( $user['forbidden_categories'] == '') ? '' :
-  'ic.`category_id` NOT IN ('.$user['forbidden_categories'].')';
+$where = 
+  get_sql_condition_FandF
+    (
+      array
+        (
+          'forbidden_categories' => 'ic.category_id',
+          'visible_categories' => 'ic.category_id',
+          'visible_images' => 'i.id'
+        ),
+      ''
+    );
 $list = implode(',', $final);
 if ( $where !== '' and $list !== '' )

trunk/tags.php

@@ -74 +74 @@
 
 // find all tags available for the current user
-$tags = get_available_tags(explode(',', $user['forbidden_categories']));
+$tags = get_available_tags();
 
 // we want only the first most represented tags, so we sort them by counter

trunk/template/yoga/default-colors.css

@@ -101 +101 @@
 }
 
+/**
+ * Header notes box in public/administration
+ */
+.header_notes {
+  border: 1px solid #aaaaaa; /* border color and style */
+  text-align: center;
+  background-image: url(icon/note.png);
+  background-repeat: no-repeat;
+  background-position: top left;
+  font-weight: bold;
+  margin: 14px;
+  padding: 5px 00px 0px 0px;
+}
+
 LEGEND {
   font-style: italic;

trunk/template/yoga/header.tpl

@@ -73 +73 @@
 <!-- END header_msgs -->
 <div id="theHeader">{PAGE_BANNER}</div>
+<!-- BEGIN header_notes -->
+<div class="header_notes">
+  <!-- BEGIN header_note -->
+  <P>{header_notes.header_note.HEADER_NOTE}</p>
+  <!-- END header_note -->
+</div>
+<!-- END header_notes -->

trunk/template/yoga/index.tpl

@@ -28 +28 @@
       <!-- END search_rules -->
 
-      <!-- BEGIN start_filter_local_mode -->
-      <li><a href="{start_filter_local_mode.URL}" title="{lang:start_filter_local_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter_mode.png" class="button" alt="{lang:start_filter_local_mode_hint}"></a></li>
-      <!-- END start_filter_local_mode -->
-      <!-- BEGIN stop_filter_local_mode -->
-      <li><a href="{stop_filter_local_mode.URL}" title="{lang:stop_filter_local_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter_mode.png" class="button" alt="{lang:stop_filter_local_mode_hint}"></a></li>
-      <!-- END stop_filter_local_mode -->
-
       <!-- BEGIN mode_normal -->
       <li><a href="{mode_normal.URL}" title="{lang:mode_normal_hint}"><img src="{pwg_root}{themeconf:icon_dir}/normal_mode.png" class="button" alt="{lang:mode_normal_hint}"></a></li>
       <!-- END mode_normal -->
+
+      <!-- BEGIN flat_recent_cat -->
+      <li><a href="{flat_recent_cat.URL}" title="{lang:flat_recent_cat_hint}"><img src="{pwg_root}{themeconf:icon_dir}/flat_recent_cat.png" class="button" alt="{lang:flat_recent_cat_hint}"></a></li>
+      <!-- END flat_recent_cat -->
+
       <!-- BEGIN mode_posted -->
       <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>

trunk/template/yoga/menubar.tpl

@@ -14 +14 @@
 <!-- END links -->
 <dl id="mbCategories">
-  <!-- BEGIN start_filter_global_mode -->
-  <a href="{start_filter_global_mode.URL}" title="{lang:start_filter_global_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter_mode.png" class="buttonmenu" alt="{lang:start_filter_global_mode_hint}"></a>
-  <!-- END start_filter_global_mode -->
-  <!-- BEGIN stop_filter_global_mode -->
-  <a href="{stop_filter_global_mode.URL}" title="{lang:stop_filter_global_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter_mode.png" class="buttonmenu" alt="{lang:stop_filter_global_mode_hint}"></a>
-  <!-- END stop_filter_global_mode -->
+  <!-- BEGIN start_filter -->
+  <a href="{start_filter.URL}" title="{lang:start_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter.png" class="buttonmenu" alt="{lang:start_filter_hint}"></a>
+  <!-- END start_filter -->
+  <!-- BEGIN stop_filter -->
+  <a href="{stop_filter.URL}" title="{lang:stop_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter.png" class="buttonmenu" alt="{lang:stop_filter_hint}"></a>
+  <!-- END stop_filter -->
   <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
   <dd>

trunk/template/yoga/theme/clear/theme.css

@@ -16 +16 @@
 }
 
-#menubar DL, #content, #imageToolBar {
+#menubar DL, #content, #imageToolBar, .header_notes {
   background-color: #eeeeee;
 }

trunk/template/yoga/theme/dark/theme.css

@@ -27 +27 @@
 }
 
-#menubar DL, #content, #imageToolBar {
+#menubar DL, #content, #imageToolBar, .header_notes {
   background-color: #5f5f5f;
 }

trunk/web_service.php

@@ -171 +171 @@
 SELECT DISTINCT image_id 
   FROM '.IMAGE_CATEGORY_TABLE.'
-WHERE  category_id NOT IN ('.$user['forbidden_categories'].') 
+WHERE
+'.get_sql_condition_FandF
+  (
+    array
+      (
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'image_id'
+      ),
+    '', true
+  ).'
   AND  image_id IN ('.$list.')
 ;';
@@ -390 +400 @@
        AND i.`representative_ext` IS NULL 
        '.$cat_criterion.'
-       AND c.`id` NOT IN ('.$user['forbidden_categories'].') ';
+       '.get_sql_condition_FandF
+         (
+            array
+             (
+               'forbidden_categories' => 'c.id',
+               'visible_categories' => 'c.id',
+               'visible_images' => 'i.id'
+              ),
+           'AND'
+         );
 
 //     AND c.`agreed_ws` = \'true\' (Obsolete specification replaced by force)