[geeklog-cvs] geeklog-1.3/public_html/admin story.php,1.85,1.86

[geeklog-cvs-admin at lists.geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html/admin
In directory internal.geeklog.net:/tmp/cvs-serv7138

Modified Files:
	story.php 
Log Message:
Fixed previous/next page link in list of stories and introduced {google_paging} as an alternative.


Index: story.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/admin/story.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** story.php	27 Mar 2003 21:03:11 -0000	1.85
--- story.php	10 Apr 2003 14:32:00 -0000	1.86
***************
*** 477,508 ****
  
          // Print prev/next page links if needed
! 
!         if (DB_count($_TABLES['stories']) > 50) {
              $prevpage = $page - 1;
              $nextpage = $page + 1;
              if ($pagestart >= 50) {
!                 $story_templates->set_var('previouspage_link', '<a href="' . $_CONF['site_admin_url'] . '/story.php?mode=list&page='
!                     . $prevpage . '">' . $LANG24[1] . '</a> ');
              } else {
! 	        $story_templates->set_var('previouspage_link','');
              }
!             if ($pagestart <= (DB_count($_TABLES['stories']) - 50)) {
!                 $story_templates->set_var('nextpage_link', '<a href="' . $_CONF['site_admin_url'] . '/story.php?mode=list&page='
!                     . $nextpage . '">' . $LANG24[2] . '</a> ');
              } else {
  	        $story_templates->set_var('nextpage_link','');
              }
          } else {
! 	    $story_templates->set_var('previouspage_link','');
! 	    $story_templates->set_var('nextpage_link','');
          }
-            
  
      } else {
          // There are no news items
!         $story_templates->set_var('storylist_item','<tr><td colspan="7">' . $LANG24[6] . '</td></tr>');
!         $story_templates->set_var('previouspage_link','');
!         $story_templates->set_var('nextpage_link','');
! 	
      }
      $display .= $story_templates->parse('output','list');
--- 477,518 ----
  
          // Print prev/next page links if needed
!         $numstories = DB_count ($_TABLES['stories']);
!         if ($numstories > 50) {
              $prevpage = $page - 1;
              $nextpage = $page + 1;
+             $pagestart = ($page - 1) * 50;
              if ($pagestart >= 50) {
!                 $story_templates->set_var ('previouspage_link', '<a href="'
!                     . $_CONF['site_admin_url']
!                     . '/story.php?mode=list&page=' . $prevpage . '">'
!                     . $LANG24[1] . '</a> ');
              } else {
!                 $story_templates->set_var('previouspage_link','');
              }
!             if ($pagestart <= ($numstories - 50)) {
!                 $story_templates->set_var ('nextpage_link', '<a href="'
!                     . $_CONF['site_admin_url']
!                     . '/story.php?mode=list&page=' . $nextpage . '">'
!                     . $LANG24[2] . '</a> ');
              } else {
  	        $story_templates->set_var('nextpage_link','');
              }
+             $baseurl = $_CONF['site_admin_url'] . '/story.php?mode=list';
+             $numpages = ceil ($numstories / 50);
+             $story_templates->set_var ('google_paging',
+                     COM_printPageNavigation ($baseurl, $page, $numpages));
          } else {
!             $story_templates->set_var ('previouspage_link' ,'');
!             $story_templates->set_var ('nextpage_link' ,'');
!             $story_templates->set_var ('google_paging' ,'');
          }
  
      } else {
          // There are no news items
!         $story_templates->set_var ('storylist_item', '<tr><td colspan="8">'
!                 . $LANG24[6] . '</td></tr>');
!         $story_templates->set_var ('previouspage_link', '');
!         $story_templates->set_var ('nextpage_link', '');
!         $story_templates->set_var ('google_paging' ,'');
      }
      $display .= $story_templates->parse('output','list');