Changeset 320

Timestamp:

Jan 25, 2004, 11:05:43 PM (20 years ago)

Author:

z0rglub

Message:

didn't take correctly into account forbidden categories

File:

• branches/release-1_3/include/functions_category.inc.php (modified) (6 diffs)

branches/release-1_3/include/functions_category.inc.php

@@ -408 +408 @@
 {
   pwg_debug( 'start initialize_category' );
-  global $page,$lang,$user,$conf, $where_append;
+  global $page,$lang,$user,$conf;
 
   if ( isset( $page['cat'] ) )
@@ -417 +417 @@
     // $url is used to create the navigation bar
     $url = './category.php?cat='.$page['cat'];
-        if ( isset($page['expand']) )
-    {
-      $url.= '&expand='.$page['expand'];
-        }
+    if ( isset($page['expand']) ) $url.= '&expand='.$page['expand'];
     // simple category
     if ( is_numeric( $page['cat'] ) )
@@ -443 +440 @@
         if ( $user['forbidden_categories'] != '' )
         {
-          $query.= ' AND category_id NOT IN ';
-          $query.= '('.$user['forbidden_categories'].')';
+          $forbidden = ' category_id NOT IN ';
+          $forbidden.= '('.$user['forbidden_categories'].')';
         }
       }
@@ -489 +486 @@
         }
         $page['where'].= ' )';
-        $page['where'].= $where_append;
+        if ( isset( $forbidden ) ) $page['where'].= ' AND '.$forbidden;
 
         $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images';
@@ -523 +520 @@
         $page['where'] = " WHERE date_available > '";
         $page['where'].= date( 'Y-m-d', $date )."'";
-        $page['where'].= $where_append;
+        if ( isset( $forbidden ) ) $page['where'].= ' AND '.$forbidden;
 
         $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images';
@@ -536 +533 @@
       {
         $page['title'] = $conf['top_number'].' '.$lang['most_visited_cat'];
-        $page['where'] = ' WHERE category_id != -1'.$where_append;
+        
+        if ( isset( $forbidden ) ) $page['where'] = ' WHERE '.$forbidden;
+        else                       $page['where'] = '';
         $conf['order_by'] = ' ORDER BY hit DESC, file ASC';
         $page['cat_nb_images'] = $conf['top_number'];