Changeset 1820 for trunk/index.php

Timestamp:

Feb 15, 2007, 1:10:41 AM (17 years ago)

Author:

rvelices

Message:

• feature 642: display both subcategory thumbnails and element thumbnails (if a

category has both) in the index page

• get rid of $pagecat_nb_images and $pagethumbnails_include (superfluous)
• changed sql queries in section_init.inc.php for better performance with

flat category view

• web service fixes for categories.getList

File:

• trunk/index.php (modified) (4 diffs)

trunk/index.php

@@ -69 +69 @@
 }
 
-if (isset($page['cat_nb_images'])
-    and $page['cat_nb_images'] > $user['nb_image_page'])
+if ( count($page['items']) > $user['nb_image_page'])
 {
   $page['navigation_bar'] = create_navigation_bar(
     duplicate_index_url(array(), array('start')),
-    $page['cat_nb_images'],
+    count($page['items']),
     $page['start'],
     $user['nb_image_page'],
@@ -102 +101 @@
 //-------------------------------------------------------------- category title
 $template_title = $page['title'];
-if (isset($page['cat_nb_images']) and $page['cat_nb_images'] > 0)
-{
-  $template_title.= ' ['.$page['cat_nb_images'].']';
+if ( count($page['items']) > 0)
+{
+  $template_title.= ' ['.count($page['items']).']';
 }
 
@@ -242 +241 @@
 
 //------------------------------------------------------ main part : thumbnails
-if (isset($page['thumbnails_include']))
-{
-  include(PHPWG_ROOT_PATH.$page['thumbnails_include']);
+if ( 0==$page['start']
+    and !isset($page['flat'])
+    and !isset($page['chronology_field'])
+    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
+  )
+{
+  include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
+}
+if ( !empty($page['items']) )
+{
+  include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
 }
 //------------------------------------------------------- category informations
@@ -259 +266 @@
 }
 
-if (isset($page['cat_nb_images']) and $page['cat_nb_images'] > 0
+if ( count($page['items']) > 0
     and $page['section'] != 'most_visited'
     and $page['section'] != 'best_rated')