Changeset 67 for trunk/include/functions_category.inc.php

Timestamp:

Sep 6, 2003, 9:22:59 AM (21 years ago)

Author:

z0rglub

Message:

• Creation of plain structure if not existing in several functions

• Change in SQL request about restrictions : using "AND category_id NOT IN (x,y,z)" instead of "AND category_id != x AND category_id != y AND category_id != z"

• For search and most recent category, using "COUNT(DISTINCT(id))" instead of "COUNT(*)" and using JOIN with image_category table

File:

• trunk/include/functions_category.inc.php (modified) (8 diffs)

trunk/include/functions_category.inc.php

@@ -128 +128 @@
 {
   global $page;
+
+  if ( !isset( $page['plain_structure'] ) )
+    $page['plain_structure'] = get_plain_structure();
 
   $structure = array();
@@ -303 +306 @@
 
   $cat['name'] = array();
+
+  if ( !isset( $page['plain_structure'] ) )
+    $page['plain_structure'] = get_plain_structure();
+
   array_push( $cat['name'], $page['plain_structure'][$id]['name'] );
   while ( $page['plain_structure'][$id]['id_uppercat'] != '' )
@@ -330 +337 @@
   global $page;
 
+  if ( !isset( $page['plain_structure'] ) )
+    $page['plain_structure'] = get_plain_structure();
+  
   // creating the local path : "root_cat/sub_cat/sub_sub_cat/"
   $dir = $page['plain_structure'][$category_id]['dir'].'/';
@@ -345 +355 @@
 {
   global $page;
+
+  if ( !isset( $page['plain_structure'] ) )
+    $page['plain_structure'] = get_plain_structure();
 
   $query = 'SELECT galleries_url';
@@ -434 +447 @@
         // we must not show pictures of a forbidden category
         $restricted_cats = get_all_restrictions( $user['id'],$user['status'] );
-        foreach ( $restricted_cats as $restricted_cat ) {
-          $where_append.= ' AND category_id != '.$restricted_cat;
+        if ( count( $restricted_cats ) > 0 )
+        {
+          $where_append.= ' AND category_id NOT IN (';
+          foreach ( $restricted_cats as $i => $restricted_cat ) {
+            if ( $i > 0 ) $where_append.= ',';
+            $where_append.= $restricted_cat;
+          }
+          $where_append.= ')';
         }
       }
@@ -482 +501 @@
         $page['where'].= $where_append;
 
-        $query = 'SELECT COUNT(*) AS nb_total_images';
+        $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images';
         $query.= ' FROM '.PREFIX_TABLE.'images';
+        $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic';
+        $query.= ' ON id = ic.image_id';
         $query.= $page['where'];
         $query.= ';';
@@ -514 +535 @@
         $page['where'].= $where_append;
 
-        $query = 'SELECT COUNT(*) AS nb_total_images';
+        $query = 'SELECT COUNT(DISTINCT(id)) AS nb_total_images';
         $query.= ' FROM '.PREFIX_TABLE.'images';
+        $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic';
+        $query.= ' ON id = ic.image_id';
         $query.= $page['where'];
         $query.= ';';
@@ -531 +554 @@
         }
       }
-      
+
       if ( $query != '' )
       {
+        echo $query;
         $result = mysql_query( $query );
         $row = mysql_fetch_array( $result );