Merge remote-tracking branch 'arcticfoxes/MAGETWO-99295' into MAGETWO-56443

Author: Joan He

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

@@ -4,24 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
+/** @var $block \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport */
 ?>
 <div class="import-export-tax-rates">
-    <?php if (!$block->getIsReadonly()): ?>
+    <?php if (!$block->getIsReadonly()) :?>
     <div class="import-tax-rates">
-        <?php if ($block->getUseContainer()): ?>
-        <form id="import-form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
+        <?php if ($block->getUseContainer()) :?>
+        <form id="import-form"
+              class="admin__fieldset"
+              action="<?= $block->escapeUrl($block->getUrl('tax/rate/importPost')) ?>"
+              method="post"
+              enctype="multipart/form-data">
         <?php endif; ?>
             <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <label for="import_rates_file" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Tax Rates') ?></span></label>
+                <label for="import_rates_file" class="admin__field-label"><span><?= $block->escapeHtml(__('Import Tax Rates')) ?></span></label>
                 <div class="admin__field-control">
-                    <input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
+                    <input type="file"
+                           id="import_rates_file"
+                           name="import_rates_file"
+                           class="input-file required-entry"/>
                     <?= $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
                 </div>
             </div>
-        <?php if ($block->getUseContainer()): ?>
+        <?php if ($block->getUseContainer()) :?>
         </form>
         <?php endif; ?>
         <script>
@@ -44,18 +50,22 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
 </script>
     </div>
     <?php endif; ?>
-    <div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
-        <?php if ($block->getUseContainer()): ?>
-        <form id="export_form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
+    <div class="export-tax-rates <?= ($block->getIsReadonly()) ? 'box-left' : 'box-right' ?>">
+        <?php if ($block->getUseContainer()) :?>
+        <form id="export_form"
+              class="admin__fieldset"
+              action="<?= $block->escapeUrl($block->getUrl('tax/rate/exportPost')) ?>"
+              method="post"
+              enctype="multipart/form-data">
         <?php endif; ?>
             <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <span class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Export Tax Rates') ?></span></span>
+                <span class="admin__field-label"><span><?= $block->escapeHtml(__('Export Tax Rates')) ?></span></span>
                 <div class="admin__field-control">
                     <?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
                 </div>
             </div>
-        <?php if ($block->getUseContainer()): ?>
+        <?php if ($block->getUseContainer()) :?>
         </form>
         <?php endif; ?>
     </div>