X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=34b23c790779244f0c1af6e1ad4da18dfe43317d;hb=21262249a0908a834f5f1f8ffa70ef8988879775;hp=9690d5d3dad54a4ac146e0a387ace470b18a4444;hpb=018b041d077a8740dde27529a1ffc32f4610b7ef;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index 9690d5d..34b23c7 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -22,14 +22,14 @@
   }
 
   function pagination() {
-    $offset = 1;
+    $first_page = 1;
     $per_page = $GLOBALS['default_page_size'];
 
     parse_str($_SERVER['QUERY_STRING'], $params);
-    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $offset = $params['page'];
+    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $first_page = $params['page'];
     if (array_key_exists('size', $params)) if (is_numeric($params['size'])) $per_page = $params['size'];
 
-    return array($offset, $per_page);
+    return array($first_page, $per_page);
   }
 
   function page_link($alt, $n, $cur, $max, $size) {
@@ -44,17 +44,23 @@
   function show_pagination($pager, $n = 5) {
     if (! $pager->haveToPaginate()) return;
 
-    list($offset, $per_page) = pagination();
+    list($first_page, $per_page) = pagination();
 
     $pages = ceil($pager->getNbResults() / $per_page);
-    $pages++;
+
+    /* Highlight the fact we skipped some pages. */
+    $linked_pages = $pager->getLinks($n);
+    $first_link = $linked_pages[0];
+    $last_link = end($linked_pages);
 
     $links = array();
-    $links[] = page_link('First', 1, $offset, $pages, $per_page);
-    $links[] = page_link('Previous', $offset - 1, $offset, $pages, $per_page);
-    foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $offset, $pages, $per_page);
-    $links[] = page_link('Next', $offset + 1, $offset, $pages, $per_page);
-    $links[] = page_link('Last', $pages, $offset, $pages, $per_page);
+    $links[] = page_link('First', 1, $first_page, $pages, $per_page);
+    $links[] = page_link('Previous', $first_page - 1, $first_page, $pages, $per_page);
+    if ($first_link > 1) $links[] = page_link('...', $first_page, $pages, $per_page);
+    foreach ($linked_pages as $link) $links[] = page_link($link, $link, $first_page, $pages, $per_page);
+    if ($last_link < $pages) $links[] = page_link('...', $first_page, $pages, $per_page);
+    $links[] = page_link('Next', $first_page + 1, $first_page, $pages, $per_page);
+    $links[] = page_link('Last', $pages, $first_page, $pages, $per_page);
 
     echo "<p>Page: ";
     echo implode(' / ', $links);