diff options
Diffstat (limited to 'app')
| -rwxr-xr-x | app/Controllers/indexController.php | 2 | ||||
| -rwxr-xr-x | app/views/helpers/logs_pagination.phtml | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 70b8824c3..ad9a9a3ee 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -371,7 +371,7 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { $logs = FreshRSS_LogDAO::lines(); //TODO: ask only the necessary lines //gestion pagination - $page = Minz_Request::param('page', 1); + $page = intval(Minz_Request::param('page', 1)); $this->view->logsPaginator = new Minz_Paginator($logs); $this->view->logsPaginator->_nbItemsPerPage(50); $this->view->logsPaginator->_currentPage($page); diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml index d12b3f9d1..c7b9ca0ca 100755 --- a/app/views/helpers/logs_pagination.phtml +++ b/app/views/helpers/logs_pagination.phtml @@ -17,9 +17,14 @@ </li> <?php $params[$getteur] = $this->currentPage - 1; ?> + + <li class="item pager-previous"> + <?php if ($this->currentPage > 1) { ?> <a href="<?= Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)) ?>">‹ <?= _t('conf.logs.pagination.previous') ?></a> + <?php } ?> </li> + <?php if ($this->currentPage - 2 > 1) { ?> <li class="item">…</a></li> @@ -28,8 +33,8 @@ <?php for ($i = $this->currentPage - 2; $i <= $this->currentPage + 2; $i++) { if($i > 0 && $i <= $this->nbPage) { + $params[$getteur] = $i; if ($i != $this->currentPage) { - $params[$getteur] = $i; $class = ''; $aria = 'false'; } else { @@ -46,9 +51,13 @@ <?php } ?> <?php $params[$getteur] = $this->currentPage + 1; ?> + <li class="item pager-next"> + <?php if ($this->currentPage < $this->nbPage) { ?> <a href="<?= Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)) ?>"><?= _t('conf.logs.pagination.next') ?> ›</a> + <?php } ?> </li> + <?php $params[$getteur] = $this->nbPage; ?> <li class="item pager-last"> <a href="<?= Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)) ?>"><?= _t('conf.logs.pagination.last') ?> »</a> |