Skip to content

Magento_Cms: avoid using deprecated escape* methods from AbstractBlock #31678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Magento_Cms: avoid using deprecated escape* methods from AbstractBlock #31678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
if ($element->getValue()) {
$block = $this->_blockFactory->create()->load($element->getValue());
if ($block->getId()) {
$chooser->setLabel($this->escapeHtml($block->getTitle()));
$chooser->setLabel($this->_escaper->escapeHtml($block->getTitle()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
if ($element->getValue()) {
$page = $this->_pageFactory->create()->load((int)$element->getValue());
if ($page->getId()) {
$chooser->setLabel($this->escapeHtml($page->getTitle()));
$chooser->setLabel($this->_escaper->escapeHtml($page->getTitle()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Cms/Block/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected function _prepareLayout()
if ($pageMainTitle) {
// Setting empty page title if content heading is absent
$cmsTitle = $page->getContentHeading() ?: ' ';
$pageMainTitle->setPageTitle($this->escapeHtml($cmsTitle));
$pageMainTitle->setPageTitle($this->_escaper->escapeHtml($cmsTitle));
}
return parent::_prepareLayout();
}
Expand Down
7 changes: 5 additions & 2 deletions app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content */
/**
* @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content $block
* @var \Magento\Framework\Escaper $escaper
*/
?>

<div class="media-gallery-modal" data-mage-init='{"mediabrowser": <?= $block->escapeHtml($block->getFilebrowserSetupObject()) ?>}'>
<div class="media-gallery-modal" data-mage-init='{"mediabrowser": <?= $escaper->escapeHtml($block->getFilebrowserSetupObject()) ?>}'>
<div class="page-main-actions">
<div class="page-actions">
<div class="page-actions-inner">
Expand Down
21 changes: 12 additions & 9 deletions app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files */
/**
* @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files $block
* @var \Magento\Framework\Escaper $escaper
*/

$_width = $block->getImagesWidth();

Expand All @@ -20,22 +23,22 @@ $_width = $block->getImagesWidth();
<div
data-row="file"
class="filecnt"
id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>"
data-size="<?= $block->escapeHtmlAttr($file->getSize()) ?>"
data-mime-type="<?= $block->escapeHtmlAttr($file->getMimeType()) ?>"
id="<?= $escaper->escapeHtmlAttr($block->getFileId($file)) ?>"
data-size="<?= $escaper->escapeHtmlAttr($file->getSize()) ?>"
data-mime-type="<?= $escaper->escapeHtmlAttr($file->getMimeType()) ?>"
>
<p class="nm">
<?php if ($block->getFileThumbUrl($file)): ?>
<img src="<?= $block->escapeHtmlAttr($src) ?>" alt="<?= $block->escapeHtmlAttr($filename) ?>"/>
<img src="<?= $escaper->escapeHtmlAttr($src) ?>" alt="<?= $escaper->escapeHtmlAttr($filename) ?>"/>
<?php endif; ?>
</p>
<?php if ($block->getFileWidth($file)): ?>
<small><?= $block->escapeHtmlAttr($width) ?>x<?= $block->escapeHtmlAttr($height) ?>
<?= $block->escapeHtml(__('px.')) ?></small><br/>
<small><?= $escaper->escapeHtmlAttr($width) ?>x<?= $escaper->escapeHtmlAttr($height) ?>
<?= $escaper->escapeHtml(__('px.')) ?></small><br/>
<?php endif; ?>
<small><?= $block->escapeHtml($block->getFileShortName($file)) ?></small>
<small><?= $escaper->escapeHtml($block->getFileShortName($file)) ?></small>
</div>
<?php endforeach; ?>
<?php else: ?>
<div class="empty"><?= $block->escapeHtml(__('No files found')) ?></div>
<div class="empty"><?= $escaper->escapeHtml(__('No files found')) ?></div>
<?php endif; ?>
21 changes: 12 additions & 9 deletions app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
/**
* @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader $block
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/

$filters = $block->getConfig()->getFilters() ?? [];
$allowedExtensions = [];
Expand All @@ -22,19 +25,19 @@ $allowedExtensions = array_merge([], ...$listExtensions);

$resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
? "{action: 'resize', maxWidth: "
. $block->escapeHtml($block->getImageUploadMaxWidth())
. $escaper->escapeHtml($block->getImageUploadMaxWidth())
. ", maxHeight: "
. $block->escapeHtml($block->getImageUploadMaxHeight())
. $escaper->escapeHtml($block->getImageUploadMaxHeight())
. "}"
: "{action: 'resize'}";
?>

<div id="<?= /* @noEscape */ $blockHtmlId ?>" class="uploader">
<span class="fileinput-button form-buttons">
<span><?= $block->escapeHtml(__('Upload Images')) ?></span>
<span><?= $escaper->escapeHtml(__('Upload Images')) ?></span>
<input class="fileupload" type="file"
name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
name="<?= $escaper->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
data-url="<?= $escaper->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
</span>
<div class="clear"></div>
<script type="text/x-magento-template" id="<?= /* @noEscape */ $blockHtmlId ?>-template">
Expand All @@ -60,8 +63,8 @@ require([
'domReady!',
'mage/translate'
], function ($, mageTemplate, validator, uiAlert) {
var maxFileSize = {$block->escapeJs($block->getFileSizeService()->getMaxFileSize())},
allowedExtensions = '{$block->escapeJs(implode(' ', $allowedExtensions))}';
var maxFileSize = {$escaper->escapeJs($block->getFileSizeService()->getMaxFileSize())},
allowedExtensions = '{$escaper->escapeJs(implode(' ', $allowedExtensions))}';

$('#{$blockHtmlId} .fileupload').fileupload({
dataType: 'json',
Expand Down
11 changes: 7 additions & 4 deletions app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
* See COPYING.txt for license details.
*/

/** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $block */
/**
* @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $block
* @var \Magento\Framework\Escaper $escaper
*/
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?>

Expand All @@ -15,9 +18,9 @@ $jsonHelper = $block->getData('jsonHelper');
<div class="tree-panel" >
<div class="categories-side-col">
<div class="tree-actions">
<a id="collapseAll"><?= $block->escapeHtml(__('Collapse All')) ?></a>
<a id="collapseAll"><?= $escaper->escapeHtml(__('Collapse All')) ?></a>
<span class="separator">|</span>
<a id="expandAll"><?= $block->escapeHtml(__('Expand All')) ?></a>
<a id="expandAll"><?= $escaper->escapeHtml(__('Expand All')) ?></a>
</div>
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
'onclick',
Expand All @@ -30,7 +33,7 @@ $jsonHelper = $block->getData('jsonHelper');
'#div.tree-actions a#expandAll'
) ?>
</div>
<div data-role="tree" data-mage-init='<?= $block->escapeHtml(
<div data-role="tree" data-mage-init='<?= $escaper->escapeHtml(
$jsonHelper->jsonEncode($block->getTreeWidgetOptions())
) ?>'>
</div>
Expand Down
6 changes: 4 additions & 2 deletions app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\Backend\Block\Template */
/** @var \Magento\Framework\Escaper $escaper */
/**
* @var \Magento\Backend\Block\Template $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<script type="text/x-magento-init">
{
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

/**
* @var \Magento\Cms\Block\Widget\Page\Link $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<div class="widget block block-cms-link">
<a <?= /* @noEscape */ $block->getLinkAttributes() ?>>
<span><?= $block->escapeHtml($block->getLabel()) ?></span>
<span><?= $escaper->escapeHtml($block->getLabel()) ?></span>
</a>
</div>
3 changes: 2 additions & 1 deletion app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

/**
* @var \Magento\Cms\Block\Widget\Page\Link $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<span class="widget block block-cms-link-inline">
<a <?= /* @noEscape */ $block->getLinkAttributes() ?>>
<span><?= $block->escapeHtml($block->getLabel()) ?></span>
<span><?= $escaper->escapeHtml($block->getLabel()) ?></span>
</a>
</span>