Merge remote-tracking branch 'mainline/develop' into falcons-develop

Author: Bohdan Korablov

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -395,7 +395,8 @@ protected function _getWebsiteCode($websiteId)
     {
         $storeName = ($websiteId == 0)
             ? ImportAdvancedPricing::VALUE_ALL_WEBSITES
-            : $this->_storeManager->getWebsite($websiteId)->getName();
+            : $this->_storeManager->getWebsite($websiteId)->getCode();
+        $currencyCode = '';
         if ($websiteId == 0) {
             $currencyCode = $this->_storeManager->getWebsite($websiteId)->getBaseCurrencyCode();
         }

app/code/Magento/Authorizenet/Model/Source/Cctype.php

@@ -17,6 +17,6 @@ class Cctype extends PaymentCctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI', 'OT'];
+        return ['VI', 'MC', 'AE', 'DI'];
     }
 }

app/code/Magento/Backend/Block/Widget/Button.php

@@ -113,7 +113,7 @@ protected function _attributesToHtml($attributes)
             if ($attributeValue === null || $attributeValue == '') {
                 continue;
             }
-            $html .= $attributeKey . '="' . $this->escapeHtml($attributeValue) . '" ';
+            $html .= $attributeKey . '="' . $this->escapeHtmlAttr($attributeValue, false) . '" ';
         }
 
         return $html;

app/code/Magento/Backend/Block/Widget/Button/SplitButton.php

@@ -229,7 +229,7 @@ protected function _getAttributesString($attributes)
             if ($attributeValue === null || $attributeValue == '') {
                 continue;
             }
-            $html[] = $attributeKey . '="' . $this->escapeHtml($attributeValue) . '"';
+            $html[] = $attributeKey . '="' . $this->escapeHtmlAttr($attributeValue, false) . '"';
         }
         return join(' ', $html);
     }

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php

@@ -82,7 +82,9 @@ protected function _toOptionHtml($action, \Magento\Framework\DataObject $row)
         $actionCaption = '';
         $this->_transformActionData($action, $actionCaption, $row);
 
-        $htmlAttributes = ['value' => $this->escapeHtml($this->_jsonEncoder->encode($action))];
+        $htmlAttributes = [
+            'value' => $this->escapeHtmlAttr($this->_jsonEncoder->encode($action), false)
+        ];
         $actionAttributes->setData($htmlAttributes);
         return '<option ' . $actionAttributes->serialize() . '>' . $actionCaption . '</option>';
     }

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -54,7 +54,7 @@ protected function _construct()
     {
         parent::_construct();
 
-        $this->setErrorText($this->escapeJsQuote(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('Please select items.')));
 
         if (null !== $this->getOptions()) {
             foreach ($this->getOptions() as $optionId => $option) {

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -66,7 +66,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setErrorText($this->escapeJsQuote(__('Please select items.')));
+        $this->setErrorText($this->escapeHtml(__('Please select items.')));
     }
 
     /**

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -17,7 +17,7 @@
                     class="search-global-input"
                     id="search-global"
                     name="query"
-                    data-mage-init='<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()))?>'>
+                    data-mage-init='<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()) ?>'>
             <button
                 type="submit"
                 class="search-global-action"

app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml

@@ -147,8 +147,8 @@ require([
 
 //<![CDATA[
     backup = new AdminBackup();
-    backup.rollbackUrl = '<?php /* @escapeNotVerified */ echo $block->escapeJsQuote($rollbackUrl);?>';
-    backup.backupUrl = '<?php /* @escapeNotVerified */ echo $block->escapeJsQuote($backupUrl);?>';
+    backup.rollbackUrl = '<?php echo $block->escapeUrl($rollbackUrl); ?>';
+    backup.backupUrl = '<?php echo $block->escapeUrl($backupUrl); ?>';
 //]]>
 
 });

app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Block\Customer\PayPal;
+
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Framework\View\Element\Template;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Block\AbstractTokenRenderer;
+
+/**
+ * Class VaultTokenRenderer
+ */
+class VaultTokenRenderer extends AbstractTokenRenderer
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    public function __construct(
+        Template\Context $context,
+        Config $config,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIconUrl()
+    {
+        return $this->config->getPayPalIcon()['url'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIconHeight()
+    {
+        return $this->config->getPayPalIcon()['height'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getIconWidth()
+    {
+        return $this->config->getPayPalIcon()['width'];
+    }
+
+    /**
+     * Can render specified token
+     *
+     * @param PaymentTokenInterface $token
+     * @return boolean
+     */
+    public function canRender(PaymentTokenInterface $token)
+    {
+        return $token->getPaymentMethodCode() === ConfigProvider::PAYPAL_CODE;
+    }
+
+    /**
+     * Get email of PayPal payer
+     * @return string
+     */
+    public function getPayerEmail()
+    {
+        return $this->getTokenDetails()['payerEmail'];
+    }
+}