Changeset 635 for trunk/picture.php

Timestamp:

Dec 5, 2004, 10:28:40 PM (19 years ago)

Author:

plg

Message:

• on picture.php, related categories under the element are displayed in global_rank order

• when adding a new virtual category, initializes its global_rank

• bug fixed : in admin/cat_list, false next rank

• in admin/cat_modify, complete directory is calculated only if category is not virtual

• admin/picture_modify rewritten : graphically nearer to admin/cat_modify, virtual associations are back

• update_category partially rewritten : take an array of categories in parameter, becomes optionnaly recursive, use the set_random_representant function, set a random representant for categories with elements and no representant

• bug fixed : on a search results screen, elements belonging to more than 1 category were shown more than once

• bug fixed : in admin/cat_modify, changing a value in a textefield and hitting enter was setting a new random representant

File:

• trunk/picture.php (modified) (3 diffs)

trunk/picture.php

@@ -739 +739 @@
 // related categories
 $query = '
-SELECT category_id
+SELECT category_id,uppercats,commentable,global_rank
   FROM '.IMAGE_CATEGORY_TABLE.'
+    INNER JOIN '.CATEGORIES_TABLE.' ON category_id = id
   WHERE image_id = '.$_GET['image_id'];
 if ($user['forbidden_categories'] != '')
@@ -750 +751 @@
 ;';
 $result = pwg_query($query);
-$categories = '';
+$cat_array = array();
+while ($row = mysql_fetch_array($result))
+{
+  array_push($cat_array, $row);
+}
+usort($cat_array, 'global_rank_compare');
+
+$cat_output = '';
 $page['show_comments'] = false;
-while ($row = mysql_fetch_array($result))
-{
-  if ($categories != '')
-  {
-    $categories.= '<br />';
-  }
-  $cat_info = get_cat_info($row['category_id']);
-  $categories .= get_cat_display_name($cat_info['name'], ' &gt;');
+foreach ($cat_array as $category)
+{
+  if ($cat_output != '')
+  {
+    $cat_output.= '<br />';
+  }
+  
+  if (count($cat_array) > 3)
+  {
+    $cat_output .= get_cat_display_name_cache($category['uppercats'],
+                                              ' &rarr; ');
+  }
+  else
+  {
+    $cat_info = get_cat_info($category['category_id']);
+    $cat_output .= get_cat_display_name($cat_info['name'], ' &rarr; ');
+  }
   // the picture is commentable if it belongs at least to one category which
   // is commentable
-  if ($cat_info['commentable'])
+  if ($category['commentable'])
   {
     $page['show_comments'] = true;
@@ -771 +788 @@
   array(
     'INFO'  => $lang['categories'],
-    'VALUE' => $categories
+    'VALUE' => $cat_output
     ));
 // metadata