Skip to content

Magento_CurrencySymbol: avoid using deprecated escape* methods from A… #31673

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_CurrencySymbol: avoid using deprecated escape* methods from A… #31673

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
29 changes: 15 additions & 14 deletions app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,46 @@

/**
* @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currencysymbol
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/
?>

<form id="currency-symbols-form" action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>" method="post">
<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
<form id="currency-symbols-form" action="<?= $escaper->escapeUrl($block->getFormActionUrl()) ?>" method="post">
<input name="form_key" type="hidden" value="<?= $escaper->escapeHtmlAttr($block->getFormKey()) ?>" />
<fieldset class="admin__fieldset">
<?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
<div class="admin__field _required">
<label class="admin__field-label" for="custom_currency_symbol<?= $block->escapeHtmlAttr($code) ?>">
<span><?= $block->escapeHtml($code) ?> (<?= $block->escapeHtml($data['displayName']) ?>)</span>
<label class="admin__field-label" for="custom_currency_symbol<?= $escaper->escapeHtmlAttr($code) ?>">
<span><?= $escaper->escapeHtml($code) ?> (<?= $escaper->escapeHtml($data['displayName']) ?>)</span>
</label>
<div class="admin__field-control">
<input id="custom_currency_symbol<?= $block->escapeHtmlAttr($code) ?>"
<input id="custom_currency_symbol<?= $escaper->escapeHtmlAttr($code) ?>"
class="required-entry admin__control-text"
type="text"
value="<?= $block->escapeHtmlAttr($data['displaySymbol']) ?>"
name="custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]"
value="<?= $escaper->escapeHtmlAttr($data['displaySymbol']) ?>"
name="custom_currency_symbol[<?= $escaper->escapeHtmlAttr($code) ?>]"
<?= $data['inherited'] ? 'disabled' : '' ?>>
<div class="admin__field admin__field-option">
<?php
$escapedCode = $block->escapeHtmlAttr($block->escapeJs($code));
$escapedSymbol = $block->escapeJs($data['parentSymbol']);
$escapedCode = $escaper->escapeHtmlAttr($escaper->escapeJs($code));
$escapedSymbol = $escaper->escapeJs($data['parentSymbol']);
?>
<input id="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>"
<input id="custom_currency_symbol_inherit<?= $escaper->escapeHtmlAttr($code) ?>"
class="admin__control-checkbox" type="checkbox"
<?= $data['inherited'] ? ' checked="checked"' : '' ?>
value="1"
name="inherit_custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]">
name="inherit_custom_currency_symbol[<?= $escaper->escapeHtmlAttr($code) ?>]">
<label class="admin__field-label"
for="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>">
for="custom_currency_symbol_inherit<?= $escaper->escapeHtmlAttr($code) ?>">
<span>
<?= $block->escapeHtml($block->getInheritText()) ?>
<?= $escaper->escapeHtml($block->getInheritText()) ?>
</span>
</label>
<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
'onclick',
"toggleUseDefault('" . $escapedCode . "','" . $escapedSymbol . "')",
'#custom_currency_symbol_inherit' . $block->escapeJs($code)
'#custom_currency_symbol_inherit' . $escaper->escapeJs($code)
) ?>
</div>
</div>
Expand Down
33 changes: 17 additions & 16 deletions app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

/**
* @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Matrix
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/

Expand All @@ -15,20 +16,20 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
?>
<?php if (empty($_rates)): ?>
<div class="message message-warning warning"><p>
<?= $block->escapeHtml(
<?= $escaper->escapeHtml(
__('You must first configure currency options before being able to see currency rates.')
) ?></p>
</div>
<?php else: ?>
<form name="rateForm" id="rate-form" method="post" action="<?= $block->escapeUrl($block->getRatesFormAction()) ?>">
<form name="rateForm" id="rate-form" method="post" action="<?= $escaper->escapeUrl($block->getRatesFormAction()) ?>">
<?= $block->getBlockHtml('formkey') ?>
<div class="admin__control-table-wrapper">
<table class="admin__control-table">
<thead>
<tr>
<th>&nbsp;</th>
<?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
<th><span><?= $block->escapeHtml($_currencyCode) ?></span></th>
<th><span><?= $escaper->escapeHtml($_currencyCode) ?></span></th>
<?php endforeach; ?>
</tr>
</thead>
Expand All @@ -37,42 +38,42 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
<?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
<?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
<?php if (++$_j == 1): ?>
<td><span class="admin__control-support-text"><?= $block->escapeHtml($_currencyCode) ?>
<td><span class="admin__control-support-text"><?= $escaper->escapeHtml($_currencyCode) ?>
</span></td>
<td>
<input type="text"
name="rate[<?= $block->escapeHtmlAttr($_currencyCode)
?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
name="rate[<?= $escaper->escapeHtmlAttr($_currencyCode)
?>][<?= $escaper->escapeHtmlAttr($_rate) ?>]"
value="<?= ($_currencyCode == $_rate) ? '1.0000' :
($_value>0 ? $block->escapeHtmlAttr($_value) :
($_value>0 ? $escaper->escapeHtmlAttr($_value) :
(isset($_oldRates[$_currencyCode][$_rate]) ?
$block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : ''))
$escaper->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : ''))
?>"
class="admin__control-text"
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
<?php if (isset($_newRates) && $_currencyCode != $_rate &&
isset($_oldRates[$_currencyCode][$_rate])): ?>
<div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?>
<strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong>
<div class="admin__field-note"><?= $escaper->escapeHtml(__('Old rate:')) ?>
<strong><?= $escaper->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong>
</div>
<?php endif; ?>
</td>
<?php else: ?>
<td>
<input type="text"
name="rate[<?= $block->escapeHtmlAttr($_currencyCode)
?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
name="rate[<?= $escaper->escapeHtmlAttr($_currencyCode)
?>][<?= $escaper->escapeHtmlAttr($_rate) ?>]"
value="<?= ($_currencyCode == $_rate) ? '1.0000' :
($_value>0 ? $block->escapeHtmlAttr($_value) :
($_value>0 ? $escaper->escapeHtmlAttr($_value) :
(isset($_oldRates[$_currencyCode][$_rate]) ?
$block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : ''))
$escaper->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : ''))
?>"
class="admin__control-text"
<?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
<?php if (isset($_newRates) && $_currencyCode != $_rate &&
isset($_oldRates[$_currencyCode][$_rate])): ?>
<div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?>
<strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong>
<div class="admin__field-note"><?= $escaper->escapeHtml(__('Old rate:')) ?>
<strong><?= $escaper->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong>
</div>
<?php endif; ?>
</td>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php

/**
* @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Services
* @var \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Services $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<div class="admin__field">
<label class="admin__field-label"><span><?= $block->escapeHtml(__('Import Service')) ?></span></label>
<label class="admin__field-label"><span><?= $escaper->escapeHtml(__('Import Service')) ?></span></label>
<div class="admin__field-control">
<?= $block->getChildHtml('import_services') ?>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
?>
<?php

/**
* @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency
* @var \Magento\CurrencySymbol\Block\Adminhtml\System\Currency $block
* @var \Magento\Framework\Escaper $escaper
*/
?>

<form action="<?= $block->escapeUrl($block->getImportFormAction()) ?>" method="post" class="import-service">
<form action="<?= $escaper->escapeUrl($block->getImportFormAction()) ?>" method="post" class="import-service">
<?= $block->getBlockHtml('formkey') ?>
<fieldset class="admin__fieldset admin__fieldset-import-service">
<?= $block->getServicesHtml() ?>
Expand Down