Skip to content

Commit b0f1edf

Browse files
cspruiellcspruiell
committed
MAGETWO-99482: Use escaper methods
 - clean up coding standards violations
1 parent f67b6fd commit b0f1edf

File tree

10 files changed

+137
-63
lines changed

10 files changed

+137
-63
lines changed

‎app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
*/
1010
?>
1111
<fieldset class="admin__fieldset form-inline entry-edit">
12-
<?php if ($block->isTreeEmpty()): ?>
12+
<?php if ($block->isTreeEmpty()) : ?>
1313
<p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
14-
<?php else: ?>
14+
<?php else : ?>
1515
<div class="field" data-role="tree-resources-container">
1616
<div class="control">
1717
<div id="resource-tree" class="tree x-tree" data-role="resource-tree"></div>
1818
</div>
1919
</div>
2020
<?php endif ?>
2121
</fieldset>
22-
<?php if (!$block->isTreeEmpty()): ?>
22+
<?php if (!$block->isTreeEmpty()) : ?>
2323
<script>
2424
require(["jquery", "Magento_User/js/roles-tree"], function($){
2525
$.widget('mage.rolesTree', $.mage.rolesTree, {

‎app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,34 @@
1818
], function ($, Confirm) {
1919

2020
window.integration = new Integration(
21-
'<?= $block->escapeUrl($block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false])) ?>',
22-
'<?= $block->escapeUrl($block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false])) ?>',
23-
'<?= $block->escapeUrl($block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false])) ?>',
24-
'<?= $block->escapeUrl($block->getUrl('*/*')) ?>',
25-
'<?= $block->escapeUrl($block->getUrl('*/*/loginSuccessCallback')) ?>'
21+
'<?= $block->escapeUrl(
22+
$block->getUrl(
23+
'*/*/permissionsDialog',
24+
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
25+
)
26+
) ?>',
27+
'<?= $block->escapeUrl(
28+
$block->getUrl(
29+
'*/*/tokensDialog',
30+
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
31+
)
32+
) ?>',
33+
'<?= $block->escapeUrl(
34+
$block->getUrl(
35+
'*/*/tokensExchange',
36+
['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
37+
)
38+
) ?>',
39+
'<?= $block->escapeUrl(
40+
$block->getUrl(
41+
'*/*'
42+
)
43+
) ?>',
44+
'<?= $block->escapeUrl(
45+
$block->getUrl(
46+
'*/*/loginSuccessCallback'
47+
)
48+
) ?>'
2649
);
2750

