Changeset 18462

Timestamp:

Oct 4, 2012, 5:03:55 PM (12 years ago)

Author:

mistic100

Message:

feature:2614 pagination on albums
return to old fashioned way (one query in category_cats), restoring recent_cats feature and "menubar optimization", rename "starta" into "startcat"

Location:

trunk

Files:

• include/category_cats.inc.php (modified) (5 diffs)
• include/functions_url.inc.php (modified) (2 diffs)
• include/section_init.inc.php (modified) (3 diffs)
• index.php (modified) (2 diffs)

trunk/include/category_cats.inc.php

@@ -28 +28 @@
  */
 
-$selection = array_slice(
-  $page['categories'],
-  $page['starta'],
-  $conf['nb_categories_page']
-  );
-
-$selection = trigger_event('loc_index_categories_selection', $selection);
 
 // $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
@@ -49 +42 @@
     INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc 
     ON id = cat_id 
-    AND user_id = '.$user['id'].'
-  WHERE c.id IN('.implode(',', $selection).')';
+    AND user_id = '.$user['id'];
+  
+if ('recent_cats' == $page['section'])
+{
+  $query.= '
+  WHERE date_last >= '.pwg_db_get_recent_period_expression($user['recent_period']);
+}
+else
+{
+  $query.= '
+  WHERE id_uppercat '.(!isset($page['category']) ? 'is NULL' : '= '.$page['category']['id']);
+}
+
+$query.= '
+      '.get_sql_condition_FandF(
+        array('visible_categories' => 'id'),
+        'AND'
+        );
   
 if ('recent_cats' != $page['section'])
@@ -61 +70 @@
 ;';
 
-$result = pwg_query($query);
+$categories_sql = hash_from_query($query, 'id');
+
+$page['total_categories'] = count($categories_sql);
+
+$categories_sql = array_slice(
+  array_values($categories_sql),
+  $page['startcat'],
+  $conf['nb_categories_page']
+  );
+
+$categories_sql = trigger_event('loc_index_categories_selection', $categories_sql);
+
 $categories = array();
 $category_ids = array();
@@ -67 +87 @@
 $user_representative_updates_for = array();
 
-while ($row = pwg_db_fetch_assoc($result))
+foreach ($categories_sql as $row)
 {
   $row['is_child_date_last'] = @$row['max_date_last']>@$row['date_last'];
@@ -375 +395 @@
 
   $template->assign_var_from_handle('CATEGORIES', 'index_category_thumbnails');
-}
+  
+  // navigation bar
+  $page['cats_navigation_bar'] = array();
+  if ($page['total_categories'] > $conf['nb_categories_page'])
+  {
+    $page['cats_navigation_bar'] = create_navigation_bar(
+      duplicate_index_url(array(), array('startcat')),
+      $page['total_categories'],
+      $page['startcat'],
+      $conf['nb_categories_page'],
+      true, 'startcat'
+      );
+  }
+
+  $template->assign('cats_navbar', $page['cats_navigation_bar'] );
+}
+
 pwg_debug('end include/category_cats.inc.php');
 ?>

trunk/include/functions_url.inc.php

@@ -459 +459 @@
             and strpos($tokens[$current_token], 'posted-')!==0
             and strpos($tokens[$next_token], 'start-')!==0
-            and strpos($tokens[$next_token], 'starta-')!==0
+            and strpos($tokens[$next_token], 'startcat-')!==0
             and $tokens[$current_token] != 'flat')
         {
@@ -653 +653 @@
       $page['start'] = $matches[1];
     }
-    elseif (preg_match('/^starta-(\d+)/', $tokens[$i], $matches))
-    {
-      $page['starta'] = $matches[1];
+    elseif (preg_match('/^startcat-(\d+)/', $tokens[$i], $matches))
+    {
+      $page['startcat'] = $matches[1];
     }
     $i++;

trunk/include/section_init.inc.php

@@ -42 +42 @@
 //   );
 
-// exemple of dynamic nb_categories_page (%2 for nice display)
-// $conf['nb_categories_page'] = 2*round($user['nb_image_page']/4);
-
-$page['items'] = $page['categories'] = array();
-$page['start'] = $page['starta'] = 0;
+
+$page['items'] = array();
+$page['start'] = $page['startcat'] = 0;
 
 // some ISPs set PATH_INFO to empty string or to SCRIPT_FILENAME while in the
@@ -255 +253 @@
   if
     (
-      $page['starta'] == 0 and
+      $page['startcat'] == 0 and
       (!isset($page['chronology_field'])) and
       (
@@ -318 +316 @@
     $page['items'] = array_from_query($query, 'image_id');
   } //otherwise the calendar will requery all subitems
-  
-  // GET CATEGORIES LIST
-  if ( script_basename()=='index'
-    and 0==$page['start']
-    and !isset($page['flat'])
-    and !isset($page['chronology_field'])
-    and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
-    and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
-  )
-  {
-    $query = '
-SELECT c.id
-  FROM '.CATEGORIES_TABLE.' c
-    INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ucc 
-    ON id = cat_id 
-    AND user_id = '.$user['id'];
-
-    if ('recent_cats' == $page['section'])
-    {
-      $query.= '
-      WHERE date_last >= '.pwg_db_get_recent_period_expression($user['recent_period']);
-    }
-    else
-    {
-      $query.= '
-      WHERE id_uppercat '.(!isset($page['category']) ? 'is NULL' : '= '.$page['category']['id']);
-    }
-
-    $query.= '
-        '.get_sql_condition_FandF(
-          array('visible_categories' => 'id'),
-          'AND'
-          );
-
-    $query.= '
-    ;';
-
-    $page['categories'] = array_from_query($query, 'id');
-  }
 }
 // special sections

trunk/index.php

@@ -84 +84 @@
 }
 
-$page['cats_navigation_bar'] = array();
-if (count($page['categories']) > $conf['nb_categories_page'])
-{
-  $page['cats_navigation_bar'] = create_navigation_bar(
-    duplicate_index_url(array(), array('starta')),
-    count($page['categories']),
-    $page['starta'],
-    $conf['nb_categories_page'],
-    true, 'starta'
-    );
-}
-
-$template->assign( 'thumb_navbar', $page['navigation_bar'] );
-$template->assign( 'cats_navbar', $page['cats_navigation_bar'] );
+$template->assign('thumb_navbar', $page['navigation_bar'] );
 
 // caddie filling :-)
@@ -299 +286 @@
 
 //------------------------------------------------------ main part : thumbnails
-if ( !empty($page['categories']) )
+if ( 0==$page['start']
+  and !isset($page['flat'])
+  and !isset($page['chronology_field'])
+  and ('recent_cats'==$page['section'] or 'categories'==$page['section'])
+  and (!isset($page['category']['count_categories']) or $page['category']['count_categories']>0 )
+)
 {
   include(PHPWG_ROOT_PATH.'include/category_cats.inc.php');
 }
+
 if ( !empty($page['items']) )
 {