← All changes | back/Helpers/PaginationHelper.php +64 -42 10.1.4 → 11.1.0 View file →

		@@ -16,14 +16,14 @@
16	16	$this->currentPage = empty($page) ? 1 : $page;
17	17	$this->nbPerPage = $nbPerPage;
18	18	}
19	19
20		- public function display(string $page = '', string $suffix = '', bool $dynamics = false): string
	20	+ public function display(string $page = '', string $suffix = '', bool $dynamics = false): void
21	21	{
22	22	$name = empty($page) ? 'pagination_page_ajax' : $page.'_pagination_page';
23	23
24	24	if (empty($this->nbPerPage)) {
25		- return '';
	25	+ return;
26	26	}
27	27
28	28	$nbPages = ceil($this->totalNbOfElements / $this->nbPerPage);
29	29
		@@ -40,48 +40,53 @@
40	40	$classDisplayNumber = 'align-center';
41	41	$classPadding = '';
42	42	}
43	43
44		- $pagination = '<div class="pagination text-center cell grid-x'.$class.'" role="navigation" aria-label="Pagination">
45		- <div class="cell '.$classNavigationContainer.' margin-auto grid-x align-center">
46		- <div class="'.$classNavigation.' pagination_container cell grid-x acym_vcenter align-center">';
	44	+ echo '<div class="pagination text-center cell grid-x'.esc_attr($class).'" role="navigation" aria-label="Pagination">
	45	+ <div class="cell '.esc_attr($classNavigationContainer).' margin-auto grid-x align-center">
	46	+ <div class="'.esc_attr($classNavigation).' pagination_container cell grid-x acym_vcenter align-center">';
47	47
	48	+ // Turbo first button
48	49	if (!$dynamics) {
49		- $pagination .= '<div class="cell shrink pagination-turbo-left pagination_one_pagination '.$classPadding;
50		- $pagination .= $this->currentPage > 1 ? 'acym__pagination__page'.$suffix.'" page="1' : 'pagination_disabled';
51		- $pagination .= '"><i class="acymicon-play-arrow rotate180deg pagination__i"></i><i class="acymicon-play-arrow rotate180deg pagination__i"></i></div>';
52		- $pagination .= '<div class="cell shrink pagination_border_left"></div>';
	50	+ echo '<div class="cell shrink pagination-turbo-left pagination_one_pagination '.esc_attr($classPadding);
	51	+ echo $this->currentPage > 1 ? 'acym__pagination__page'.esc_attr($suffix).'" page="1' : 'pagination_disabled';
	52	+ echo '"><i class="acymicon-play-arrow rotate180deg pagination__i"></i><i class="acymicon-play-arrow rotate180deg pagination__i"></i></div>';
	53	+ echo '<div class="cell shrink pagination_border_left"></div>';
53	54	}
54	55
55		- $pagination .= '<div class="cell shrink pagination-previous pagination_one_pagination '.$classPadding;
56		- $pagination .= $this->currentPage > 1 ? 'acym__pagination__page'.$suffix.'" page="'.($this->currentPage - 1) : 'pagination_disabled';
57		- $pagination .= '"><i class="acymicon-play-arrow rotate180deg pagination__i"></i></div>';
	56	+ // Previous button
	57	+ echo '<div class="cell shrink pagination-previous pagination_one_pagination '.esc_attr($classPadding);
	58	+ echo $this->currentPage > 1 ? 'acym__pagination__page'.esc_attr($suffix).'" page="'.intval($this->currentPage - 1) : 'pagination_disabled';
	59	+ echo '"><i class="acymicon-play-arrow rotate180deg pagination__i"></i></div>';
58	60
59		- $pagination .= '<div class="cell shrink pagination_border_left"></div>';
60		- $pagination .= '<input type="number" name="'.$name.'" min="1" max="'.(empty($nbPages) ? 1
61		- : $nbPages).'" value="'.$this->currentPage.'" class="cell shrink pagination_input" id="acym_pagination'.$suffix.'">';
62		- $pagination .= '<p class="cell shrink pagination_text">'.acym_translation('ACYM_OUT_OF').' '.$nbPages.'</p>';
63		- $pagination .= '<div class="cell shrink pagination_border_right"></div>';
	61	+ echo '<div class="cell shrink pagination_border_left"></div>';
	62	+ echo '<input type="number"
	63	+ name="'.esc_attr($name).'"
	64	+ min="1"
	65	+ max="'.intval(empty($nbPages) ? 1 : $nbPages).'"
	66	+ value="'.esc_attr($this->currentPage).'"
	67	+ class="cell shrink pagination_input"
	68	+ id="acym_pagination'.esc_attr($suffix).'">';
	69	+ echo '<p class="cell shrink pagination_text">'.esc_html(acym_translation('ACYM_OUT_OF').' '.$nbPages).'</p>';
	70	+ echo '<div class="cell shrink pagination_border_right"></div>';