2851
/**

‎app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
// @codingStandardsIgnoreFile
8+
69
?>
710

811
<?php
@@ -20,25 +23,33 @@
2023
<label class="label" for="all_resources"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
2124

2225
<div class="control">
23-
<select id="all_resources" name="all_resources" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
24-
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= $block->escapeHtml(__('Custom')) ?></option>
25-
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= $block->escapeHtml(__('All')) ?></option>
26+
<select id="all_resources" name="all_resources"
27+
onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
28+
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
29+
<?= $block->escapeHtml(__('Custom')) ?>
30+
</option>
31+
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>>
32+
<?= $block->escapeHtml(__('All')) ?>
33+
</option>
2634
</select>
2735
</div>
2836
</div>
2937

30-
<div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
38+
<div class="field
39+
<?php if ($block->isEverythingAllowed()) :?>
40+
no-display
41+
<?php endif?>"
42+
data-role="tree-resources-container">
3143
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3244

3345
<div class="control">
34-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
35-
echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
36-
'rolesTree' => [
37-
"treeInitData" => $block->getTree(),
38-
"treeInitSelectedData" => $block->getSelectedResources(),
39-
],
40-
]));
41-
?>'></div>
46+
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
47+
$block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
48+
'rolesTree' => [
49+
"treeInitData" => $block->getTree(),
50+
"treeInitSelectedData" => $block->getSelectedResources(),
51+
],
52+
])); ?>'></div>
4253
</div>
4354
</div>
4455
</fieldset>

‎app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
<section class="page-partners">
99
<h2 class="page-sub-title"><?= $block->escapeHtml(__('Platinum Partners')) ?></h2>
1010
<p class="partners-description">
11-
<?php
12-
echo $block->escapeHtml(__(
13-
'Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established themselves as leaders and innovators of key products and services designed to help merchants and brands grow their business. ' .
14-
'Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.'
11+
<?= $block->escapeHtml(__(
12+
'Representing Magento\'s highest level of partner engagement, Magento Platinum Partners have established ' .
13+
'themselves as leaders and innovators of key products and services designed to help merchants and brands ' .
14+
'grow their business. Magento reserves the Platinum level for select trusted partners that are committed ' .
15+
'to offering integrations of commerce features, functions, and tools, as well as back-end systems and ' .
16+
'operations, to extend and enhance the power of the Magento commerce platform.'
1517
)); ?>
1618
</p>
1719
<h3 class="page-sub-sub-title"><?= $block->escapeHtml(__('Featured Platinum Partners')) ?></h3>
@@ -29,11 +31,11 @@
2931
<div class="partners-search">
3032
<h2 class="page-sub-title"><?= $block->escapeHtml(__('Partner search')) ?></h2>
3133
<p>
32-
<?php
33-
echo $block->escapeHtml(__(
34-
'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver the best possible customer experiences. ' .
35-
'They are recognized as experts in eCommerce, search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, and more. ' .
36-
'Visit the Magento Partner Directory to see all of our trusted partners.'
34+
<?= $block->escapeHtml(__(
35+
'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver' .
36+
'the best possible customer experiences. They are recognized as experts in eCommerce, ' .
37+
'search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, ' .
38+
'and more. Visit the Magento Partner Directory to see all of our trusted partners.'
3739
)); ?>
3840
</p>
3941
<a class="action-secondary" target="_blank"
@@ -45,17 +47,17 @@
4547
<div class="col-m-3">
4648
<img
4749
class="magento-marketplace-logo"
48-
src="<?php echo $block->escapeUrl($block
49-
->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg'));
50-
?>"
50+
src="<?= $block->escapeUrl($block
51+
->getViewFileUrl('Magento_Marketplace::partners/images/magento-marketplace.svg')); ?>"
5152
alt="Partner"/>
5253
</div>
5354
<div class="col-m-4">
5455
<h2 class="page-sub-title"><?= $block->escapeHtml(__('Magento Marketplace')) ?></h2>
5556
<p class="partner-description">
56-
<?php echo $block->escapeHtml(__(
57+
<?= $block->escapeHtml(__(
5758
'Extensions and Themes are an essential component of the Magento Ecosystem. ' .
58-
'Please visit the Magento Marketplace to see the latest innovations that developers have created to enhance your Magento Store.'
59+
'Please visit the Magento Marketplace to see the latest innovations that developers have ' .
60+
'created to enhance your Magento Store.'
5961
)); ?>
6062
</p>
6163
<a class="action-secondary" target="_blank"
@@ -71,8 +73,10 @@
7173
{
7274
"*": {
7375
"Magento_Marketplace/default": {
74-
"url": "<?= $block->escapeUrl($block->getUrl('marketplace/partners/index',
75-
['_current' => true, 'block' => '', 'period' => ''])) ?>"
76+
"url": "<?= $block->escapeUrl($block->getUrl(
77+
'marketplace/partners/index',
78+
['_current' => true, 'block' => '', 'period' => '']
79+
)) ?>"
7680
}
7781
}
7882
}

‎app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,26 @@
88
<fieldset class="admin__fieldset">
99
<legend class="admin__legend"><span><?= $block->escapeHtml(__('Password Help')) ?></span></legend><br/>
1010
<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
11-
<p class="admin__field-info"><?= $block->escapeHtml(__('Enter your email address. You will receive an email with a link to reset your password.')) ?></p>
11+
<p class="admin__field-info"><?= $block->escapeHtml(
12+
__('Enter your email address. You will receive an email with a link to reset your password.')
13+
) ?></p>
1214
<div class="admin__field _required field-email">
1315
<label for="email" class="admin__field-label"><span><?= $block->escapeHtml(__('Email address')) ?></span></label>
1416
<div class="admin__field-control">
15-
<input type="text" id="email" name="email" value="" data-validate="{required:true, 'validate-email':true}" class="admin__control-text" />
17+
<input type="text" id="email" name="email" value=""
18+
data-validate="{required:true, 'validate-email':true}" class="admin__control-text" />
1619
</div>
1720
</div>
1821
<?= $block->getChildHtml('form.additional.info') ?>
1922
<div class="form-actions">
2023
<div class="actions">
21-
<button class="action-retrieve action-primary" type="submit"><span><?= $block->escapeHtml(__('Retrieve Password')) ?></span></button>
24+
<button class="action-retrieve action-primary" type="submit">
25+
<span><?= $block->escapeHtml(__('Retrieve Password')) ?></span>
26+
</button>
2227
</div>
2328
<div class="links">
24-
<a class="action-back" href="<?= $block->escapeUrl($block->getUrl('adminhtml', ['_nosecret' => true])) ?>">
29+
<a class="action-back"
30+
href="<?= $block->escapeUrl($block->getUrl('adminhtml', ['_nosecret' => true])) ?>">
2531
<?= $block->escapeHtml(__('Back to Sign in')) ?>
2632
</a>
2733
</div>

‎app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
// @codingStandardsIgnoreFile
8+
69
?>
710
<div class="links">
8-
<a class="action-forgotpassword" href="<?= $block->escapeUrl($this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])) ?>"><?= $block->escapeHtml(__('Forgot your password?')) ?></a>
11+
<a class="action-forgotpassword" href="<?= $block->escapeUrl($this->helper(\Magento\Backend\Helper\Data::class)->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])) ?>"><?= $block->escapeHtml(__('Forgot your password?')) ?></a>
912
</div>

‎app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,30 @@
55
*/
66
?>
77

