Changeset 2274 for trunk/include/category_default.inc.php

Timestamp:

Mar 11, 2008, 3:04:27 AM (16 years ago)

Author:

rvelices

Message:

• remove $confsubcatify (it was my reqquest to Pierrick when plugins were not available; now it can be done through plugin)
• optimization when show_nb_comments true (1 sql query per page instead of 1 query per element)
• some cleanup & more standard trigger names

File:

• trunk/include/category_default.inc.php (modified) (4 diffs)

trunk/include/category_default.inc.php

@@ -59 +59 @@
 }
 
-// template thumbnail initialization
-$template->set_filenames( array( 'thumbnails' => 'thumbnails.tpl',));
 if (count($pictures) > 0)
 {
@@ -79 +77 @@
     );
 
-    $template->clear_assign('thumbnails'); // category_default reuse them
+  if ($user['show_nb_comments'])
+  {
+    $query = '
+SELECT image_id, COUNT(*) AS nb_comments
+  FROM '.COMMENTS_TABLE.'
+  WHERE validated = \'true\'
+    AND image_id IN ('.implode(',', $selection).')
+  GROUP BY image_id
+;';
+    $nb_comments_of = simple_hash_from_query($query, 'image_id', 'nb_comments');
+  }
 }
+
+// template thumbnail initialization
+$template->set_filenames( array( 'index_thumbnails' => 'thumbnails.tpl',));
 
 trigger_action('loc_begin_index_thumbnails', $pictures);
@@ -99 +110 @@
   $tpl_var =
     array(
-      'IMAGE'              => $thumbnail_url,
-      'IMAGE_ALT'          => $row['file'],
-      'IMAGE_TITLE'        => get_thumbnail_title($row),
-      'IMAGE_TS'           => get_icon($row['date_available']),
-
-      'U_IMG_LINK'         => $url,
-
-      'CLASS'              => 'thumbElmt',
+      'ID'            => $row['id'],
+      'IMAGE'         => $thumbnail_url,
+      'IMAGE_ALT'     => $row['file'],
+      'IMAGE_TITLE'   => get_thumbnail_title($row),
+      'IMAGE_TS'      => get_icon($row['date_available']),
+      'U_IMG_LINK'    => $url,
     );
 
   if ($user['show_nb_hits'])
   {
-    $tpl_var['nb_hits'] =
-      array(
-      'HITS'=> $row['hit'],
-      'CLASS'=> set_span_class($row['hit']),
-      );
+    $tpl_var['NB_HITS'] = $row['hit'];
   }
 
@@ -149 +154 @@
   }
 
-  if ($user['show_nb_comments'])
+  if ( isset($nb_comments_of) )
   {
-    $query = '
-SELECT COUNT(*) AS nb_comments
-  FROM '.COMMENTS_TABLE.'
-  WHERE image_id = '.$row['id'].'
-    AND validated = \'true\'
-;';
-    list($row['nb_comments']) = mysql_fetch_array(pwg_query($query));
-    $tpl_var['nb_comments'] =
-      array(
-        'NB_COMMENTS'=> $row['nb_comments'],
-        'CLASS'=> set_span_class($row['nb_comments']),
-      );
+    $row['nb_comments'] = isset($nb_comments_of[$row['id']])
+        ? (int)$nb_comments_of[$row['id']] : 0;
+    $tpl_var['NB_COMMENTS'] = $row['nb_comments'];
   }
 
+  //plugins need to add/modify sth in this loop ?
+  $tpl_var = trigger_event('loc_index_thumbnail', $tpl_var, $row);
+
   $template->append('thumbnails', $tpl_var);
-
-  //plugins need to add/modify sth in this loop ?
-  trigger_action('loc_index_thumbnail', $row, 'thumbnails' );
 }
 
 trigger_action('loc_end_index_thumbnails', $pictures);
-$template->assign_var_from_handle('THUMBNAILS', 'thumbnails');
+$template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails');
 
 pwg_debug('end include/category_default.inc.php');