64	71
65		- if ($this->currentPage < $nbPages) {
66		- $paramsNext = 'acym__pagination__page'.$suffix.'" page="'.($this->currentPage + 1);
67		- $paramsTurboNext = 'acym__pagination__page'.$suffix.'" page="'.$nbPages;
68		- } else {
69		- $paramsNext = 'pagination_disabled';
70		- $paramsTurboNext = 'pagination_disabled';
71		- }
	72	+ // Next button
	73	+ echo '<div class="cell shrink pagination-next pagination_one_pagination '.esc_attr($classPadding);
	74	+ echo $this->currentPage < $nbPages ? 'acym__pagination__page'.esc_attr($suffix).'" page="'.intval($this->currentPage + 1) : 'pagination_disabled';
	75	+ echo '"><i class="acymicon-play-arrow pagination__i"></i></div>';
72	76
73		- $pagination .= '<div class="cell shrink pagination-next pagination_one_pagination '.$classPadding.$paramsNext.'"><i class="acymicon-play-arrow pagination__i"></i></div>';
74		-
	77	+ // Turbo last button
75	78	if (!$dynamics) {
76		- $pagination .= '<div class="cell shrink pagination_border_right"></div>';
77		- $pagination .= '<div class="cell shrink pagination-turbo-right pagination_one_pagination '.$classPadding.$paramsTurboNext.'">
78		- <i class="acymicon-play-arrow pagination__i"></i>
79		- <i class="acymicon-play-arrow pagination__i"></i>
80		- </div>';
	79	+ echo '<div class="cell shrink pagination_border_right"></div>';
	80	+ echo '<div class="cell shrink pagination-turbo-right pagination_one_pagination '.esc_attr($classPadding);
	81	+ echo $this->currentPage < $nbPages ? 'acym__pagination__page'.esc_attr($suffix).'" page="'.intval($nbPages) : 'pagination_disabled';
	82	+ echo '">
	83	+ <i class="acymicon-play-arrow pagination__i"></i>
	84	+ <i class="acymicon-play-arrow pagination__i"></i>
	85	+ </div>';
81	86	}
82	87
83		- $pagination .= '</div>';
	88	+ echo '</div>';
84	89
85	90	if (!$dynamics) {
86	91	$nbPagesOptions = [
87	92	'5' => 5,
		@@ -92,9 +97,9 @@
92	97	'50' => 50,
93	98	'100' => 100,
94	99	'200' => 200,
95	100	];
96		- $pagination .= '<div class="cell '.$classDisplayNumber.' grid-x acym_vcenter acym__pagination__pagenb">';
	101	+ echo '<div class="cell '.esc_attr($classDisplayNumber).' grid-x acym_vcenter acym__pagination__pagenb">';
97	102
98	103	$selectValue = $page === 'archive' ? $this->getListLimit($this->nbPerPage) : $this->getListLimit();
99	104	$paginationNumberEntries = '<div class="acym__select__pagination">'.acym_select(
100	105	$nbPagesOptions,
		@@ -102,21 +107,38 @@
102	107	$this->getClosest($selectValue, $nbPagesOptions),
103	108	['class' => 'acym__select__pagination__dropdown']
104	109	).'</div>';
105	110
106		- $pagination .= '<p class="cell shrink">'.acym_translationSprintf('ACYM_DISPLAY_NUMBER_ENTRIES', $paginationNumberEntries).'</p>';
107		- $pagination .= '</div>';
	111	+ echo '<p class="cell shrink">'.wp_kses(
	112	+ acym_translationSprintf('ACYM_DISPLAY_NUMBER_ENTRIES', $paginationNumberEntries),
	113	+ [
	114	+ 'div' => [
	115	+ 'class' => true,
	116	+ ],
	117	+ 'select' => [
	118	+ 'class' => true,
	119	+ 'name' => true,
	120	+ 'id' => true,
	121	+ ],
	122	+ 'option' => [
	123	+ 'value' => true,
	124	+ 'selected' => true,
	125	+ ],
	126	+ ]
	127	+ ).'</p>';
	128	+ echo '</div>';
108	129	}
109	130
110		- $pagination .= '</div>';
111		- $pagination .= '</div>';
112		-
113		- return $pagination;
	131	+ echo '</div>';
	132	+ echo '</div>';
114	133	}
115	134
116	135	public function displayAjax(bool $dynamics = false): string
117	136	{
118		- return $this->display('', '__ajax', $dynamics);
	137	+ ob_start();
	138	+ $this->display('', '__ajax', $dynamics);
	139	+
	140	+ return ob_get_clean();
119	141	}
120	142
121	143	public function getListLimit(int $default = 20): int
122	144	{
		@@ -125,13 +147,13 @@
125	147	$currentConfig = (int)$this->config->get('list_limit_'.$currentUserId, $default);
126	148	$listLimitSelect = acym_getVar('int', 'acym_pagination_element_per_page', 0);
127	149
128	150	if (!empty($listLimitSelect) && $listLimitSelect !== $currentConfig) {
129		- $this->config->save(['list_limit_'.$currentUserId => $listLimitSelect]);
	151	+ $this->config->saveConfig(['list_limit_'.$currentUserId => $listLimitSelect]);
130	152	$currentConfig = $listLimitSelect;
131	153	}
132	154
133		- return $currentConfig;
	155	+ return $currentConfig ? : $default;
134	156	}
135	157
136	158	private function getClosest(int $search, array $arr): string
137	159	{