Skip to content

Magento_SendFriend: avoid using deprecated escape* methods from Abstr… #31715

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_SendFriend: avoid using deprecated escape* methods from Abstr… #31715

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
45 changes: 23 additions & 22 deletions app/code/Magento/SendFriend/view/frontend/templates/send.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/
/**
* @var \Magento\SendFriend\Block\Send $block
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/

Expand All @@ -17,29 +18,29 @@
<div class="actions-toolbar">
<div class="secondary">
<button type="button" id="btn-remove<%- data._index_ %>" class="action remove"
title="<?= $block->escapeHtmlAttr(__('Remove Recipent')) ?>">
<span><?= $block->escapeHtml(__('Remove')) ?></span>
title="<?= $escaper->escapeHtmlAttr(__('Remove Recipent')) ?>">
<span><?= $escaper->escapeHtml(__('Remove')) ?></span>
</button>
</div>
</div>
<fieldset class="fieldset">
<div class="field name required">
<label for="recipients-name<%- data._index_ %>" class="label">
<span><?= $block->escapeHtml(__('Name')) ?></span>
<span><?= $escaper->escapeHtml(__('Name')) ?></span>
</label>
<div class="control">
<input name="recipients[name][<%- data._index_ %>]" type="text"
title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
title="<?= $escaper->escapeHtmlAttr(__('Name')) ?>" class="input-text"
id="recipients-name<%- data._index_ %>" data-validate="{required:true}"/>
</div>
</div>

<div class="field email required">
<label for="recipients-email<%- data._index_ %>" class="label">
<span><?= $block->escapeHtml(__('Email')) ?></span>
<span><?= $escaper->escapeHtml(__('Email')) ?></span>
</label>
<div class="control">
<input name="recipients[email][<%- data._index_ %>]" title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
<input name="recipients[email][<%- data._index_ %>]" title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>"
id="recipients-email<%- data._index_ %>" type="email" class="input-text"
data-mage-init='{"mage/trim-input":{}}'
data-validate="{required:true, 'validate-email':true}"/>
Expand All @@ -48,7 +49,7 @@
</fieldset>
</script>

<form action="<?= $block->escapeUrl($block->getSendUrl()) ?>" method="post" id="product-sendtofriend-form"
<form action="<?= $escaper->escapeUrl($block->getSendUrl()) ?>" method="post" id="product-sendtofriend-form"
data-mage-init='{
"rowBuilder":{
"rowTemplate":"#add-recipient-tmpl",
Expand All @@ -61,48 +62,48 @@
"addRowBtn":"#add-recipient-button",
"additionalRowClass":"additional"},
"validation":{}}'
class="form send friend" data-hasRequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
class="form send friend" data-hasRequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
<fieldset class="fieldset sender" id="sender_options">
<?= $block->getBlockHtml('formkey') ?>
<legend class="legend"><span><?= $block->escapeHtml(__('Sender')) ?></span></legend>
<legend class="legend"><span><?= $escaper->escapeHtml(__('Sender')) ?></span></legend>
<br>
<div class="field sender required">
<label for="sender-name" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
<label for="sender-name" class="label"><span><?= $escaper->escapeHtml(__('Name')) ?></span></label>
<div class="control">
<input name="sender[name]" value="<?= $block->escapeHtmlAttr($block->getUserName()) ?>"
title="<?= $block->escapeHtmlAttr(__('Name')) ?>" id="sender-name" type="text" class="input-text"
<input name="sender[name]" value="<?= $escaper->escapeHtmlAttr($block->getUserName()) ?>"
title="<?= $escaper->escapeHtmlAttr(__('Name')) ?>" id="sender-name" type="text" class="input-text"
data-validate="{required:true}"/>
</div>
</div>

<div class="field email required">
<label for="sender-email" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
<label for="sender-email" class="label"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
<div class="control">
<input name="sender[email]" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>"
title="<?= $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="email"
<input name="sender[email]" value="<?= $escaper->escapeHtmlAttr($block->getEmail()) ?>"
title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="email"
class="input-text"
data-mage-init='{"mage/trim-input":{}}'
data-validate="{required:true, 'validate-email':true}"/>
</div>
</div>

<div class="field text required">
<label for="sender-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
<label for="sender-message" class="label"><span><?= $escaper->escapeHtml(__('Message')) ?></span></label>
<div class="control">
<textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3"
data-validate="{required:true}"><?= $block->escapeHtml($block->getMessage()) ?></textarea>
data-validate="{required:true}"><?= $escaper->escapeHtml($block->getMessage()) ?></textarea>
</div>
</div>
</fieldset>

<fieldset class="fieldset recipients">
<?= $block->getBlockHtml('formkey') ?>
<legend class="legend"><span><?= $block->escapeHtml(__('Invitee')) ?></span></legend>
<legend class="legend"><span><?= $escaper->escapeHtml(__('Invitee')) ?></span></legend>
<br />
<div id="recipients-options"></div>
<?php if ($block->getMaxRecipients()): ?>
<div id="max-recipient-message" class="message notice limit" role="alert">
<span><?= $block->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?>
<span><?= $escaper->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?>
</span>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#max-recipient-message') ?>
Expand All @@ -111,7 +112,7 @@
<div class="secondary">
<?php if (1 < $block->getMaxRecipients()): ?>
<button type="button" id="add-recipient-button" class="action add">
<span><?= $block->escapeHtml(__('Add Invitee')) ?></span></button>
<span><?= $escaper->escapeHtml(__('Add Invitee')) ?></span></button>
<?php endif; ?>
</div>
</div>
Expand All @@ -122,10 +123,10 @@
<div class="primary">
<button type="submit"
class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
<span><?= $block->escapeHtml(__('Send Email')) ?></span></button>
<span><?= $escaper->escapeHtml(__('Send Email')) ?></span></button>
</div>
<div class="secondary">
<a class="action back" href="#" role="back"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
<a class="action back" href="#" role="back"><span><?= $escaper->escapeHtml(__('Back')) ?></span></a>
</div>
</div>
</form>
Expand Down