Skip to content

Commit 04aab48

Browse files
author
Joan He
committed
Merge remote-tracking branch 'arcticfoxes/MAGETWO-99530' into 2.2-develop-pr
2 parents 747a07a + 57493a4 commit 04aab48

File tree

8 files changed

+39
-35
lines changed

8 files changed

+39
-35
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>

‎app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,30 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
7+
/** @var $block \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport */
98
?>
109
<div class="import-export-tax-rates">
11-
<?php if (!$block->getIsReadonly()): ?>
10+
<?php if (!$block->getIsReadonly()) :?>
1211
<div class="import-tax-rates">
13-
<?php if ($block->getUseContainer()): ?>
14-
<form id="import-form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
12+
<?php if ($block->getUseContainer()) :?>
13+
<form id="import-form"
14+
class="admin__fieldset"
15+
action="<?= $block->escapeUrl($block->getUrl('tax/rate/importPost')) ?>"
16+
method="post"
17+
enctype="multipart/form-data">
1518
<?php endif; ?>
1619
<?= $block->getBlockHtml('formkey') ?>
1720
<div class="fieldset admin__field">
18-
<label for="import_rates_file" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Tax Rates') ?></span></label>
21+
<label for="import_rates_file" class="admin__field-label"><span><?= $block->escapeHtml(__('Import Tax Rates')) ?></span></label>
1922
<div class="admin__field-control">
20-
<input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
23+
<input type="file"
24+
id="import_rates_file"
25+
name="import_rates_file"
26+
class="input-file required-entry"/>
2127
<?= $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
2228
</div>
2329
</div>
24-
<?php if ($block->getUseContainer()): ?>
30+
<?php if ($block->getUseContainer()) :?>
2531
</form>
2632
<?php endif; ?>
2733
<script>
@@ -44,18 +50,22 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
4450
</script>
4551
</div>
4652
<?php endif; ?>
47-
<div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
48-
<?php if ($block->getUseContainer()): ?>
49-
<form id="export_form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
53+
<div class="export-tax-rates <?= /* @noEscape */ ($block->getIsReadonly()) ? 'box-left' : 'box-right' ?>">
54+
<?php if ($block->getUseContainer()) :?>
55+
<form id="export_form"
56+
class="admin__fieldset"
57+
action="<?= $block->escapeUrl($block->getUrl('tax/rate/exportPost')) ?>"
58+
method="post"
59+
enctype="multipart/form-data">
5060
<?php endif; ?>
5161
<?= $block->getBlockHtml('formkey') ?>
5262
<div class="fieldset admin__field">
53-
<span class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Export Tax Rates') ?></span></span>
63+
<span class="admin__field-label"><span><?= $block->escapeHtml(__('Export Tax Rates')) ?></span></span>
5464
<div class="admin__field-control">
5565
<?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
5666
</div>
5767
</div>
58-
<?php if ($block->getUseContainer()): ?>
68+
<?php if ($block->getUseContainer()) :?>
5969
</form>
6070
<?php endif; ?>
6171
</div>

‎dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
'Magento_GoogleAdwords',
2121
'Magento_GoogleAnalytics',
2222
'Magento_GroupedProduct',
23-
'Magento_ImportExport',
2423
'Magento_Integration',
2524
'Magento_LayeredNavigation',
2625
'Magento_Marketplace',
@@ -36,7 +35,6 @@
3635
'Magento_Swagger',
3736
'Magento_Swatches',
3837
'Magento_Tax',
39-
'Magento_TaxImportExport',
4038
'Magento_Theme',
4139
'Magento_Translation',
4240
'Magento_Ui',

0 commit comments

Comments
 (0)