From 9abc70e7543730bac46f00d7d1d0cc0a37f9e84d Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@typo3.org>
Date: Sat, 28 May 2016 12:36:27 +0200
Subject: [PATCH] [TASK] Remove second parameter of getLL part 4/3
Remove the second parameter of getLL and replace it
with htmlspecialchars directly in the code.
Resolves: #76321
Related: #71917
Releases: master
Change-Id: I71ed4d93c48731cad8cf88cc1de002190f38ba9a
Reviewed-on: https://review.typo3.org/48350
Reviewed-by: Valentin Despa <info@vdespa.de>
Tested-by: Valentin Despa <info@vdespa.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Controller/ContentElement/MoveElementController.php | 2 +-
typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
index 285e532477b7..f3ff9b67e95d 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
@@ -143,7 +143,7 @@ class MoveElementController extends AbstractModule
$headerLine .= BackendUtility::getRecordTitle($this->table, $elRow, true);
// Make-copy checkbox (clicking this will reload the page with the GET var makeCopy set differently):
$onClick = 'window.location.href=' . GeneralUtility::quoteJSvalue(GeneralUtility::linkThisScript(array('makeCopy' => !$this->makeCopy))) . ';';
- $headerLine .= '<div><input type="hidden" name="makeCopy" value="0" />' . '<input type="checkbox" name="makeCopy" id="makeCopy" value="1"' . ($this->makeCopy ? ' checked="checked"' : '') . ' onclick="' . htmlspecialchars($onClick) . '" /> <label for="makeCopy" class="t3-label-valign-top">' . $lang->getLL('makeCopy', 1) . '</label></div>';
+ $headerLine .= '<div><input type="hidden" name="makeCopy" value="0" />' . '<input type="checkbox" name="makeCopy" id="makeCopy" value="1"' . ($this->makeCopy ? ' checked="checked"' : '') . ' onclick="' . htmlspecialchars($onClick) . '" /> <label for="makeCopy" class="t3-label-valign-top">' . htmlspecialchars($lang->getLL('makeCopy')) . '</label></div>';
// Add the header-content to the module content:
$this->content .= '<div>' . $headerLine . '</div>';
// Reset variable to pick up the module content in:
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index e2b37cc0c76a..1d2b28c0747b 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -271,7 +271,7 @@ class PagePositionMap
*/
public function insertlabel()
{
- return $this->getLanguageService()->getLL($this->l_insertNewPageHere, 1);
+ return htmlspecialchars($this->getLanguageService()->getLL($this->l_insertNewPageHere));
}
/**
@@ -511,7 +511,7 @@ class PagePositionMap
$uid = '';
}
$cc = hexdec(substr(md5($uid . '-' . $vv . '-' . $kk), 0, 4));
- return '<a href="#" onclick="' . htmlspecialchars($this->onClickInsertRecord($row, $vv, $moveUid, $pid, $this->cur_sys_language)) . '">' . '<i class="t3-icon fa fa-long-arrow-left" name="mImgEnd' . $cc . '" title="' . $this->getLanguageService()->getLL($this->l_insertNewRecordHere, 1) . '"></i></a>';
+ return '<a href="#" onclick="' . htmlspecialchars($this->onClickInsertRecord($row, $vv, $moveUid, $pid, $this->cur_sys_language)) . '">' . '<i class="t3-icon fa fa-long-arrow-left" name="mImgEnd' . $cc . '" title="' . htmlspecialchars($this->getLanguageService()->getLL($this->l_insertNewRecordHere)) . '"></i></a>';
}
/**
--
GitLab