Changeset 1711 for trunk/include/section_init.inc.php

Timestamp:

Jan 11, 2007, 6:10:16 AM (17 years ago)

Author:

rvelices

Message:

• better code in filter.inc.php (remove unused code + filter is not reseted

when going to an unfiltered page)

• removed unnecessary filtered pages from config_default (especially admin !!!)
• removed flat recent category icon from irrelevant pages
• mysterious code comment appeared in picture.php

File:

• trunk/include/section_init.inc.php (modified) (5 diffs)

trunk/include/section_init.inc.php

@@ -279 +279 @@
   }
 
-  if (preg_match('/^flat_recent_cat-(\d+)/', $tokens[$i], $matches))
+  if ('categories'==$page['section'] and
+      preg_match('/^flat_recent_cat-(\d+)/', $tokens[$i], $matches))
   {
     // indicate a special list of images
@@ -326 +327 @@
   $page['super_order_by'] = true;
 }
+
+$forbidden = get_sql_condition_FandF(
+      array
+        (
+          'forbidden_categories' => 'category_id',
+          'visible_categories' => 'category_id',
+          'visible_images' => 'image_id'
+        ),
+      'AND'
+  );
 
 // +-----------------------------------------------------------------------+
@@ -402 +413 @@
   (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'
-  ).'
+'.$forbidden.'
 ;';
 
@@ -430 +432 @@
       // Main query
       $query = '
-SELECT distinct image_id
+SELECT DISTINCT(image_id)
   FROM '.IMAGE_CATEGORY_TABLE.'
     INNER JOIN '.IMAGES_TABLE.' ON id = image_id
   WHERE
     '.$where_sql.'
-'.get_sql_condition_FandF
-  (
-    array
-      (
-        'forbidden_categories' => 'category_id',
-        'visible_categories' => 'category_id',
-        'visible_images' => 'image_id'
-      ),
-    'AND'
-  ).'
+'.$forbidden.'
   '.$conf['order_by'].'
 ;';
@@ -459 +452 @@
 else
 {
-  $forbidden =
-    get_sql_condition_FandF
-    (
-      array
-        (
-          'forbidden_categories' => 'category_id',
-          'visible_categories' => 'category_id',
-          'visible_images' => 'image_id'
-        ),
-      'AND'
-    );
-
 // +-----------------------------------------------------------------------+
 // |                            tags section                               |