8-
<form method="post" data-mage-init='{"form": {}, "validation": {}}' action="<?= $block->escapeUrl($block->getUrl('*/auth/resetpasswordpost', ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]])) ?>" id="reset-password-form" autocomplete="off">
8+
<form method="post" data-mage-init='{"form": {}, "validation": {}}'
9+
action="<?= $block->escapeUrl(
10+
$block->getUrl(
11+
'*/auth/resetpasswordpost',
12+
['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]]
13+
)
14+
) ?>" id="reset-password-form" autocomplete="off">
915
<fieldset class="admin__fieldset">
1016
<legend class="admin__legend"><span><?= $block->escapeHtml(__('Reset a Password')) ?></span></legend><br />
1117
<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
1218
<div class="admin__field _required field-password">
1319
<label class="admin__field-label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
1420
<div class="admin__field-control">
15-
<input type="password" class="admin__control-text" data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password" placeholder="new password" autocomplete="off" />
21+
<input type="password" class="admin__control-text"
22+
data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password"
23+
placeholder="new password" autocomplete="off" />
1624
</div>
1725
</div>
1826
<div class="admin__field _required field-confirmation">
1927
<label class="admin__field-label" for="confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
2028
<div class="admin__field-control">
21-
<input type="password" class="admin__control-text" data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation" placeholder="confirm new password" autocomplete="off" />
29+
<input type="password" class="admin__control-text"
30+
data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation"
31+
placeholder="confirm new password" autocomplete="off" />
2232
</div>
2333
</div>
2434
<div class="form-actions">

‎app/code/Magento/User/view/adminhtml/templates/role/edit.phtml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
// @codingStandardsIgnoreFile
8+
69
?>
710

811
<?php
@@ -20,25 +23,37 @@
2023
<label class="label" for="all"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
2124

2225
<div class="control">
23-
<select id="all" name="all" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
24-
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= $block->escapeHtml(__('Custom')) ?></option>
25-
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= $block->escapeHtml(__('All')) ?></option>
26+
<select id="all" name="all"
27+
onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
28+
<option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
29+
<?= $block->escapeHtml(__('Custom')) ?>
30+
</option>
31+
<option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>>
32+
<?= $block->escapeHtml(__('All')) ?>
33+
</option>
2634
</select>
2735
</div>
2836
</div>
2937

30-
<div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
38+
<div class="field
39+
<?php if ($block->isEverythingAllowed()) :?>
40+
no-display
41+
<?php endif?>"
42+
data-role="tree-resources-container">
3143
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3244

3345
<div class="control">
34-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
35-
echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
36-
'rolesTree' => [
37-
"treeInitData" => $block->getTree(),
38-
"treeInitSelectedData" => $block->getSelectedResources(),
39-
],
40-
]));
41-
?>'></div>
46+
<div class="tree x-tree" data-role="resource-tree"
47+
data-mage-init='<?= $block->escapeHtml(
48+
$this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode(
49+
[
50+
'rolesTree' => [
51+
"treeInitData" => $block->getTree(),
52+
"treeInitSelectedData" => $block->getSelectedResources(),
53+
],
54+
]
55+
)
56+
); ?>'></div>
4257
</div>
4358
</div>
4459
</fieldset>

‎app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require([
1414
], function(jQuery, confirm, _){
1515
<!--
1616
<?php $myBlock = $block->getLayout()->getBlock('roleUsersGrid'); ?>
17-
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
17+
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
1818
var checkBoxes = $H(<?= $myBlock->escapeHtml($myBlock->getUsers(true)) ?>);
1919
var warning = false;
2020
if (checkBoxes.size() > 0) {

‎app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require([
1111
], function(){
1212

1313
<?php $myBlock = $block->getLayout()->getBlock('user.roles.grid'); ?>
14-
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
14+
<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
1515
var radioBoxes = $H({});
1616
var warning = false;
1717
var userRoles = $H(<?= $myBlock->escapeHtml($myBlock->getSelectedRoles(true)) ?>);
@@ -60,17 +60,19 @@ require([
6060
}
6161
}
6262

63-
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rowClickCallback = roleRowClick;
64-
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.initRowCallback = rolesRowInit;
65-
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.checkboxCheckCallback = registerUserRole;
66-
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row){rolesRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)});
63+
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rowClickCallback = roleRowClick;
64+
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.initRowCallback = rolesRowInit;
65+
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.checkboxCheckCallback = registerUserRole;
66+
<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row){
67+
rolesRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)
68+
});
6769
<?php endif; ?>
6870

6971
});
7072
</script>
7173

7274
<?php $editBlock = $block->getLayout()->getBlock('adminhtml.user.edit'); ?>
73-
<?php if (is_object($editBlock)): ?>
75+
<?php if (is_object($editBlock)) : ?>
7476
<script type="text/x-magento-init">
7577
{
7678
"[data-role=delete-user]" : {

0 commit comments

Comments
 (0)