Magento 1.9.4.4 code changes

JeroenBoersma · JeroenBoersma · commit 9e443ccb2167 · 2020-01-29T12:42:38.000+01:00
diff --git a/app/Mage.php b/app/Mage.php
@@ -174,7 +174,7 @@ public static function getVersionInfo()
             'major'     => '1',
             'minor'     => '9',
             'revision'  => '4',
-            'patch'     => '3',
+            'patch'     => '4',
             'stability' => '',
             'number'    => '',
         );
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
@@ -55,7 +55,10 @@ protected function _prepareLayout()
 
         $this->getUploader()->getUploaderConfig()
             ->setFileParameterName('image')
-            ->setTarget(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl('*/catalog_product_gallery/upload'));
+            ->setTarget(Mage::getModel('adminhtml/url')->addSessionParam()->getUrl(
+                '*/catalog_product_gallery/upload',
+                array('_query' => false)
+            ));
 
         $browseConfig = $this->getUploader()->getButtonConfig();
         $browseConfig
diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php b/app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
@@ -44,7 +44,10 @@ public function __construct()
         $this->getUploaderConfig()
             ->setFileParameterName('image')
             ->setTarget(
-                Mage::getModel('adminhtml/url')->addSessionParam()->getUrl('*/*/upload', array('type' => $type))
+                Mage::getModel('adminhtml/url')->addSessionParam()->getUrl(
+                    '*/*/upload',
+                    array('type' => $type, '_query' => false)
+                )
             );
         $this->getButtonConfig()
             ->setAttributes(array(
diff --git a/app/code/core/Mage/Compiler/Block/Process.php b/app/code/core/Mage/Compiler/Block/Process.php
@@ -66,24 +66,24 @@ protected function _prepareLayout()
             $this->getLayout()->createBlock('adminhtml/widget_button')
                 ->setData(array(
                     'label'     => Mage::helper('compiler')->__('Run Compilation Process'),
-                    'onclick'   => 'compilationForm.submit();',
+                    'onclick'   => 'buttonDisabler(event); compilationForm.submit();',
                     'class'     => 'save'
         )));
 
-        if (defined('COMPILER_INCLUDE_PATH')) {
+        if (!$this->_process->isConstNotDefineInFile()) {
             $this->setChild('change_status_button',
                 $this->getLayout()->createBlock('adminhtml/widget_button')
                     ->setData(array(
                         'label'     => Mage::helper('compiler')->__('Disable'),
-                        'onclick' => 'setLocation(\'' . $this->getUrl('*/compiler_process/disable') . '\')',
+                        'onclick' => 'buttonDisabler(event); setLocation(\'' . $this->getUrl('*/compiler_process/disable') . '\')',
                         'class'     => 'save'
             )));
         } else {
             $this->setChild('change_status_button',
                 $this->getLayout()->createBlock('adminhtml/widget_button')
                     ->setData(array(
                         'label'     => Mage::helper('compiler')->__('Enable'),
-                        'onclick' => 'setLocation(\'' . $this->getUrl('*/compiler_process/enable') . '\')',
+                        'onclick' => 'buttonDisabler(event); setLocation(\'' . $this->getUrl('*/compiler_process/enable') . '\')',
                         'class'     => 'save'
             )));
         }
@@ -174,7 +174,7 @@ public function getCompilerState()
 
     public function getCompilerStatus()
     {
-        if (defined('COMPILER_INCLUDE_PATH')) {
+        if (!$this->_process->isConstNotDefineInFile()) {
             return $this->__('Enabled');
         } else {
             return $this->__('Disabled');
diff --git a/app/code/core/Mage/Compiler/Model/Process.php b/app/code/core/Mage/Compiler/Model/Process.php
@@ -394,7 +394,6 @@ protected function _getClassesSourceCode($classes, $scope)
 
     public function clear()
     {
-        $this->registerIncludePath(false);
         if (is_dir($this->_includeDir)) {
             mageDelTree($this->_includeDir);
         }
@@ -410,7 +409,6 @@ public function run()
     {
         $this->_collectFiles();
         $this->_compileFiles();
-        $this->registerIncludePath();
         return $this;
 
     }
@@ -423,7 +421,7 @@ public function run()
      */
     public function registerIncludePath($flag = true)
     {
-        $file = $this->_compileDir.DS.'config.php';
+        $file = $this->getConfigFilePath();
         if (is_writeable($file)) {
             $content = file_get_contents($file);
             $content = explode("\n", $content);
@@ -452,11 +450,38 @@ public function validate()
         if (!is_writeable($this->_compileDir)) {
             $result[] = Mage::helper('compiler')->__('Directory "%s" must be writeable', $this->_compileDir);
         }
-        $file = $this->_compileDir.DS.'config.php';
+        $file = $this->getConfigFilePath();
         if (!is_writeable($file)) {
             $result[] = Mage::helper('compiler')->__('File "%s" must be writeable', $file);
         }
         return $result;
     }
 
+    /**
+     * Check if constant has been defined in file
+     *
+     * @return bool
+     */
+    public function isConstNotDefineInFile()
+    {
+        $file = $this->getConfigFilePath();
+        if (is_writeable($file)) {
+            foreach (file($file) as $line) {
+                if (stristr($line, 'COMPILER_INCLUDE_PATH')) {
+                    return (bool) stristr($line, '#');
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Return config file path
+     *
+     * @return string
+     */
+    public function getConfigFilePath()
+    {
+        return $this->_compileDir . DS . 'config.php';
+    }
 }
diff --git a/app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php b/app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php
@@ -83,16 +83,23 @@ public function recompileAction()
         /**
          * Add redirect heades before clear compiled sources
          */
-        if (defined('COMPILER_INCLUDE_PATH')) {
+        if ($this->_getCompiler()->isConstNotDefineInFile()) {
+            if (defined('COMPILER_INCLUDE_PATH') !== false) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('compiler')->__('Operation in progress. Please try later')
+                );
+                $this->_redirect('*/*/');
+            } else {
+                $this->_getCompiler()->clear();
+                $this->_redirect('*/*/run');
+                $this->getResponse()->sendHeaders();
+                exit;
+            }
+        } else {
             Mage::getSingleton('adminhtml/session')->addError(
                 Mage::helper('compiler')->__('Please, press disable button before run compilation process')
             );
             $this->_redirect('*/*/');
-        } else {
-            $this->_redirect('*/*/run');
-            $this->_getCompiler()->clear();
-            $this->getResponse()->sendHeaders();
-            exit;
         }
     }
 
diff --git a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
@@ -50,9 +50,9 @@ class Mage_Core_Model_Input_Filter_MaliciousCode implements Zend_Filter_Interfac
         //js in the style attribute
         '/style=[^<]*((expression\s*?\([^<]*?\))|(behavior\s*:))[^<]*(?=\>)/Uis',
         //js attributes
-        '/(ondblclick|onclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onload|onunload|onerror|onanimationstart)\s*=[^>]*(?=\>)/Uis',
+        '/(ondblclick|onclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onload|onunload|onerror|onanimationstart|onfocus|onloadstart|ontoggle)\s*=[^>]*(?=\>)/Uis',
         //tags
-        '/<\/?(script|meta|link|frame|iframe).*>/Uis',
+        '/<\/?(script|meta|link|frame|iframe|object).*>/Uis',
         //base64 usage
         '/src\s*=[^<]*base64[^<]*(?=\>)/Uis',
         //data attribute
diff --git a/app/design/adminhtml/default/default/template/forgotpassword.phtml b/app/design/adminhtml/default/default/template/forgotpassword.phtml
@@ -28,6 +28,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex, nofollow" />
     <title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page'); ?></title>
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css'); ?>" media="all" />
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css'); ?>" media="all" />
diff --git a/app/design/adminhtml/default/default/template/login.phtml b/app/design/adminhtml/default/default/template/login.phtml
@@ -28,6 +28,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex, nofollow" />
     <title><?php echo Mage::helper('adminhtml')->__('Log into Magento Admin Page') ?></title>
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css') ?>" media="all" />
     <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css') ?>" media="all" />
diff --git a/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml b/app/design/adminhtml/default/default/template/resetforgottenpassword.phtml
@@ -28,6 +28,7 @@
 <html lang="en">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+        <meta name="robots" content="noindex, nofollow" />
         <title><?php echo Mage::helper('adminhtml')->__('Reset a Password'); ?></title>
         <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('reset.css'); ?>" media="all" />
         <link type="text/css" rel="stylesheet" href="<?php echo $this->getSkinUrl('boxes.css'); ?>" media="all" />
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Set/Main.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Set/Main.php
@@ -95,6 +95,7 @@ public function moveAttribute(array $attributeData, $attributeGroup = 'General')
         $attribute = $this->_rootElement->find($attributeLocator, Locator::SELECTOR_XPATH);
         $attribute->click();
         $target = $this->_rootElement->find(sprintf($this->groups, $attributeGroup), Locator::SELECTOR_XPATH);
+        $this->browser->refresh();
         $attribute->dragAndDrop($target);
     }
 
diff --git a/dev/tests/functional/tests/app/Mage/Checkout/Test/TestCase/OnePageCheckoutWithinOnlineShippingMethods.xml b/dev/tests/functional/tests/app/Mage/Checkout/Test/TestCase/OnePageCheckoutWithinOnlineShippingMethods.xml
@@ -89,9 +89,9 @@
             <constraint name="Mage\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
         </variation>
         <variation name="OnePageCheckoutWithinOnlineShippingMethodsVariation6" firstConstraint="Mage\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" method="test">
-            <data name="description" xsi:type="string">FedEx shipping from US to UK</data>
+            <data name="description" xsi:type="string">FedEx shipping from US to DE</data>
             <data name="customer/dataset" xsi:type="string">default_frontend</data>
-            <data name="billingAddress/dataset" xsi:type="string">customer_UK</data>
+            <data name="billingAddress/dataset" xsi:type="string">customer_DE</data>
             <data name="checkoutMethod" xsi:type="string">guest</data>
             <data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
             <data name="shipping/shipping_method" xsi:type="string">International Economy</data>
diff --git a/dev/tests/functional/tests/app/Mage/Customer/Test/TestCase/ChangeCustomerPasswordTest.php b/dev/tests/functional/tests/app/Mage/Customer/Test/TestCase/ChangeCustomerPasswordTest.php
@@ -121,5 +121,26 @@ public function test(Customer $initialCustomer, Customer $customer)
         $this->customerAccountIndex->getInfoBlock()->openChangePassword();
         $this->customerAccountEdit->getAccountInfoForm()->fill($customer);
         $this->customerAccountEdit->getAccountInfoForm()->submit();
+        $this->cmsIndex->getTopLinksBlock()->openAccount();
+        if (
+            !$this->customerAccountIndex->getMessagesBlock()->isVisibleMessage('success')
+            && $this->cmsIndex->getLinksBlock()->isLinkVisible('Log In')
+        ) {
+            $fixtureFactory = $this->objectManager->create('Magento\Mtf\Fixture\FixtureFactory');
+            $customer = $fixtureFactory->createByCode(
+                'customer',
+                [
+                    'data' => [
+                        'email' => $initialCustomer->getEmail(),
+                        'password' => $customer->getPassword(),
+                        'password_confirmation' => $customer->getPassword(),
+                    ],
+                ]
+            );
+            $this->objectManager->create(
+                'Mage\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
+                ['customer' => $customer]
+            )->run();
+        }
     }
 }
diff --git a/downloader/Maged/Controller.php b/downloader/Maged/Controller.php
@@ -1077,7 +1077,7 @@ public static function getVersionInfo()
             'major'     => '1',
             'minor'     => '9',
             'revision'  => '4',
-            'patch'     => '3',
+            'patch'     => '4',
             'stability' => '',
             'number'    => '',
         );
diff --git a/downloader/lib/Mage/Connect/Package.php b/downloader/lib/Mage/Connect/Package.php
@@ -605,7 +605,7 @@ public function checkPhpDependencies()
         foreach($this->getDependencyPhpExtensions() as $dep)
         {
             if(!extension_loaded($dep['name'])) {
-                $errors[] = $dep;
+                $errors[] = $dep['name'];
             }
         }
         if(count($errors)) {
diff --git a/js/varien/js.js b/js/varien/js.js
@@ -770,3 +770,9 @@ function customFormSubmitToParent(url, parametersArray, method) {
         }
     });
 }
+
+function buttonDisabler() {
+    const buttons = document.querySelectorAll('button.save');
+    buttons.forEach(button => button.disabled = true);
+}
+
diff --git a/lib/Mage/Connect/Command/Install.php b/lib/Mage/Connect/Command/Install.php
@@ -273,8 +273,8 @@ public function doInstall($command, $options, $params, $objects = array())
 
 
                     $conflicts = $package->checkPhpDependencies();
-                    if(true !== $conflicts) {                       
-                        $confilcts = implode(",",$conflicts);
+                    if(true !== $conflicts) {
+                        $conflicts = implode(",", $conflicts);
                         $err = "Package {$pChan}/{$pName} {$pVer} depends on PHP extensions: ".$conflicts;
                         if($forceMode) {
                             $this->doError($command, $err);
diff --git a/lib/Mage/Connect/Package.php b/lib/Mage/Connect/Package.php
@@ -768,7 +768,7 @@ public function checkPhpDependencies()
         foreach($this->getDependencyPhpExtensions() as $dep)
         {
             if(!extension_loaded($dep['name'])) {
-                $errors[] = $dep;
+                $errors[] = $dep['name'];
             }
         }
         if(count($errors)) {
