[BUGFIX] Fix problems with the pagebrowser

Classes/ViewHelpers/PageBrowserViewHelper.php

@@ -70,13 +70,18 @@ class PageBrowserViewHelper extends AbstractViewHelper {
 		$view->setLayoutRootPaths($configuration['view.']['layoutRootPaths.']);
 		$view->setTemplate('PageBrowser/Index');
 		$pageBrowserVars = GeneralUtility::_GP('tx_sgnews_pagebrowser');
-		$currentPage = $pageBrowserVars['currentPage'];
+		if (isset($pageBrowserVars['currentPage']) && (int) $pageBrowserVars['currentPage'] > 0) {
+			$currentPage = (int) $pageBrowserVars['currentPage'];
+		} else {
+			$currentPage = 1;
+		}
+
 		$pageLinks = [];
-		$start = \max($currentPage - 1, 0);
-		$end = \min($this->arguments['numberOfPages'], $currentPage + 1 + 1);
+		$start = 1;
+		$end = $this->arguments['numberOfPages'];
 		for ($i = $start; $i < $end; $i++) {
 			$pageLinks[] = [
-				'number' => $i + 1,
+				'number' => $i,
 				'isCurrentPage' => $i === $currentPage,
 			];
 		}
@@ -86,10 +91,11 @@ class PageBrowserViewHelper extends AbstractViewHelper {
 				'enableLessPages' => 1,
 				'enableMorePages' => 1,
 				'pageLinks' => $pageLinks,
-				'prevPageExist' => $currentPage > 0,
-				'showLessPages' => ($currentPage - 1) > 0,
-				'showNextPages' => ($currentPage + 1 + 1) < $this->arguments['numberOfPages'],
-				'nextPageExist' => $currentPage < ($this->arguments['numberOfPages'] - 1),
+				'currentPage' => $currentPage,
+				'prevPageExist' => $currentPage > 1,
+				'showLessPages' => ($currentPage - 1) > 1,
+				'showNextPages' => ($currentPage + 1) < $this->arguments['numberOfPages'],
+				'nextPageExist' => $currentPage < $this->arguments['numberOfPages'] - 1,
 				'numberOfPages' => $this->arguments['numberOfPages']
 			]
 		);

Resources/Private/Templates/PageBrowser/Index.html

@@ -4,12 +4,13 @@
 
 <f:section name="main">
 	<nav>
+		<f:debug>{_all}</f:debug>
 		<ul class="pagination">
 			<f:if condition="{prevPageExist}">
 				<f:then>
 					<li class="tx-pagebrowse-prev">
-						<f:link.action action="index"
-									   additionalParams="{currentPage: '{pageLink.number} - 1'}"
+						<f:variable name="prevPage" value="{currentPage - 1}" />
+						<f:link.action additionalParams="{tx_sgnews_pagebrowser: {currentPage: prevPage}}"
 									   additionalAttributes="{aria-label: 'Previous'}">
 							&laquo;
 						</f:link.action>
@@ -28,7 +29,8 @@
 
 			<f:if condition="{enableLessPages} && {showLessPages}">
 				<li>
-					<f:link.action action="index" additionalParams="{currentPage: '{pageLink.number} - 2'}">
+					<f:variable name="lessPage" value="{currentPage - 2}" />
+					<f:link.action additionalParams="{tx_sgnews_pagebrowser: {currentPage: lessPage}}">
 						...
 					</f:link.action>
 				</li>
@@ -48,7 +50,7 @@
 					</f:then>
 					<f:else>
 						<li class="tx-pagebrowse-page">
-							<f:link.action action="index" additionalParams="{currentPage: pageLink.number}">
+							<f:link.action additionalParams="{tx_sgnews_pagebrowser: {currentPage: pageLink.number}}">
 								{pageLink.number}
 							</f:link.action>
 						</li>
@@ -58,7 +60,8 @@
 
 			<f:if condition="{enableMorePages} && {showNextPages}">
 				<li>
-					<f:link.action action="index" additionalParams="{currentPage: '{pageLink.number} + 2'}">
+					<f:variable name="morePage" value="{currentPage + 2}" />
+					<f:link.action additionalParams="{tx_sgnews_pagebrowser: {currentPage: morePage}}">
 						...
 					</f:link.action>
 				</li>
@@ -67,8 +70,8 @@
 			<f:if condition="{nextPageExist}">
 				<f:then>
 					<li class="tx-pagebrowse-next">
-						<f:link.action action="index"
-									   additionalParams="{currentPage: '{pageLink.number} + 1'}"
+						<f:variable name="nextPage" value="{currentPage + 1}" />
+						<f:link.action additionalParams="{tx_sgnews_pagebrowser: {currentPage: nextPage}}"
 									   additionalAttributes="{aria-label: 'Next'}">
 							&raquo;
 						</f:link.action>