use a real pager now

3 files changed, 9 insertions, 27 deletions

diff --git a/www/list.php b/www/list.php
index a75fda8..911f26d 100644
--- a/www/list.php
+++ b/www/list.php
@@ -11,28 +11,21 @@ if (isset($_GET['page'])) {
     if (!is_numeric($_GET['page'])) {
         throw new Exception_Input('List page is not numeric');
     }
-    $page = (int)$_GET['page'];
+    $page = (int)$_GET['page'] - 1;
 }
 
 $perPage = 10;
-$repos = $rs->getList($page, $perPage);
+list($repos, $repoCount) = $rs->getList($page, $perPage);
 
-$links = array('prev' => null, 'next' => null);
-if ($page > 0) {
-    $links['prev'] = '/list/' . ($page - 1);
-    if ($page - 1 == 0) {
-        $links['prev'] = '/list';
-    }
-}
-if (count($repos) && count($repos) == $perPage) {
-    $links['next'] = '/list/' . ($page + 1);
-}
+$pager = new Html_Pager(
+    $repoCount, $perPage, $page + 1, '/list/%d'
+);
 
 render(
     'list',
     array(
         'repos' => $repos,
-        'links' => $links,
+        'pager' => $pager,
     )
 );
 ?>
diff --git a/www/search.php b/www/search.php
index 9461b0d..cb72c6a 100644
--- a/www/search.php
+++ b/www/search.php
@@ -26,21 +26,9 @@ $search = $db->getSearch();
 
 $sres = $search->search($query, $page, $perPage);
 
-//fix non-static factory method error
-error_reporting(error_reporting() & ~E_STRICT);
-$pager = \Pager::factory(
-    array(
-        'mode'        => 'Sliding',
-        'perPage'     => 10,
-        'delta'       => 2,
-        'totalItems'  => $sres->getResults(),
-        'currentPage' => $page + 1,
-        'urlVar'      => 'page',
-        'path'        => '/',
-        'fileName'    => $sres->getLink($query),
-    )
+$pager = new Html_Pager(
+    $sres->getResults(), $perPage, $page + 1, $sres->getLink($query)
 );
-
 render(
     'search',
     array(
diff --git a/www/www-header.php b/www/www-header.php
index f381872..c0b18d3 100644
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -56,6 +56,7 @@ $twig = new \Twig_Environment(
         'debug' => true
     )
 );
+//$twig->addExtension(new \Twig_Extension_Debug());
 
 function render($tplname, $vars)
 {