Changeset 64

Timestamp:

Sep 5, 2003, 9:27:45 PM (21 years ago)

Author:

z0rglub

Message:

Correcting a bug in special categories (favorites, most seen, most
recent... non numeric categories) : when a picture is linked to more than
one category, it's only displayed once.

Location:

trunk

Files:

• category.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (1 diff)
• picture.php (modified) (6 diffs)

trunk/category.php

@@ -234 +234 @@
   $array_cat_directories = array();
   
-  $query = 'SELECT id,file,date_available,tn_ext,name,filesize';
-  $query.= ',storage_category_id,category_id';
-  $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+  $query = 'SELECT distinct(id),file,date_available,tn_ext,name,filesize';
+  $query.= ',storage_category_id';
+  $query.= ' FROM '.PREFIX_TABLE.'images AS i';
+  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id';
   $query.= $page['where'];
   $query.= $conf['order_by'];
@@ -252 +252 @@
   while ( $row = mysql_fetch_array( $result ) )
   {
+    // retrieving the storage dir of the picture
     if ( $array_cat_directories[$row['storage_category_id']] == '' )
     {

trunk/include/functions_category.inc.php

@@ -494 +494 @@
         $page['title'] = $lang['favorites'];
 
-        $page['where'] = ', '.PREFIX_TABLE.'favorites';
+        $page['where'] = ', '.PREFIX_TABLE.'favorites AS fav';
         $page['where'].= ' WHERE user_id = '.$user['id'];
-        $page['where'].= ' AND image_id = id';
+        $page['where'].= ' AND fav.image_id = id';
       
         $query = 'SELECT COUNT(*) AS nb_total_images';

trunk/picture.php

@@ -41 +41 @@
 $query = 'SELECT id,date_available,comment,hit,keywords';
 $query.= ',author,name,file,date_creation,filesize,width,height';
-$query.= ',storage_category_id,category_id';
+$query.= ',storage_category_id';
+if ( is_numeric( $page['cat'] ) )
+{
+  $query.= ',category_id';
+}
 $query.= ' FROM '.PREFIX_TABLE.'images';
-$query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+$query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id = ic.image_id';
 $query.= $page['where'];
 $query.= ' AND id = '.$_GET['image_id'];
@@ -65 +69 @@
 $page['storage_category_id'] = $row['storage_category_id'];
 // retrieving the number of the picture in its category (in order)
-$query = 'SELECT id';
+$query = 'SELECT DISTINCT(id)';
 $query.= ' FROM '.PREFIX_TABLE.'images';
-$query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+$query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id = ic.image_id';
 $query.= $page['where'];
 $query.= $conf['order_by'];
@@ -129 +133 @@
     $query = 'SELECT id';
     $query.= ' FROM '.PREFIX_TABLE.'images';
-    $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+    $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category  AS ic';
+    $query.= ' ON id = ic.image_id';
     $query.= $page['where'];
     $query.= $conf['order_by'];
@@ -212 +217 @@
 {
   $prev = $page['num'] - 1;
-  $query = 'SELECT id,name,file,tn_ext,storage_category_id';
+  $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id';
   $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id';
   $query.= $page['where'];
   $query.= $conf['order_by'];
@@ -458 +463 @@
 }
 //------------------------------------ admin link for information modifications
-if ( $user['status'] == "admin" and is_numeric( $page['cat'] ) )
+if ( $user['status'] == 'admin' )
 {
   $vtp->addSession( $handle, 'modification' );
@@ -470 +475 @@
 {
   $next = $page['num'] + 1;
-  $query = 'SELECT id,name,file,tn_ext,storage_category_id';
+  $query = 'SELECT DISTINCT(id),name,file,tn_ext,storage_category_id';
   $query.= ' FROM '.PREFIX_TABLE.'images';
-  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category ON id = image_id';
+  $query.= ' LEFT JOIN '.PREFIX_TABLE.'image_category AS ic ON id=ic.image_id';
   $query.= $page['where'];
   $query.= $conf['order_by'];