Skip to content

Commit 770f3f0

Browse files
author
Joan He
committed
MAGETWO-99294: Eliminate @escapeNotVerified in Magento_ImportExport module
1 parent c56341c commit 770f3f0

File tree

6 files changed

+16
-20
lines changed

6 files changed

+16
-20
lines changed

app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
?>
77
<div class="fieldset">
88
<div class="legend">
9-
<span><?= /* @escapeNotVerified */ __('Status') ?></span>
9+
<span><?= $block->escapeHtml(__('Status')) ?></span>
1010
</div><br>
1111
<div class="messages">
1212
<div class="message message-success success">
13-
<div><?= /* @escapeNotVerified */ $block->getStatusMessage() ?></div>
13+
<div><?= $block->escapeHtml($block->getStatusMessage()) ?></div>
1414
</div>
1515
</div>
1616
</div>

app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
86
?>
97
<fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
108
<legend class="admin__legend">
11-
<span><?= /* @escapeNotVerified */ __('Entity Attributes') ?></span>
9+
<span><?= $block->escapeHtml(__('Entity Attributes')) ?></span>
1210
</legend>
1311
<br />
14-
<form id="export_filter_form" action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/export') ?>" method="post">
15-
<input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
12+
<form id="export_filter_form" action="<?= $block->escapeUrl($block->getUrl('*/*/export')) ?>" method="post">
13+
<input name="form_key" type="hidden" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
1614
<div id="export_filter_grid_container"><!-- --></div>
1715
</form>
18-
<button class="action- scalable" type="button" onclick="getFile();"><span><?php
19-
/* @escapeNotVerified */ echo __('Continue')
16+
<button class="action- scalable" type="button" onclick="getFile();"><span><?=
17+
$block->escapeHtml(__('Continue'))
2018
?></span></button>
2119
</fieldset>
2220
<script>

app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ require([
4444
*/
4545
getFilter: function() {
4646
if ($('entity') && $F('entity')) {
47-
var url = "<?= /* @escapeNotVerified */ $block->getUrl('*/*/getFilter') ?>";
47+
var url = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/*/getFilter'))) ?>";
4848
var entity = $F('entity');
4949
if (entity != this.previousGridEntity) {
5050
this.previousGridEntity = entity;

app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
86
?>
97
<div class="entry-edit fieldset" id="import_validation_container" style="display:none;">
108
<div class="entry-edit-head legend">
119
<span class="icon-head head-edit-form fieldset-legend"
12-
id="import_validation_container_header"><?= /* @escapeNotVerified */ __('Validation Results') ?></span>
10+
id="import_validation_container_header"><?= $block->escapeHtml(__('Validation Results')) ?></span>
1311
</div><br>
1412
<div id="import_validation_messages" class="fieldset"><!-- --></div>
1513
</div>

app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
86
?>
97
<?php
108
/** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
@@ -29,25 +27,27 @@ require([
2927
* List of existing behavior sets
3028
* @type {Array}
3129
*/
32-
uniqueBehaviors: <?= /* @escapeNotVerified */ $block->getUniqueBehaviors() ?>,
30+
uniqueBehaviors: <?= /* @noEscape */ $block->getUniqueBehaviors() ?>,
3331

3432
/**
3533
* Behaviour codes for import entities
3634
* @type {Array}
3735
*/
38-
entityBehaviors: <?= /* @escapeNotVerified */ $block->getEntityBehaviors() ?>,
36+
entityBehaviors: <?= /* @noEscape */ $block->getEntityBehaviors() ?>,
3937

4038
/**
4139
* Behaviour notes for import entities
4240
* @type {Array}
4341
*/
44-
entityBehaviorsNotes: <?= /* @escapeNotVerified */ $block->getEntityBehaviorsNotes() ?>,
42+
entityBehaviorsNotes: <?= /* @noEscape */ $block->getEntityBehaviorsNotes() ?>,
4543

4644
/**
4745
* Base url
4846
* @type {string}
4947
*/
50-
sampleFilesBaseUrl: '<?= /* @escapeNotVerified */ $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
48+
sampleFilesBaseUrl: '<?= $block->escapeJs(
49+
$block->escapeUrl($block->getUrl('*/*/download/', ['filename' => 'entity-name']))
50+
) ?>',
5151

5252
/**
5353
* Reset selected index

app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
?>
77
<script type='text/javascript'>
88
//<![CDATA[
9-
top.varienImport.postToFrameComplete(<?= /* @escapeNotVerified */ $block->getResponseJson() ?>);
9+
top.varienImport.postToFrameComplete(<?= /* @noEscape */ $block->getResponseJson() ?>);
1010
//]]>
1111
</script>

0 commit comments

Comments
 (0)