From 54997e870783a14c7f57c7d8424e3518b83956ed Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Thu, 30 Jul 2020 10:35:26 +0200 Subject: [PATCH 1/3] Fix deprecated fluid namespace --- Classes/ViewHelpers/TitleTagViewHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/ViewHelpers/TitleTagViewHelper.php b/Classes/ViewHelpers/TitleTagViewHelper.php index 24b88941f..aa8811f35 100644 --- a/Classes/ViewHelpers/TitleTagViewHelper.php +++ b/Classes/ViewHelpers/TitleTagViewHelper.php @@ -12,7 +12,7 @@ */ use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; From c90e1698a5cddef1d9b11b470373aded1c2bc240 Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Thu, 30 Jul 2020 10:48:59 +0200 Subject: [PATCH 2/3] pi_getLL() does not have a third argument (hsc) anymore. Deprecation #71917. --- Classes/Plugins/GridPager.php | 22 +++++++++++----------- Classes/Plugins/NewspaperCalendar.php | 2 +- Classes/Plugins/Uri.php | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Classes/Plugins/GridPager.php b/Classes/Plugins/GridPager.php index 6d55a3ce8..9bf5830d5 100644 --- a/Classes/Plugins/GridPager.php +++ b/Classes/Plugins/GridPager.php @@ -95,7 +95,7 @@ public function main($content, $conf) // Link to first page. if ($this->piVars['pointer'] > 0) { - $markerArray['###FIRST###'] = $this->pi_linkTP_keepPIvars($this->pi_getLL('firstPage', '', TRUE), + $markerArray['###FIRST###'] = $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('firstPage', '')), array( 'pointer' => 0, 'page' => NULL @@ -106,57 +106,57 @@ public function main($content, $conf) // Link back X pages. if ($this->piVars['pointer'] >= $this->conf['pageStep']) { - $markerArray['###BACK###'] = $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('backXPages', '', TRUE), $this->conf['pageStep']), + $markerArray['###BACK###'] = $this->pi_linkTP_keepPIvars(htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $this->conf['pageStep'])), array( 'pointer' => $this->piVars['pointer'] - $this->conf['pageStep'], 'page' => ($this->piVars['pointer'] - $this->conf['pageStep']) * $this->conf['limit'] + 1 ), TRUE); } else { - $markerArray['###BACK###'] = '' . sprintf($this->pi_getLL('backXPages', '', TRUE), $this->conf['pageStep']) . ''; + $markerArray['###BACK###'] = '' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $this->conf['pageStep'])) . ''; } // Link to previous page. if ($this->piVars['pointer'] > 0) { - $markerArray['###PREVIOUS###'] = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '', TRUE), + $markerArray['###PREVIOUS###'] = $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('prevPage', '')), array( 'pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1 ), TRUE); } else { - $markerArray['###PREVIOUS###'] = '' . $this->pi_getLL('prevPage', '', TRUE) . ''; + $markerArray['###PREVIOUS###'] = '' . htmlspecialchars($this->pi_getLL('prevPage', '')) . ''; } // Link to next page. if ($this->piVars['pointer'] < $maxPointer) { - $markerArray['###NEXT###'] = $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '', TRUE), + $markerArray['###NEXT###'] = $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('nextPage', '')), array( 'pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1 ), TRUE); } else { - $markerArray['###NEXT###'] = '' . $this->pi_getLL('nextPage', '', TRUE) . ''; + $markerArray['###NEXT###'] = '' . htmlspecialchars($this->pi_getLL('nextPage', '')) . ''; } // Link forward X pages. if ($this->piVars['pointer'] < $maxPointer - $this->conf['pageStep']) { - $markerArray['###FORWARD###'] = $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('forwardXPages', '', TRUE), $this->conf['pageStep']), + $markerArray['###FORWARD###'] = $this->pi_linkTP_keepPIvars(htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $this->conf['pageStep'])), array( 'pointer' => $this->piVars['pointer'] + $this->conf['pageStep'], 'page' => ($this->piVars['pointer'] + $this->conf['pageStep']) * $this->conf['limit'] + 1 ), TRUE); } else { - $markerArray['###FORWARD###'] = '' . sprintf($this->pi_getLL('forwardXPages', '', TRUE), $this->conf['pageStep']) . ''; + $markerArray['###FORWARD###'] = '' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $this->conf['pageStep'])) . ''; } // Link to last page. if ($this->piVars['pointer'] < $maxPointer) { - $markerArray['###LAST###'] = $this->pi_linkTP_keepPIvars($this->pi_getLL('lastPage', '', TRUE), + $markerArray['###LAST###'] = $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('lastPage', '')), array( 'pointer' => $maxPointer, 'page' => $maxPointer * $this->conf['limit'] + 1 ), TRUE); } else { - $markerArray['###LAST###'] = '' . $this->pi_getLL('lastPage', '', TRUE) . ''; + $markerArray['###LAST###'] = '' . htmlspecialchars($this->pi_getLL('lastPage', '')) . ''; } $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray); diff --git a/Classes/Plugins/NewspaperCalendar.php b/Classes/Plugins/NewspaperCalendar.php index ce94f15a9..f3a3e0f70 100644 --- a/Classes/Plugins/NewspaperCalendar.php +++ b/Classes/Plugins/NewspaperCalendar.php @@ -259,7 +259,7 @@ private function getTemplateForYear($subparts, $toc, $year, $months, $firstMonth 'parameter' => $this->conf['targetPid'], 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($toc[0]['points']), ); - $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' .$toc[0][self::LABEL], $linkConf); + $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')) . ' ' .$toc[0][self::LABEL], $linkConf); // link to this year itself $linkConf = array ( diff --git a/Classes/Plugins/Uri.php b/Classes/Plugins/Uri.php index 934d536fa..dc654fd03 100644 --- a/Classes/Plugins/Uri.php +++ b/Classes/Plugins/Uri.php @@ -99,7 +99,7 @@ public function main($content, $conf) $uris = array(); foreach ($uriBook as $uri) { - $piUriBook = $this->pi_getLL('uriBook', '', TRUE); + $piUriBook = htmlspecialchars($this->pi_getLL('uriBook', '')); if (strpos($uri, 'http:') === 0 || strpos($uri, 'https:') === 0) { $uris[] = '' . $piUriBook . ''; @@ -126,7 +126,7 @@ public function main($content, $conf) $uris = array(); foreach ($uriPage as $uri) { - $piUriPage = $this->pi_getLL('uriPage', '', TRUE); + $piUriPage = htmlspecialchars($this->pi_getLL('uriPage', '')); if (strpos($uri, 'http:') === 0 || strpos($uri, 'https:') === 0) { $uris[] = '' . $piUriPage . ''; From ee9acecb959c3c08448e941403fd04c4ab922162 Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Thu, 30 Jul 2020 10:52:43 +0200 Subject: [PATCH 3/3] adjust version constraints --- composer.json | 4 ++-- ext_emconf.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7d08b7077..bb3fb2dce 100644 --- a/composer.json +++ b/composer.json @@ -37,8 +37,8 @@ ], "license": "GPL-3.0-or-later", "require": { - "typo3/cms-core": "^8.7|~9.5.17", - "kitodo/presentation": "~3.1.1", + "typo3/cms-core": "^8.7|~9.5.20", + "kitodo/presentation": "~3.1.2", "slub/slub-digitalcollections": "~1.1.0" }, "autoload": { diff --git a/ext_emconf.php b/ext_emconf.php index b10c943b0..95b61ecb9 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -43,7 +43,7 @@ 'constraints' => [ 'depends' => [ 'typo3' => '8.7.0-9.5.99', - 'dlf' => '3.1.1-', + 'dlf' => '3.1.2-', ], 'conflicts' => [ ],