aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar maTh <math-home@web.de> 2022-07-27 18:52:30 +0200
committerGravatar GitHub <noreply@github.com> 2022-07-27 18:52:30 +0200
commita534fc79c48f3ef83cc54510d0a5bde2b5089ed6 (patch)
treeace5086552d253ca5e2e673120fcd5449f04f8a0
parentc5960998903a281923055f9c1768de708b037ca6 (diff)
Fix: logs page=0 error (#4460)
* add docs of function param() * page < 0 is impossible now * show prev/next only, when there is a prev/next page * set always page params * Revert "page < 0 is impossible now" This reverts commit fdb920ee50efe2c5cf64ca2dec936ec28ab2ee6c. * Update logs_pagination.phtml
-rwxr-xr-xapp/Controllers/indexController.php2
-rwxr-xr-xapp/views/helpers/logs_pagination.phtml11
-rw-r--r--lib/Minz/Request.php7
3 files changed, 18 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>
diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php
index 9179eb368..2ad02014f 100644
--- a/lib/Minz/Request.php
+++ b/lib/Minz/Request.php
@@ -27,6 +27,13 @@ class Minz_Request {
public static function params() {
return self::$params;
}
+ /**
+ * Read the URL parameter
+ * @param string $key Key name
+ * @param mixed $default default value, if no parameter is given
+ * @param bool $specialchars special characters
+ * @return mixed value of the parameter
+ */
public static function param($key, $default = false, $specialchars = false) {
if (isset(self::$params[$key])) {
$p = self::$params[$key];