Skip to content

Chore: Store - Replace Block Escaping with Escaper #37051

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 2 commits into from
Closed

Chore: Store - Replace Block Escaping with Escaper #37051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52bd67e
Chore: Store - Replace Block Escaping with Escaper
pykettk Mar 9, 2023
448f5b9
Merge branch '2.4-develop' into store-escaper
engcom-Lima Mar 10, 2023
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
10 changes: 7 additions & 3 deletions app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

use Magento\Framework\Escaper;

/** @var Escaper $escaper */
// @deprecated
?>
<?php if (count($block->getStores())>1) : ?>
<div class="form-language">
<label for="select-language"><?= $block->escapeHtml(__('Your Language:')) ?></label>
<select id="select-language" title="<?= $block->escapeHtmlAttr(__('Your Language')) ?>" onchange="window.location.href=this.value" class="flags">
<label for="select-language"><?= $escaper->escapeHtml(__('Your Language:')) ?></label>
<select id="select-language" title="<?= $escaper->escapeHtmlAttr(__('Your Language')) ?>" onchange="window.location.href=this.value" class="flags">
<?php foreach ($block->getStores() as $_lang) : ?>
<?php $_selected = ($_lang->getId() == $block->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
<option value="<?= $block->escapeUrl($_lang->getCurrentUrl()) ?>" style="background-image:url('<?= $block->escapeUrl($block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif')) ?>');"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($_lang->getName()) ?></option>
<option value="<?= $escaper->escapeUrl($_lang->getCurrentUrl()) ?>" style="background-image:url('<?= $escaper->escapeUrl($block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif')) ?>');"<?= /* @noEscape */ $_selected ?>><?= $escaper->escapeHtml($_lang->getName()) ?></option>
<?php endforeach; ?>
</select>
</div>
Expand Down
23 changes: 14 additions & 9 deletions app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,35 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

/** @var \Magento\Store\Block\Switcher $block */
use Magento\Framework\Escaper;
use Magento\Store\Block\Switcher;

/** @var Escaper $escaper */
/** @var Switcher $block */
?>
<?php if (count($block->getStores())>1) : ?>
<?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?= $block->escapeHtmlAttr($id) ?>">
<strong class="label switcher-label"><span><?= $block->escapeHtml(__('Language')) ?></span></strong>
<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?= $escaper->escapeHtmlAttr($id) ?>">
<strong class="label switcher-label"><span><?= $escaper->escapeHtml(__('Language')) ?></span></strong>
<div class="actions dropdown options switcher-options">
<div class="action toggle switcher-trigger"
id="switcher-language-trigger<?= $block->escapeHtmlAttr($id) ?>"
id="switcher-language-trigger<?= $escaper->escapeHtmlAttr($id) ?>"
data-mage-init='{"dropdown":{}}'
data-toggle="dropdown"
data-trigger-keypress-button="true">
<strong class="view-<?= $block->escapeHtml($block->getCurrentStoreCode()) ?>">
<span><?= $block->escapeHtml($block->getStoreName()) ?></span>
<strong class="view-<?= $escaper->escapeHtml($block->getCurrentStoreCode()) ?>">
<span><?= $escaper->escapeHtml($block->getStoreName()) ?></span>
</strong>
</div>
<ul class="dropdown switcher-dropdown"
data-target="dropdown">
<?php foreach ($block->getStores() as $_lang) : ?>
<?php if ($_lang->getId() != $block->getCurrentStoreId()) : ?>
<li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
<a href="<?= $block->escapeUrl($block->getViewModel()->getTargetStoreRedirectUrl($_lang)) ?>">
<?= $block->escapeHtml($_lang->getName()) ?>
<li class="view-<?= $escaper->escapeHtml($_lang->getCode()) ?> switcher-option">
<a href="<?= $escaper->escapeUrl($block->getViewModel()->getTargetStoreRedirectUrl($_lang)) ?>">
<?= $escaper->escapeHtml($_lang->getName()) ?>
</a>
</li>
<?php endif; ?>
Expand Down
13 changes: 9 additions & 4 deletions app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

/** @var \Magento\Store\Block\Switcher $block */
use Magento\Framework\Escaper;
use Magento\Store\Block\Switcher;

/** @var Escaper $escaper */
/** @var Switcher $block */
?>
<?php if (count($block->getGroups())>1) : ?>
<div class="switcher store switcher-store" id="switcher-store">
<strong class="label switcher-label"><span><?= $block->escapeHtml(__('Select Store')) ?></span></strong>
<strong class="label switcher-label"><span><?= $escaper->escapeHtml(__('Select Store')) ?></span></strong>
<div class="actions dropdown options switcher-options">
<?php foreach ($block->getGroups() as $_group) : ?>
<?php if ($_group->getId() == $block->getCurrentGroupId()) : ?>
Expand All @@ -20,7 +25,7 @@
data-trigger-keypress-button="true"
id="switcher-store-trigger">
<strong>
<span><?= $block->escapeHtml($_group->getName()) ?></span>
<span><?= $escaper->escapeHtml($_group->getName()) ?></span>
</strong>
</div>
<?php endif; ?>
Expand All @@ -30,7 +35,7 @@
<?php if (!($_group->getId() == $block->getCurrentGroupId())) : ?>
<li class="switcher-option">
<a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_group->getDefaultStore()) ?>'>
<?= $block->escapeHtml($_group->getName()) ?>
<?= $escaper->escapeHtml($_group->getName()) ?>
</a>
</li>
<?php endif; ?>
Expand Down