diff --git a/.all-contributorsrc b/.all-contributorsrc
index e2ce8b9ae93..179d7a6b63a 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1382,6 +1382,33 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "gorbunovav",
+ "name": "Andrey Gorbunov",
+ "avatar_url": "https://avatars.githubusercontent.com/u/2665015?v=4",
+ "profile": "https://github.com/gorbunovav",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Tomasz-Silpion",
+ "name": "Tomasz Gregorczyk",
+ "avatar_url": "https://avatars.githubusercontent.com/u/5328659?v=4",
+ "profile": "https://github.com/Tomasz-Silpion",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Judx",
+ "name": "Juho Hölsä",
+ "avatar_url": "https://avatars.githubusercontent.com/u/15036353?v=4",
+ "profile": "https://juhoholsa.com/",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7
diff --git a/.ddev/commands/web/openmage-admin b/.ddev/commands/web/openmage-admin
new file mode 100644
index 00000000000..9e730942ba3
--- /dev/null
+++ b/.ddev/commands/web/openmage-admin
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+## ProjectTypes: magento
+## Description: Create/Update OpenMage Administrator Account
+## Usage: openmage-admin
+## Example: ddev openmage-admin
+
+read -r -p "Choose your action for the administrator account [Create/Update]: " ACTION
+ACTION=${ACTION,,} # to lower
+
+if [[ "${ACTION}" =~ ^(update|u) || "${ACTION}" =~ ^(create|c) ]]; then
+ read -r -p "Admin User [admin]: " ADMIN_USER
+ ADMIN_USER=${ADMIN_USER:-admin}
+ read -r -p "Admin Firstname [OpenMage]: " ADMIN_FIRSTNAME
+ ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-OpenMage}
+ read -r -p "Admin Lastname [Administrator]: " ADMIN_LASTNAME
+ ADMIN_LASTNAME=${ADMIN_LASTNAME:-Administrator}
+ read -r -p "Admin Email [admin@example.com]: " ADMIN_EMAIL
+ ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
+ read -r -p "Admin Password [veryl0ngpassw0rd]: " ADMIN_PASSWORD
+ ADMIN_PASSWORD=${ADMIN_PASSWORD:-veryl0ngpassw0rd}
+ read -r -p "Table Prefix []: " TABLE_PREFIX
+ TABLE_PREFIX=${TABLE_PREFIX:-}
+else
+ echo "Please run again and choose an action."
+ exit 1
+fi
+
+RANDOM_STRING=$({ tr -dc A-Za-z0-9 &2
+ ;;
+ *) # Default case: No more options, so break out of the loop.
+ break
+ esac
+
+ shift
+ done
+
+LOCALXML="${ROOT}/app/etc/local.xml"
+if [ -f "${LOCALXML}" ]; then
+ if [[ "${QUIET_INSTALL_FLAG}" ]]; then
+ DELETE='y'
+ else
+ read -r -p "OpenMage is already installed. Delete local.xml and drop the database? [y/N] " DELETE
+ DELETE=${DELETE,,} # to lower
+ fi
+
+ if [[ "${DELETE}" =~ ^(yes|y) ]]; then
+ mysql -u db -h db -e "DROP SCHEMA IF EXISTS db; CREATE SCHEMA db;";
+ rm "${LOCALXML}"
+ else
+ exit 1
+ fi
+fi
+
+# install sample data
+if [[ "${SAMPLE_DATA_FLAG}" ]]; then
+ INSTALL_SAMPLE_DATA='y'
+else
+ read -r -p "Install Sample Data? [y/N] " INSTALL_SAMPLE_DATA
+ INSTALL_SAMPLE_DATA=${INSTALL_SAMPLE_DATA,,} # to lower
+fi
+
+if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
+ SAMPLE_DATA_URL=https://github.com/Vinai/compressed-magento-sample-data/raw/master/compressed-magento-sample-data-1.9.2.4.tgz
+ SAMPLE_DATA_DIRECTORY="${ROOT}/.sampleData"
+ SAMPLE_DATA_FILE=sample_data.tgz
+
+ if [[ ! -d "${SAMPLE_DATA_DIRECTORY}" ]]; then
+ echo "Creating Sample Data directory..."
+ mkdir -p "${SAMPLE_DATA_DIRECTORY}"
+ fi
+
+ cd "${SAMPLE_DATA_DIRECTORY}" || exit
+ if [[ ! -f "${SAMPLE_DATA_DIRECTORY}/${SAMPLE_DATA_FILE}" ]]; then
+ echo "Downloading Sample Data..."
+ wget "${SAMPLE_DATA_URL}" -O "${SAMPLE_DATA_FILE}"
+ fi
+
+ echo "Uncompressing Sample Data..."
+ tar xf "${SAMPLE_DATA_FILE}"
+
+ echo "Copying Sample Data into the OpenMage directory..."
+ cp -r magento-sample-data-1.9.2.4/* "${ROOT}/"
+
+ echo "Importing Sample Data into the database..."
+ mysql -u db -h db db < "${SAMPLE_DATA_DIRECTORY}/magento-sample-data-1.9.2.4/magento_sample_data_for_1.9.2.4.sql"
+
+ # remove sample data
+ if [[ "${SAMPLE_DATA_KEEP_FLAG}" ]]; then
+ rm -rf $(
+ find . -maxdepth 1 -type f -name "*" ! -name "${SAMPLE_DATA_FILE}")
+ else
+ cd "${ROOT}" || exit
+ rm -rf "${SAMPLE_DATA_DIRECTORY}"
+ fi
+fi
+
+cd "${ROOT}" || exit
+
+if [[ "${USE_DEFAULT_FLAG}" ]]; then
+ ADMIN_USER='admin'
+ ADMIN_FIRSTNAME='OpenMage'
+ ADMIN_LASTNAME='Administrator'
+ ADMIN_EMAIL='admin@example.com'
+ ADMIN_PASSWORD='veryl0ngpassw0rd'
+ TABLE_PREFIX='om_'
+else
+ read -r -p "Admin User [admin]: " ADMIN_USER
+ ADMIN_USER=${ADMIN_USER:-admin}
+ read -r -p "Admin Firstname [OpenMage]: " ADMIN_FIRSTNAME
+ ADMIN_FIRSTNAME=${ADMIN_FIRSTNAME:-OpenMage}
+ read -r -p "Admin Lastname [Administrator]: " ADMIN_LASTNAME
+ ADMIN_LASTNAME=${ADMIN_LASTNAME:-Administrator}
+ read -r -p "Admin Email [admin@example.com]: " ADMIN_EMAIL
+ ADMIN_EMAIL=${ADMIN_EMAIL:-admin@example.com}
+ read -r -p "Admin Password [veryl0ngpassw0rd]: " ADMIN_PASSWORD
+ ADMIN_PASSWORD=${ADMIN_PASSWORD:-veryl0ngpassw0rd}
+ if [[ $INSTALL_SAMPLE_DATA =~ ^(yes|y) ]]; then
+ TABLE_PREFIX=''
+ else
+ read -r -e -i 'om_' -p "Table Prefix [om_]: " TABLE_PREFIX
+ fi
+fi
+
+php -f install.php -- \
+ --license_agreement_accepted 'yes' \
+ --locale 'en_US' \
+ --timezone 'America/New_York' \
+ --db_host 'db' \
+ --db_name 'db' \
+ --db_user 'db' \
+ --db_pass 'db' \
+ --db_prefix "${TABLE_PREFIX}" \
+ --url "${DDEV_PRIMARY_URL}" \
+ --use_rewrites 'yes' \
+ --use_secure 'yes' \
+ --secure_base_url "${DDEV_PRIMARY_URL}" \
+ --use_secure_admin 'yes' \
+ --admin_username "${ADMIN_USER}" \
+ --admin_lastname "${ADMIN_LASTNAME}" \
+ --admin_firstname "${ADMIN_FIRSTNAME}" \
+ --admin_email "${ADMIN_EMAIL}" \
+ --admin_password "${ADMIN_PASSWORD}" \
+ --session_save 'files' \
+ --admin_frontname 'admin' \
+ --backend_frontname 'admin' \
+ --default_currency 'USD' \
+ --enable_charts 'yes' \
+ --skip_url_validation 'yes'
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..a54ca6bcb41
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,37 @@
+# Make packagist / composer download smaller
+/.ddev export-ignore
+/.github export-ignore
+/dev export-ignore
+/docs export-ignore
+
+/.all-contributorsrc export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.gitpod.yml export-ignore
+
+/.php-cs-fixer.dist.php export-ignore
+/.phpcs.ecg.xml.dist export-ignore
+/.phpcs.php.xml.dist export-ignore
+/.phpcs.xml.dist export-ignore
+/.phpmd.dist.xml export-ignore
+/phpstan.dist.baseline.neon export-ignore
+/phpstan.dist.issues.neon export-ignore
+/phpstan.dist.neon export-ignore
+
+/README.md export-ignore
+
+# Enforce checkout with linux lf consistent over all platforms
+*.html text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.php text eol=lf
+*.md text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.xml text eol=lf
+*.sh text eol=lf
+*.sql text eol=lf
+*.svg text eol=lf
+*.txt text eol=lf
+*.phtml text eol=lf
\ No newline at end of file
diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml
index ac14aa845bc..e4e2b1ba150 100644
--- a/.github/workflows/check-files.yml
+++ b/.github/workflows/check-files.yml
@@ -41,16 +41,16 @@ jobs:
name: Changed
runs-on: [ubuntu-latest]
outputs:
- composer: ${{ steps.all.outputs.composer }}
- php: ${{ steps.all.outputs.php }}
- xml: ${{ steps.all.outputs.xml }}
- workflow: ${{ steps.all.outputs.workflow }}
- phpcs: ${{ steps.all.outputs.phpcs }}
- php-cs-fixer: ${{ steps.all.outputs.php-cs-fixer }}
- phpstan: ${{ steps.all.outputs.phpstan }}
- phpunit-test: ${{ steps.all.outputs.phpunit-test }}
- phpunit: ${{ steps.all.outputs.phpunit }}
- sonar: ${{ steps.all.outputs.sonar }}
+ composer: ${{ steps.changes-composer.outputs.composer }}
+ php: ${{ steps.changes-php.outputs.php }}
+ xml: ${{ steps.changes-xml.outputs.xml }}
+ workflow: ${{ steps.changes-workflow.outputs.workflow }}
+ phpcs: ${{ steps.changes-phpcs.outputs.phpcs }}
+ php-cs-fixer: ${{ steps.changes-php-cs-fixer.outputs.php-cs-fixer }}
+ phpstan: ${{ steps.changes-phpstan.outputs.phpstan }}
+ phpunit-test: ${{ steps.changes-phpunit-test.outputs.phpunit-test }}
+ phpunit: ${{ steps.changes-phpunit.outputs.phpunit }}
+ sonar: ${{ steps.changes-sonar.outputs.sonar }}
steps:
- name: Checkout code
@@ -71,7 +71,7 @@ jobs:
- name: Get changed files
id: changed-files-specific
- uses: tj-actions/changed-files@v35
+ uses: tj-actions/changed-files@v37
with:
files: |
composer.*
@@ -86,8 +86,8 @@ jobs:
dev/phpunit*
dev/sonar*
- - name: Run step if any file(s) changed
- id: all
+ - name: Check if composer files changed
+ id: changes-composer
if: steps.changed-files-specific.outputs.any_modified == 'true'
run: |
echo "One or more files have changed."
@@ -96,38 +96,74 @@ jobs:
echo "$count Composer file(s) changed"
echo "composer=$count" >> $GITHUB_OUTPUT
+ - name: Check if PHP files changed
+ id: changes-php
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "*.php" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count PHP file(s) changed"
echo "php=$count" >> $GITHUB_OUTPUT
+ - name: Check if XML files changed
+ id: changes-xml
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "*.xml" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count XML file(s) changed"
echo "xml=$count" >> $GITHUB_OUTPUT
+ - name: Check if Workflow files changed
+ id: changes-workflow
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE ".github/workflows/**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count Workflow file(s) changed"
echo "workflow=$count" >> $GITHUB_OUTPUT
+ - name: Check if PHPCS test files changed
+ id: changes-phpcs
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "**phpcs**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count PHPCS file(s) changed"
echo "phpcs=$count" >> $GITHUB_OUTPUT
+ - name: Check if PHP-CS-Fixer files changed
+ id: changes-php-cs-fixer
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "**php-cs-fixer**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count PHP-CS-Fixer file(s) changed"
echo "php-cs-fixer=$count" >> $GITHUB_OUTPUT
+ - name: Check if PHPStan files changed
+ id: changes-phpstan
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "**phpstan**" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count PHPStan file(s) changed"
echo "phpstan=$count" >> $GITHUB_OUTPUT
+ - name: Check if PHPUnit test files changed
+ id: changes-phpunit-test
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "dev/tests/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count UnitTest test file(s) changed"
echo "phpunit-test=$count" >> $GITHUB_OUTPUT
+ - name: Check if PHPUnit files changed
+ id: changes-phpunit
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "dev/phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
- echo "$count UnitTest file(s) changed"
+ echo "$count PHPUnit file(s) changed"
echo "phpunit=$count" >> $GITHUB_OUTPUT
+ - name: Check if Sonar files changed
+ id: changes-sonar
+ if: steps.changed-files-specific.outputs.any_modified == 'true'
+ run: |
count="$(grep -oE "dev/sonar*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
echo "$count Sonar file(s) changed"
echo "sonar=$count" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 9e3441786aa..5c545d8d4b1 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -48,7 +48,7 @@ jobs:
run: bash ./run_unit_tests.sh
- name: Publish Unit Test Results
- uses: EnricoMi/publish-unit-test-result-action@v1.40
+ uses: EnricoMi/publish-unit-test-result-action@v2.7
if: always()
continue-on-error: true
with:
diff --git a/.htaccess b/.htaccess
index 9a9d3b18db0..074758ad18f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -40,6 +40,34 @@
+############################################
+## php8 settings
+
+
+
+############################################
+## adjust max execution time
+
+ php_value max_execution_time 18000
+
+############################################
+## disable automatic session start
+## before autoload was initialized
+
+ php_flag session.auto_start off
+
+############################################
+## enable resulting html compression
+
+ #php_flag zlib.output_compression on
+
+###########################################
+# disable user agent verification to not break multiple image upload
+
+ php_flag suhosin.session.cryptua off
+
+
+
###########################################
# disable POST processing to not break multiple image upload
@@ -219,7 +247,7 @@
Order allow,deny
Deny from all
-
+
Order allow,deny
Deny from all
diff --git a/README.md b/README.md
index a6064770893..be166af2e08 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,7 @@ git init
git remote add origin https://github.com//magento-lts
git pull origin main
git remote add upstream https://github.com/OpenMage/magento-lts
-git pull upstream 1.9.4.x
+git pull upstream main
git add -A && git commit
```
@@ -264,6 +264,8 @@ not compatible with the new implementations made by ZF1-Future, which is much mo
This may generate a problem with `Zend_Db_Select' statements that do not use 'Zend_Db_Expr' to quote expressions.
If you see SQL errors after upgrading please remember to check for this specific issue in your code.
+UPS shut down their old CGI APIs so we removed the support for it from the Mage_Usa module.
+
### New Config Options
- `admin/design/use_legacy_theme`
diff --git a/app/Mage.php b/app/Mage.php
index 7e3e58afe5c..e61add57ceb 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -217,7 +217,7 @@ public static function getOpenMageVersionInfo(): array
'major' => '20',
'minor' => '1',
'patch' => '0',
- 'stability' => 'rc4', // beta,alpha,rc
+ 'stability' => 'rc7', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
];
}
@@ -226,7 +226,7 @@ public static function getOpenMageVersionInfo(): array
'major' => '19',
'minor' => '5',
'patch' => '0',
- 'stability' => 'rc4', // beta,alpha,rc
+ 'stability' => 'rc7', // beta,alpha,rc
'number' => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9
];
}
@@ -871,7 +871,7 @@ public static function log($message, $level = null, $file = '', $forceLog = fals
$level = is_null($level) ? Zend_Log::DEBUG : $level;
- if (!self::$_isDeveloperMode && $level > $maxLogLevel) {
+ if (!self::$_isDeveloperMode && $level > $maxLogLevel && !$forceLog) {
return;
}
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
index 256c104c1c3..1202e42ab08 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
@@ -73,15 +73,13 @@ protected function _beforeToHtml()
'url' => $this->getUrl('*/*/wishlist', ['_current' => true]),
]);
- if (Mage::helper('core')->isModuleOutputEnabled('Mage_Newsletter')) {
+ if (Mage::helper('core')->isModuleOutputEnabled('Mage_Newsletter') && Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber')) {
/** @var Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter $block */
$block = $this->getLayout()->createBlock('adminhtml/customer_edit_tab_newsletter');
- if (Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber')) {
- $this->addTab('newsletter', [
- 'label' => Mage::helper('customer')->__('Newsletter'),
- 'content' => $block->initForm()->toHtml()
- ]);
- }
+ $this->addTab('newsletter', [
+ 'label' => Mage::helper('customer')->__('Newsletter'),
+ 'content' => $block->initForm()->toHtml()
+ ]);
}
if (Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings')) {
@@ -92,7 +90,7 @@ protected function _beforeToHtml()
]);
}
- if (Mage::getSingleton('admin/session')->isAllowed('catalog/tag')) {
+ if (Mage::helper('core')->isModuleEnabled('Mage_Tag') && Mage::getSingleton('admin/session')->isAllowed('catalog/tag')) {
$this->addTab('tags', [
'label' => Mage::helper('customer')->__('Product Tags'),
'class' => 'ajax',
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
index d7f8eea89b2..45ad6efa19a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -412,7 +412,7 @@ public function addGrandTotals($total)
* recalc totals if we have average
*/
foreach ($this->getColumns() as $key => $_column) {
- if (strpos($_column->getTotal(), '/') !== false) {
+ if (str_contains($_column->getTotal(), '/')) {
list($t1, $t2) = explode('/', $_column->getTotal());
if ($this->getGrandTotals()->getData($t2) != 0) {
$this->getGrandTotals()->setData(
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php
index 4c1185937b3..afe3f9914cd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Account.php
@@ -125,7 +125,7 @@ public function getFormValues()
{
$data = $this->getCustomer()->getData();
foreach ($this->getQuote()->getData() as $key => $value) {
- if (strpos($key, 'customer_') === 0) {
+ if (str_starts_with($key, 'customer_')) {
$data[substr($key, 9)] = $value;
}
}
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
index f449c0ee0bd..38ae307abaa 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php
@@ -78,7 +78,7 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$html .= '';
if ($addInheritCheckbox) {
- $defText = $element->getDefaultValue();
+ $defText = (string)$element->getDefaultValue();
if ($options) {
$defTextArr = [];
foreach ($options as $k => $v) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index 3fbed459334..fb0b747def3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -195,7 +195,7 @@ public function getButtonsHtml($area = null)
if ($this->_buttonsHtml === null) {
$this->_buttonsHtml = parent::getButtonsHtml();
foreach ($this->_children as $alias => $child) {
- if (strpos($alias, '_button') !== false) {
+ if (str_contains($alias, '_button')) {
$this->unsetChild($alias);
}
}
diff --git a/app/code/core/Mage/Adminhtml/Helper/Js.php b/app/code/core/Mage/Adminhtml/Helper/Js.php
index bee3773a843..e48803d9955 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Js.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Js.php
@@ -43,7 +43,7 @@ class Mage_Adminhtml_Helper_Js extends Mage_Core_Helper_Js
*/
public function decodeGridSerializedInput($encoded)
{
- $isSimplified = (strpos($encoded, '=') === false);
+ $isSimplified = !str_contains($encoded, '=');
$result = [];
parse_str($encoded, $decoded);
foreach ($decoded as $key => $value) {
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
index 8a665aad9f1..19b4ff2f398 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
@@ -903,7 +903,7 @@ protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalO
foreach (explode("\n", $additionalOptions) as $_additionalOption) {
if (strlen(trim($_additionalOption))) {
try {
- if (strpos($_additionalOption, ':') === false) {
+ if (!str_contains($_additionalOption, ':')) {
Mage::throwException(
Mage::helper('adminhtml')->__('There is an error in one of the option rows.')
);
diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
index 7b0de5a7f17..6c0a7539878 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php
@@ -121,8 +121,8 @@ public function deleteFilesAction()
foreach ($files as $file) {
$file = $helper->idDecode($file);
$_filePath = realpath($path . DS . $file);
- if (strpos($_filePath, realpath($path)) === 0 &&
- strpos($_filePath, realpath($helper->getStorageRoot())) === 0
+ if (str_starts_with($_filePath, realpath($path)) &&
+ str_starts_with($_filePath, realpath($helper->getStorageRoot()))
) {
$this->getStorage()->deleteFile($path . DS . $file);
}
diff --git a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
index c0f2c4b9a16..2868dd1fc3d 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Report/StatisticsController.php
@@ -87,7 +87,7 @@ protected function _getCollectionNames()
throw new Exception(Mage::helper('adminhtml')->__('No report code specified.'));
}
- if (!is_array($codes) && strpos($codes, ',') === false) {
+ if (!is_array($codes) && !str_contains($codes, ',')) {
$codes = [$codes];
} elseif (!is_array($codes)) {
$codes = explode(',', $codes);
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
index 18b9056d648..783a913fe29 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/Convert/GuiController.php
@@ -118,7 +118,7 @@ public function uploadPostAction()
public function downloadAction()
{
$filename = $this->getRequest()->getParam('filename');
- if (!$filename || strpos($filename, '..') !== false || $filename[0] === '.') {
+ if (!$filename || str_contains($filename, '..') || $filename[0] === '.') {
return;
}
$this->_initProfile();
diff --git a/app/code/core/Mage/Api/Model/Server/V2/Handler.php b/app/code/core/Mage/Api/Model/Server/V2/Handler.php
index 28ef615e8aa..ff6b769c275 100644
--- a/app/code/core/Mage/Api/Model/Server/V2/Handler.php
+++ b/app/code/core/Mage/Api/Model/Server/V2/Handler.php
@@ -38,7 +38,7 @@ public function __call($function, $args)
$nodes = Mage::getSingleton('api/config')->getNode('v2/resources_function_prefix')->children();
foreach ($nodes as $resource => $prefix) {
$prefix = $prefix->asArray();
- if (strpos($function, $prefix) !== false) {
+ if (str_contains($function, $prefix)) {
$method = substr($function, strlen($prefix));
$apiKey = $resource . '.' . strtolower($method[0]) . substr($method, 1);
}
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
index ef64e02b048..4ec44b03f63 100644
--- a/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Handler.php
@@ -52,7 +52,7 @@ public function __call($function, $args)
$nodes = Mage::getSingleton('api/config')->getNode('v2/resources_function_prefix')->children();
foreach ($nodes as $resource => $prefix) {
$prefix = $prefix->asArray();
- if (strpos($function, $prefix) !== false) {
+ if (str_contains($function, $prefix)) {
$method = substr($function, strlen($prefix));
$apiKey = $resource . '.' . strtolower($method[0]) . substr($method, 1);
}
diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
index 73c4c4b315a..9cbb491d8fc 100644
--- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
+++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
@@ -157,18 +157,6 @@ public function getAttributes($source, $namespace = null)
return $attributes;
}
- /**
- * @deprecated due to conflict with PHP8 parent class update
- * @param Varien_Simplexml_Element $source
- * @return array
- */
- #[\ReturnTypeWillChange]
- public function getChildren($source = null)
- {
- Mage::log('Use of deprecated method: ' . __METHOD__);
- return self::_getChildren($source);
- }
-
/**
* Return children of all namespaces
*
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
index 29cdb2bda96..3f9b8b5e670 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
@@ -183,10 +183,10 @@ public function getPostResources()
$prefixPrivilege = self::NAME_PRIVILEGE . self::ID_SEPARATOR;
$nameResource = null;
foreach ($checkedResources as $i => $item) {
- if (strpos($item, $prefixResource) === 0) {
+ if (str_starts_with($item, $prefixResource)) {
$nameResource = substr($item, mb_strlen($prefixResource, 'UTF-8'));
$resources[$nameResource] = [];
- } elseif (strpos($item, $prefixPrivilege) === 0) {
+ } elseif (str_starts_with($item, $prefixPrivilege)) {
$name = substr($item, mb_strlen($prefixPrivilege, 'UTF-8'));
$namePrivilege = str_replace($nameResource . self::ID_SEPARATOR, '', $name);
$resources[$nameResource][$namePrivilege] = $allow;
@@ -201,14 +201,14 @@ public function getPostResources()
$prefixAttribute = self::NAME_ATTRIBUTE . self::ID_SEPARATOR;
$nameResource = null;
foreach ($checkedResources as $i => $item) {
- if (strpos($item, $prefixResource) === 0) {
+ if (str_starts_with($item, $prefixResource)) {
$nameResource = substr($item, mb_strlen($prefixResource, 'UTF-8'));
$resources[$nameResource] = [];
- } elseif (strpos($item, $prefixOperation) === 0) {
+ } elseif (str_starts_with($item, $prefixOperation)) {
$name = substr($item, mb_strlen($prefixOperation, 'UTF-8'));
$operationName = str_replace($nameResource . self::ID_SEPARATOR, '', $name);
$resources[$nameResource][$operationName] = [];
- } elseif (strpos($item, $prefixAttribute) === 0) {
+ } elseif (str_starts_with($item, $prefixAttribute)) {
$name = substr($item, mb_strlen($prefixOperation, 'UTF-8'));
$attributeName = str_replace(
$nameResource . self::ID_SEPARATOR . $operationName . self::ID_SEPARATOR,
diff --git a/app/code/core/Mage/Captcha/etc/system.xml b/app/code/core/Mage/Captcha/etc/system.xml
index 38c1f167296..15ec9c723cd 100644
--- a/app/code/core/Mage/Captcha/etc/system.xml
+++ b/app/code/core/Mage/Captcha/etc/system.xml
@@ -79,7 +79,6 @@
- text610
diff --git a/app/code/core/Mage/Catalog/Helper/Product/View.php b/app/code/core/Mage/Catalog/Helper/Product/View.php
index 76bdab1b30e..8888f7aa287 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/View.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/View.php
@@ -118,7 +118,9 @@ public function prepareAndRender($productId, $controller, $params = null)
throw new Mage_Core_Exception($this->__('Product is not loaded'), $this->ERR_NO_PRODUCT_LOADED);
}
- $buyRequest = $params->getBuyRequest();
+ /** @see Mage_Checkout_CartController::_setProductBuyRequest() */
+ $checkoutBuyRequest = Mage::getSingleton('checkout/session')->getProductBuyRequest(true);
+ $buyRequest = $params->getBuyRequest() ?: $checkoutBuyRequest;
if ($buyRequest) {
$productHelper->prepareProductOptions($product, $buyRequest);
}
diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index cfc84f778b4..236853fdb8b 100644
--- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -32,7 +32,7 @@ class Mage_Catalog_Model_Attribute_Backend_Customlayoutupdate extends Mage_Eav_M
public function validate($object)
{
$attributeName = $this->getAttribute()->getName();
- $xml = trim($object->getData($attributeName));
+ $xml = trim((string)$object->getData($attributeName));
if (!$this->getAttribute()->getIsRequired() && empty($xml)) {
return true;
@@ -42,7 +42,7 @@ public function validate($object)
$validator = Mage::getModel('adminhtml/layoutUpdate_validator');
if (!$validator->isValid($xml)) {
$messages = $validator->getMessages();
- //Add first message to exception
+ // add first message to exception
$massage = array_shift($messages);
$eavExc = new Mage_Eav_Model_Entity_Attribute_Exception($massage);
$eavExc->setAttributeCode($attributeName);
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php
index 1de3778f97c..a56c4885759 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api.php
@@ -354,7 +354,7 @@ public function move($categoryId, $parentId, $afterId = null)
$afterId = array_pop(explode(',', $parentChildren));
}
- if (strpos($parent_category->getPath(), $category->getPath()) === 0) {
+ if (str_starts_with($parent_category->getPath(), $category->getPath())) {
$this->_fault('not_moved', "Operation do not allow to move a parent category to any of children category");
}
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index 531b5711b22..8ee2ab0b3ab 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -273,7 +273,7 @@ public function addImage(
$move = false,
$exclude = true
) {
- if (strpos($file, chr(0)) !== false
+ if (str_contains($file, chr(0))
|| preg_match('#(^|[\\\\/])\.\.($|[\\\\/])#', $file)
) {
throw new Exception('Detected malicious path or filename input.');
diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php
index 7a96b766332..2b55eb4720c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Image.php
@@ -251,14 +251,16 @@ protected function _getMemoryLimit()
$memoryLimit = "128M";
}
+ $value = (int)substr($memoryLimit, 0, -1);
+
if (substr($memoryLimit, -1) == 'K') {
- return substr($memoryLimit, 0, -1) * 1024;
+ return $value * 1024;
}
if (substr($memoryLimit, -1) == 'M') {
- return substr($memoryLimit, 0, -1) * 1024 * 1024;
+ return $value * 1024 * 1024;
}
if (substr($memoryLimit, -1) == 'G') {
- return substr($memoryLimit, 0, -1) * 1024 * 1024 * 1024;
+ return $value * 1024 * 1024 * 1024;
}
return $memoryLimit;
}
@@ -293,7 +295,7 @@ protected function _getNeedMemoryForFile($file = null)
$imageInfo = getimagesize($file);
- if (!isset($imageInfo[0]) || !isset($imageInfo[1])) {
+ if ($imageInfo === false) {
return 0;
}
if (!isset($imageInfo['channels'])) {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
index 7393ffe487a..ec0abf090e2 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Indexer/Flat.php
@@ -151,7 +151,7 @@ public function matchEvent(Mage_Index_Model_Event $event)
} else {
/** @var Mage_Core_Model_Store $store */
$store = $event->getDataObject();
- if ($store && $store->isObjectNew()) {
+ if ($store && ($store->isObjectNew() || $store->getOrigData('is_active') != $store->getIsActive() && $store->getIsActive())) {
$result = true;
} else {
$result = false;
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
index ecc2d56b521..7b8a2a94094 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
@@ -800,14 +800,14 @@ protected function _getBytesIniValue($ini_key)
{
$_bytes = @ini_get($ini_key);
- // kilobytes
if (stristr($_bytes, 'k')) {
+ // kilobytes
$_bytes = (int) $_bytes * 1024;
- // megabytes
} elseif (stristr($_bytes, 'm')) {
+ // megabytes
$_bytes = (int) $_bytes * 1024 * 1024;
- // gigabytes
} elseif (stristr($_bytes, 'g')) {
+ // gigabytes
$_bytes = (int) $_bytes * 1024 * 1024 * 1024;
}
return (int)$_bytes;
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
index 8256201bd8d..13d86cddb17 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
@@ -31,56 +31,56 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc
*
* @var int|null
*/
- protected $_storeId = null;
+ protected $_storeId = null;
/**
* Loaded
*
* @var bool
*/
- protected $_loaded = false;
+ protected $_loaded = false;
/**
* Nodes
*
* @var array
*/
- protected $_nodes = [];
+ protected $_nodes = [];
/**
* Columns
*
* @var array
*/
- protected $_columns = null;
+ protected $_columns = null;
/**
* Columns sql
*
* @var array
*/
- protected $_columnsSql = null;
+ protected $_columnsSql = null;
/**
* Attribute codes
*
* @var array
*/
- protected $_attributeCodes = null;
+ protected $_attributeCodes = null;
/**
* Inactive categories ids
*
* @var array
*/
- protected $_inactiveCategoryIds = null;
+ protected $_inactiveCategoryIds = null;
/**
* Store flag which defines if Catalog Category Flat Data has been initialized
*
* @var array
*/
- protected $_isBuilt = [];
+ protected $_isBuilt = [];
/**
* Store flag which defines if Catalog Category Flat Data has been initialized
@@ -89,7 +89,7 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc
*
* @var bool|null
*/
- protected $_isRebuilt = null;
+ protected $_isRebuilt = null;
/**
* array with root category id per store
@@ -103,7 +103,7 @@ class Mage_Catalog_Model_Resource_Category_Flat extends Mage_Index_Model_Resourc
*
* @var bool
*/
- protected $_allowTableChanges = true;
+ protected $_allowTableChanges = true;
/**
* Factory instance
@@ -658,7 +658,7 @@ protected function _getStaticColumns()
}
$_is_unsigned = '';
$ddlType = $helper->getDdlTypeByColumnType($column['DATA_TYPE']);
- $column['DEFAULT'] = trim($column['DEFAULT'], "' ");
+ $column['DEFAULT'] = empty($column['DEFAULT']) ? $column['DEFAULT'] : trim($column['DEFAULT'], "' ");
switch ($ddlType) {
case Varien_Db_Ddl_Table::TYPE_SMALLINT:
case Varien_Db_Ddl_Table::TYPE_INTEGER:
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
index 6390996e95a..5096858917f 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Layer/Filter/Price.php
@@ -112,7 +112,7 @@ protected function _getSelect($filter)
$wherePart = $select->getPart(Zend_Db_Select::WHERE);
$excludedWherePart = Mage_Catalog_Model_Resource_Product_Collection::MAIN_TABLE_ALIAS . '.status';
foreach ($wherePart as $key => $wherePartItem) {
- if (strpos($wherePartItem, $excludedWherePart) !== false) {
+ if (str_contains($wherePartItem, $excludedWherePart)) {
$wherePart[$key] = new Zend_Db_Expr('1=1');
continue;
}
@@ -121,7 +121,7 @@ protected function _getSelect($filter)
$select->setPart(Zend_Db_Select::WHERE, $wherePart);
$excludeJoinPart = Mage_Catalog_Model_Resource_Product_Collection::MAIN_TABLE_ALIAS . '.entity_id';
foreach ($priceIndexJoinConditions as $condition) {
- if (strpos($condition, $excludeJoinPart) !== false) {
+ if (str_contains($condition, $excludeJoinPart)) {
continue;
}
$select->where($this->_replaceTableAlias($condition));
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
index 7f0bdfa2eaa..eecb7aaacbe 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat/Indexer.php
@@ -1400,6 +1400,9 @@ protected function _arrayNextKey(array $array, $key)
public function reindexAll()
{
foreach (Mage::app()->getStores() as $storeId => $store) {
+ if (!$store->getIsActive()) {
+ continue;
+ }
$this->prepareFlatTable($storeId);
$this->beginTransaction();
try {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
index 7e647806129..e3c8175a4f8 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
@@ -228,7 +228,7 @@ protected function _prepareMultiselectIndex($entityIds = null, $attributeId = nu
$data = [];
$query = $select->query();
while ($row = $query->fetch()) {
- $values = array_unique(explode(',', $row['value']));
+ $values = empty($row['value']) ? [] : array_unique(explode(',', $row['value']));
foreach ($values as $valueId) {
if (isset($options[$row['attribute_id']][$valueId])) {
$data[] = [
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
index e446d7f1205..cdd021c708d 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
@@ -230,10 +230,10 @@ protected function _loadPrices()
$sortOrder = 1;
foreach ($this->_items as $item) {
$productAttribute = $item->getProductAttribute();
- $productAttributeCode = $productAttribute->getAttributeCode();
if (!($productAttribute instanceof Mage_Eav_Model_Entity_Attribute_Abstract)) {
continue;
}
+ $productAttributeCode = $productAttribute->getAttributeCode();
$options = $productAttribute->getFrontend()->getSelectOptions();
$optionsByValue = [];
diff --git a/app/code/core/Mage/Catalog/Model/Template/Filter.php b/app/code/core/Mage/Catalog/Model/Template/Filter.php
index e458eaf655f..d6f896dda05 100644
--- a/app/code/core/Mage/Catalog/Model/Template/Filter.php
+++ b/app/code/core/Mage/Catalog/Model/Template/Filter.php
@@ -104,7 +104,7 @@ public function storeDirective($construction)
$params['_query'] = [];
}
foreach ($params as $k => $v) {
- if (strpos($k, '_query_') === 0) {
+ if (str_starts_with($k, '_query_')) {
$params['_query'][substr($k, 7)] = $v;
unset($params[$k]);
}
diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php
index fc2f1615f05..6779d540eb5 100644
--- a/app/code/core/Mage/Catalog/Model/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Url.php
@@ -608,7 +608,7 @@ public function getUnusedPath($storeId, $requestPath, $idPath)
*/
public function getUnusedPathByUrlKey($storeId, $requestPath, $idPath, $urlKey)
{
- if (strpos($idPath, 'product') !== false) {
+ if (str_contains($idPath, 'product')) {
$suffix = $this->getProductUrlSuffix($storeId);
} else {
$suffix = $this->getCategoryUrlSuffix($storeId);
@@ -805,7 +805,7 @@ public function getProductRequestPath($product, $category)
* Check if existing request past can be used
*/
if ($product->getUrlKey() == '' && !empty($requestPath)
- && strpos($existingRequestPath, $requestPath) === 0
+ && str_starts_with($existingRequestPath, $requestPath)
) {
$existingRequestPath = preg_replace(
'/^' . preg_quote($requestPath, '/') . '/',
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index c82e4b05308..7f022660556 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -251,19 +251,20 @@ public function addAction()
} else {
$messages = array_unique(explode("\n", $e->getMessage()));
foreach ($messages as $message) {
- $this->_getSession()->addError(Mage::helper('core')->escapeHtml($message));
+ $this->_getSession()->addError(Mage::helper('core')->escapeHtml($message, ['em']));
}
}
$url = $this->_getSession()->getRedirectUrl(true);
if ($url) {
+ $this->_setProductBuyRequest();
$this->getResponse()->setRedirect($url);
} else {
$this->_redirectReferer(Mage::helper('checkout/cart')->getCartUrl());
}
} catch (Exception $e) {
+ $this->_setProductBuyRequest();
$this->_getSession()->addException($e, $this->__('Cannot add the item to shopping cart.'));
- Mage::logException($e);
$this->_goBack();
}
}
@@ -299,7 +300,6 @@ public function addgroupAction()
}
} catch (Exception $e) {
$this->_getSession()->addException($e, $this->__('Cannot add the item to shopping cart.'));
- Mage::logException($e);
$this->_goBack();
}
}
@@ -417,8 +417,8 @@ public function updateItemOptionsAction()
$this->_redirectReferer(Mage::helper('checkout/cart')->getCartUrl());
}
} catch (Exception $e) {
+ $this->_setProductBuyRequest();
$this->_getSession()->addException($e, $this->__('Cannot update the item.'));
- Mage::logException($e);
$this->_goBack();
}
$this->_redirect('*/*');
@@ -480,7 +480,6 @@ protected function _updateShoppingCart()
$this->_getSession()->addError(Mage::helper('core')->escapeHtml($e->getMessage()));
} catch (Exception $e) {
$this->_getSession()->addException($e, $this->__('Cannot update shopping cart.'));
- Mage::logException($e);
}
}
@@ -681,7 +680,7 @@ public function ajaxUpdateAction()
if ($qty == 0) {
$cart->removeItem($id);
} else {
- $quoteItem->setQty($qty)->save();
+ $quoteItem->setQty($qty);
}
$this->_getCart()->save();
@@ -715,4 +714,17 @@ protected function _getCustomerSession()
{
return Mage::getSingleton('customer/session');
}
+
+ /**
+ * Set product form data in checkout session for populating the product form
+ * in case of errors in add to cart process.
+ *
+ * @return void
+ */
+ protected function _setProductBuyRequest(): void
+ {
+ $buyRequest = $this->getRequest()->getPost();
+ $buyRequestObject = new Varien_Object($buyRequest);
+ $this->_getSession()->setProductBuyRequest($buyRequestObject);
+ }
}
diff --git a/app/code/core/Mage/Checkout/etc/system.xml b/app/code/core/Mage/Checkout/etc/system.xml
index 051cac86745..61e64a4b9cc 100644
--- a/app/code/core/Mage/Checkout/etc/system.xml
+++ b/app/code/core/Mage/Checkout/etc/system.xml
@@ -80,6 +80,7 @@
+ validate-not-negative-number111
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
index e2af8af723c..8340c4c2483 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
@@ -226,7 +226,7 @@ public function deleteDirectory($path)
$io->getFilteredPath($path)
));
}
- if (strpos($pathCmp, chr(0)) !== false
+ if (str_contains($pathCmp, chr(0))
|| preg_match('#(^|[\\\\/])\.\.($|[\\\\/])#', $pathCmp)
) {
throw new Exception('Detected malicious path or filename input.');
@@ -239,7 +239,7 @@ public function deleteDirectory($path)
Mage::throwException(Mage::helper('cms')->__('Cannot delete directory %s.', $io->getFilteredPath($path)));
}
- if (strpos($pathCmp, $rootCmp) === 0) {
+ if (str_starts_with($pathCmp, $rootCmp)) {
$io->rmdir($this->getThumbnailRoot() . DS . ltrim(substr($pathCmp, strlen($rootCmp)), '\\/'), true);
}
}
@@ -319,7 +319,7 @@ public function getThumbnailPath($filePath, $checkFile = false)
{
$mediaRootDir = $this->getHelper()->getStorageRoot();
- if (strpos($filePath, $mediaRootDir) === 0) {
+ if (str_starts_with($filePath, $mediaRootDir)) {
$thumbPath = $this->getThumbnailRoot() . DS . substr($filePath, strlen($mediaRootDir));
if (!$checkFile || is_readable($thumbPath)) {
@@ -340,7 +340,7 @@ public function getThumbnailPath($filePath, $checkFile = false)
public function getThumbnailUrl($filePath, $checkFile = false)
{
$mediaRootDir = Mage::getConfig()->getOptions()->getMediaDir() . DS;
- if (strpos($filePath, $mediaRootDir) === 0) {
+ if (str_starts_with($filePath, $mediaRootDir)) {
$thumbSuffix = self::THUMBS_DIRECTORY_NAME . DS . substr($filePath, strlen($mediaRootDir));
if (!$checkFile || is_readable($this->getHelper()->getStorageRoot() . $thumbSuffix)) {
$randomIndex = '?rand=' . time();
@@ -420,7 +420,7 @@ public function getThumbsPath($filePath = false)
$mediaRootDir = Mage::getConfig()->getOptions()->getMediaDir();
$thumbnailDir = $this->getThumbnailRoot();
- if ($filePath && strpos($filePath, $mediaRootDir) === 0) {
+ if ($filePath && str_starts_with($filePath, $mediaRootDir)) {
$thumbnailDir .= DS . dirname(substr($filePath, strlen($mediaRootDir)));
}
diff --git a/app/code/core/Mage/Core/Block/Messages.php b/app/code/core/Mage/Core/Block/Messages.php
index 2caa8815012..ac2907d4e59 100644
--- a/app/code/core/Mage/Core/Block/Messages.php
+++ b/app/code/core/Mage/Core/Block/Messages.php
@@ -247,6 +247,7 @@ public function getGroupedHtml()
if ($html) {
$html .= '_messagesFirstLevelTagName . '>';
}
+ $this->_messages = $this->getMessageCollection()->clear();
return $html;
}
diff --git a/app/code/core/Mage/Core/Block/Template.php b/app/code/core/Mage/Core/Block/Template.php
index 26eb532787d..2a6457ee2e2 100644
--- a/app/code/core/Mage/Core/Block/Template.php
+++ b/app/code/core/Mage/Core/Block/Template.php
@@ -156,7 +156,7 @@ public function assign($key, $value = null)
*/
public function setScriptPath($dir)
{
- if (strpos($dir, '..') === false && ($dir === Mage::getBaseDir('design') || strpos(realpath($dir), realpath(Mage::getBaseDir('design'))) === 0)) {
+ if (!str_contains($dir, '..') && ($dir === Mage::getBaseDir('design') || str_starts_with(realpath($dir), realpath(Mage::getBaseDir('design'))))) {
$this->_viewDir = $dir;
} else {
Mage::log('Not valid script path:' . $dir, Zend_Log::CRIT, null, true);
@@ -245,7 +245,7 @@ public function fetchView($fileName)
try {
if (strpos($this->_viewDir . DS . $fileName, '..') === false
&&
- ($this->_viewDir == Mage::getBaseDir('design') || strpos(realpath($this->_viewDir), realpath(Mage::getBaseDir('design'))) === 0)
+ ($this->_viewDir == Mage::getBaseDir('design') || str_starts_with(realpath($this->_viewDir), realpath(Mage::getBaseDir('design'))))
) {
include $this->_viewDir . DS . $fileName;
} else {
diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index fc44d53ed81..2544b451aab 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -142,7 +142,7 @@ public function setPathInfo($pathInfo = null)
if ($baseUrl && $pathInfo && (stripos($pathInfo, '/') !== 0)) {
$pathInfo = '';
$this->setActionName('noRoute');
- } elseif (($baseUrl !== null) && ($pathInfo === false)) {
+ } elseif ($baseUrl !== null && !$pathInfo) {
$pathInfo = '';
} elseif ($baseUrl === null) {
$pathInfo = $requestUri;
@@ -329,7 +329,7 @@ public function getHttpHost($trimPort = true)
$host = $hostParts[0];
}
- if (strpos($host, ',') !== false || strpos($host, ';') !== false) {
+ if (str_contains($host, ',') || str_contains($host, ';')) {
$response = new Zend_Controller_Response_Http();
$response->setHttpResponseCode(400)->sendHeaders();
exit();
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index 464a75dbc57..7ebe3580c2a 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -790,8 +790,7 @@ protected function _getRefererUrl()
if ($url = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED)) {
$refererUrl = Mage::helper('core')->urlDecodeAndEscape($url);
}
-
- if (!$this->_isUrlInternal($refererUrl)) {
+ if (empty($refererUrl) || !$this->_isUrlInternal($refererUrl)) {
$refererUrl = Mage::app()->getStore()->getBaseUrl();
}
return $refererUrl;
@@ -805,12 +804,12 @@ protected function _getRefererUrl()
*/
protected function _isUrlInternal($url)
{
- if (strpos($url, 'http') !== false) {
+ if (str_contains($url, 'http')) {
/**
* Url must start from base secure or base unsecure url
*/
- if ((strpos($url, Mage::app()->getStore()->getBaseUrl()) === 0)
- || (strpos($url, Mage::app()->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true)) === 0)
+ if (str_starts_with($url, Mage::app()->getStore()->getBaseUrl())
+ || str_starts_with($url, Mage::app()->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true))
) {
return true;
}
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
index e880215c7ec..d6db6172f4b 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
@@ -431,7 +431,7 @@ public function getControllerFileName($realModule, $controller)
*/
public function validateControllerFileName($fileName)
{
- if ($fileName && is_readable($fileName) && strpos($fileName, '//') === false) {
+ if ($fileName && is_readable($fileName) && !str_contains($fileName, '//')) {
return true;
}
return false;
diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php
index 012e580ab11..ffbd2503a61 100644
--- a/app/code/core/Mage/Core/Helper/Abstract.php
+++ b/app/code/core/Mage/Core/Helper/Abstract.php
@@ -343,6 +343,9 @@ public function jsQuoteEscape($data, $quote = '\'')
*/
public function quoteEscape($data, $addSlashes = false)
{
+ if (!$data) {
+ return $data;
+ }
if ($addSlashes === true) {
$data = addslashes($data);
}
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index 33572af67be..323ecdb206b 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -973,7 +973,7 @@ public function getEscapedCSVData(array $data)
$value = (string)$value;
$firstLetter = substr($value, 0, 1);
- if ($firstLetter !== false && in_array($firstLetter, ["=", "+", "-"])) {
+ if ($firstLetter && in_array($firstLetter, ['=', '+', '-'])) {
$data[$key] = ' ' . $value;
}
}
diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php
index de0913c1f3b..ec27336359b 100644
--- a/app/code/core/Mage/Core/Helper/Http.php
+++ b/app/code/core/Mage/Core/Helper/Http.php
@@ -134,7 +134,7 @@ public function getRemoteAddr($ipToLong = false)
return false;
}
- if (strpos($this->_remoteAddr, ',') !== false) {
+ if (str_contains($this->_remoteAddr, ',')) {
$ipList = explode(',', $this->_remoteAddr);
$this->_remoteAddr = trim(reset($ipList));
}
diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php
index cfa14ff9d9b..de0b038e6d7 100644
--- a/app/code/core/Mage/Core/Helper/String.php
+++ b/app/code/core/Mage/Core/Helper/String.php
@@ -44,7 +44,7 @@ class Mage_Core_Helper_String extends Mage_Core_Helper_Abstract
public function truncate($string, $length = 80, $etc = '...', &$remainder = '', $breakWords = true)
{
$remainder = '';
- if ($length == 0) {
+ if (is_null($string) || $length == 0) {
return '';
}
@@ -75,7 +75,7 @@ public function truncate($string, $length = 80, $etc = '...', &$remainder = '',
*/
public function strlen($string)
{
- return iconv_strlen($string, self::ICONV_CHARSET);
+ return is_null($string) ? 0 : iconv_strlen($string, self::ICONV_CHARSET);
}
/**
@@ -88,6 +88,9 @@ public function strlen($string)
*/
public function substr($string, $offset, $length = null)
{
+ if (is_null($string)) {
+ return '';
+ }
$string = $this->cleanString($string);
if (is_null($length)) {
$length = $this->strlen($string) - $offset;
@@ -246,6 +249,9 @@ public function str_split($str, $length = 1, $keepWords = false, $trim = false,
*/
public function splitWords($str, $uniqueOnly = false, $maxWordLength = 0, $wordSeparatorRegexp = '\s')
{
+ if (is_null($str)) {
+ return [];
+ }
$result = [];
$split = preg_split('#' . $wordSeparatorRegexp . '#siu', $str, -1, PREG_SPLIT_NO_EMPTY);
foreach ($split as $word) {
@@ -269,8 +275,12 @@ public function splitWords($str, $uniqueOnly = false, $maxWordLength = 0, $wordS
*/
public function cleanString($string)
{
- return '"libiconv"' == ICONV_IMPL ?
- iconv(self::ICONV_CHARSET, self::ICONV_CHARSET . '//IGNORE', $string) : $string;
+ if (is_null($string)) {
+ return '';
+ }
+ return '"libiconv"' == ICONV_IMPL
+ ? iconv(self::ICONV_CHARSET, self::ICONV_CHARSET . '//IGNORE', $string)
+ : $string;
}
/**
@@ -279,11 +289,11 @@ public function cleanString($string)
* @param string $haystack
* @param string $needle
* @param int $offset
- * @return int
+ * @return int|false
*/
- public function strpos($haystack, $needle, $offset = null)
+ public function strpos($haystack, $needle, $offset = 0)
{
- return iconv_strpos($haystack, $needle, $offset, self::ICONV_CHARSET);
+ return iconv_strpos((string) $haystack, (string) $needle, $offset, self::ICONV_CHARSET);
}
/**
@@ -315,6 +325,9 @@ public function ksortMultibyte(array &$sort)
*/
public function parseQueryStr($str)
{
+ if (is_null($str)) {
+ return [];
+ }
$argSeparator = '&';
$result = [];
$partsQueryStr = explode($argSeparator, $str);
@@ -337,7 +350,7 @@ public function parseQueryStr($str)
*/
protected function _validateQueryStr($str)
{
- if (!$str || (strpos($str, '=') === false)) {
+ if (!$str || !str_contains($str, '=')) {
return false;
}
return true;
@@ -510,6 +523,9 @@ public function uniOrd($c)
*/
public function unserialize($str)
{
+ if (is_null($str)) {
+ return null;
+ }
$reader = new Unserialize_Reader_ArrValue('data');
$prevChar = null;
for ($i = 0; $i < strlen($str); $i++) {
diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php
index 0f75022035d..a62a7c51e87 100644
--- a/app/code/core/Mage/Core/Helper/Url.php
+++ b/app/code/core/Mage/Core/Helper/Url.php
@@ -199,8 +199,8 @@ public function decodePunycode($url)
*/
private function _isPunycode($host)
{
- if (strpos($host, 'xn--') === 0 || strpos($host, '.xn--') !== false
- || strpos($host, 'XN--') === 0 || strpos($host, '.XN--') !== false
+ if (str_starts_with($host, 'xn--') || str_contains($host, '.xn--')
+ || str_starts_with($host, 'XN--') || str_contains($host, '.XN--')
) {
return true;
}
diff --git a/app/code/core/Mage/Core/Helper/Url/Rewrite.php b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
index 152d0e62ffe..4c73d3b1474 100644
--- a/app/code/core/Mage/Core/Helper/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
@@ -51,7 +51,7 @@ protected function _validateRequestPath($requestPath)
$this->__('Request path length exceeds allowed %s symbols.', self::TARGET_PATH_ALLOWED_LENGTH)
);
}
- if (strpos($requestPath, '//') !== false) {
+ if (str_contains($requestPath, '//')) {
throw new Mage_Core_Exception(
$this->__('Two and more slashes together are not permitted in request path'),
self::VERR_MANYSLASHES
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index e6750cf4ace..9b0b96c9c3d 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -1310,7 +1310,7 @@ public function isCurrentlySecure()
$offloaderHeader = strtoupper(trim((string) Mage::getConfig()->getNode(Mage_Core_Model_Store::XML_PATH_OFFLOADER_HEADER, 'default')));
if ($offloaderHeader) {
$offloaderHeader = preg_replace('/[^A-Z]+/', '_', $offloaderHeader);
- $offloaderHeader = strpos($offloaderHeader, 'HTTP_') === 0 ? $offloaderHeader : 'HTTP_' . $offloaderHeader;
+ $offloaderHeader = str_starts_with($offloaderHeader, 'HTTP_') ? $offloaderHeader : 'HTTP_' . $offloaderHeader;
if (!empty($_SERVER[$offloaderHeader]) && $_SERVER[$offloaderHeader] !== 'http') {
return true;
}
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
index bc34eb5072f..87cd6476d82 100644
--- a/app/code/core/Mage/Core/Model/Cache.php
+++ b/app/code/core/Mage/Core/Model/Cache.php
@@ -419,11 +419,10 @@ public function clean($tags = [])
if (!is_array($tags)) {
$tags = [$tags];
}
- $res = $this->getFrontend()->clean($mode, $this->_tags($tags));
- } else {
- $this->flush();
+ return $this->getFrontend()->clean($mode, $this->_tags($tags));
}
- return $res;
+
+ return $this->flush();
}
/**
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index 47d23deaf6b..b9e1228037a 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -1362,7 +1362,7 @@ public function getGroupedClassName($groupType, $classId, $groupRootNode = null)
*/
public function getBlockClassName($blockType)
{
- if (strpos($blockType, '/') === false) {
+ if (!str_contains($blockType, '/')) {
return $blockType;
}
return $this->getGroupedClassName('block', $blockType);
@@ -1376,7 +1376,7 @@ public function getBlockClassName($blockType)
*/
public function getHelperClassName($helperName)
{
- if (strpos($helperName, '/') === false) {
+ if (!str_contains($helperName, '/')) {
$helperName .= '/data';
}
return $this->getGroupedClassName('helper', $helperName);
@@ -1413,7 +1413,7 @@ public function getResourceHelper($moduleName)
public function getModelClassName($modelClass)
{
$modelClass = trim($modelClass);
- if (strpos($modelClass, '/') === false) {
+ if (!str_contains($modelClass, '/')) {
return $modelClass;
}
return $this->getGroupedClassName('model', $modelClass);
@@ -1583,7 +1583,7 @@ public function shouldUrlBeSecure($url)
}
// If unsecure base url is https, then all urls should be secure
- if (strpos(Mage::getStoreConfig(Mage_Core_Model_Store::XML_PATH_UNSECURE_BASE_URL), 'https://') === 0) {
+ if (str_starts_with(Mage::getStoreConfig(Mage_Core_Model_Store::XML_PATH_UNSECURE_BASE_URL), 'https://')) {
return true;
}
@@ -1591,7 +1591,7 @@ public function shouldUrlBeSecure($url)
$this->_secureUrlCache[$url] = false;
$secureUrls = $this->getNode('frontend/secure_url');
foreach ($secureUrls->children() as $match) {
- if (strpos($url, (string)$match) === 0) {
+ if (str_starts_with($url, (string)$match)) {
$this->_secureUrlCache[$url] = true;
break;
}
diff --git a/app/code/core/Mage/Core/Model/Convert.php b/app/code/core/Mage/Core/Model/Convert.php
index 9d2901d8241..5b5977f21c7 100644
--- a/app/code/core/Mage/Core/Model/Convert.php
+++ b/app/code/core/Mage/Core/Model/Convert.php
@@ -40,7 +40,7 @@ public function __construct()
*/
public function getClassNameByType($type)
{
- if (strpos($type, '/') !== false) {
+ if (str_contains($type, '/')) {
return Mage::getConfig()->getModelClassName($type);
}
return parent::getClassNameByType($type);
diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index d276084c3e0..721c5bb4a30 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -456,7 +456,7 @@ public function getFilename($file, array $params)
Varien_Profiler::start(__METHOD__);
// Prevent reading files outside of the proper directory while still allowing symlinked files
- if (strpos($file, '..') !== false) {
+ if (str_contains($file, '..')) {
Mage::log(sprintf('Invalid path requested: %s (params: %s)', $file, json_encode($params)), Zend_Log::ERR);
throw new Exception('Invalid path requested.');
}
@@ -521,7 +521,7 @@ public function getSkinUrl($file = null, array $params = [])
Varien_Profiler::start(__METHOD__);
// Prevent reading files outside of the proper directory while still allowing symlinked files
- if (strpos((string)$file, '..') !== false) {
+ if (str_contains((string)$file, '..')) {
Mage::log(sprintf('Invalid path requested: %s (params: %s)', $file, json_encode($params)), Zend_Log::ERR);
throw new Exception('Invalid path requested.');
}
diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
index cfdf2ede252..7d4897b6f65 100644
--- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php
+++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
@@ -302,7 +302,7 @@ public function storeDirective($construction)
$params['_query'] = [];
}
foreach ($params as $k => $v) {
- if (strpos($k, '_query_') === 0) {
+ if (str_starts_with($k, '_query_')) {
$params['_query'][substr($k, 7)] = $v;
unset($params[$k]);
}
diff --git a/app/code/core/Mage/Core/Model/Layout.php b/app/code/core/Mage/Core/Model/Layout.php
index 833958481d5..f1dd83f0629 100644
--- a/app/code/core/Mage/Core/Model/Layout.php
+++ b/app/code/core/Mage/Core/Model/Layout.php
@@ -500,7 +500,7 @@ public function addBlock($block, $blockName)
protected function _getBlockInstance($block, array $attributes = [])
{
if (is_string($block)) {
- if (strpos($block, '/') !== false) {
+ if (str_contains($block, '/')) {
if (!$block = Mage::getConfig()->getBlockClassName($block)) {
Mage::throwException(Mage::helper('core')->__('Invalid block type: %s', $block));
}
diff --git a/app/code/core/Mage/Core/Model/Resource.php b/app/code/core/Mage/Core/Model/Resource.php
index eb69aeac8ae..6e843ce8de5 100644
--- a/app/code/core/Mage/Core/Model/Resource.php
+++ b/app/code/core/Mage/Core/Model/Resource.php
@@ -194,7 +194,7 @@ protected function _newConnection($type, $config)
*/
protected function _getDefaultConnection($requiredConnectionName)
{
- if (strpos($requiredConnectionName, 'read') !== false) {
+ if (str_contains($requiredConnectionName, 'read')) {
return $this->getConnection(self::DEFAULT_READ_RESOURCE);
}
return $this->getConnection(self::DEFAULT_WRITE_RESOURCE);
diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
index 5da86165218..64a62148df8 100644
--- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
@@ -152,7 +152,7 @@ public function getMainTable()
*/
public function setMainTable($table)
{
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = $this->getTable($table);
}
diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php
index 3e03dbf270b..646fdc2b2bf 100644
--- a/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Helper/Abstract.php
@@ -299,7 +299,7 @@ public function convertOldColumnDefinition($column)
'unsigned' => $column['unsigned'],
'nullable' => $column['is_null'],
'default' => $column['default'],
- 'identity' => stripos($column['extra'], 'auto_increment') !== false
+ 'identity' => !empty($column['extra']) && (stripos($column['extra'], 'auto_increment') !== false),
];
/**
diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php
index b99c8c01fd6..6b0316b6926 100644
--- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php
+++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php
@@ -129,7 +129,7 @@ protected function _prepareOrder(Varien_Db_Select $select, $autoReset = false)
protected function _truncateAliasName($field, $reverse = false)
{
$string = $field;
- if (!is_numeric($field) && (strpos($field, '.') !== false)) {
+ if (!is_numeric($field) && (str_contains($field, '.'))) {
$size = strpos($field, '.');
if ($reverse) {
$string = substr($field, 0, $size);
@@ -191,7 +191,7 @@ protected function _prepareHaving(Varien_Db_Select $select, $autoReset = false)
/**
* Looking for column expression in the having clause
*/
- if (strpos($having, $correlationName) !== false) {
+ if (str_contains($having, $correlationName)) {
if (is_string($column)) {
/**
* Replace column expression to column alias in having clause
diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php
index 6f5d06aa149..e1c50b0533e 100644
--- a/app/code/core/Mage/Core/Model/Resource/Setup.php
+++ b/app/code/core/Mage/Core/Model/Resource/Setup.php
@@ -707,7 +707,7 @@ protected function _getModifySqlFiles($actionType, $fromVersion, $toVersion, $ar
*/
public function getTableRow($table, $idField, $id, $field = null, $parentField = null, $parentId = 0)
{
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = $this->getTable($table);
}
@@ -742,7 +742,7 @@ public function getTableRow($table, $idField, $id, $field = null, $parentField =
*/
public function deleteTableRow($table, $idField, $id, $parentField = null, $parentId = 0)
{
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = $this->getTable($table);
}
@@ -775,7 +775,7 @@ public function deleteTableRow($table, $idField, $id, $parentField = null, $pare
*/
public function updateTableRow($table, $idField, $id, $field, $value = null, $parentField = null, $parentId = 0)
{
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = $this->getTable($table);
}
@@ -813,7 +813,7 @@ public function updateTableRow($table, $idField, $id, $field, $value = null, $pa
*/
public function updateTable($table, $conditionExpr, $valueExpr)
{
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = $this->getTable($table);
}
$query = sprintf(
@@ -836,7 +836,7 @@ public function updateTable($table, $conditionExpr, $valueExpr)
*/
public function tableExists($table)
{
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = $this->getTable($table);
}
diff --git a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php
index f9df8a5cdd7..30e48fc6eac 100644
--- a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php
+++ b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php
@@ -89,7 +89,7 @@ protected function _getColumnDefinitionFromSql($sql, $column)
*
* @param string $haystack
* @param string $needle
- * @param array $replacement
+ * @param string $replacement
* @param bool $caseInsensitive
* @return string
*/
diff --git a/app/code/core/Mage/Core/Model/Resource/Translate/String.php b/app/code/core/Mage/Core/Model/Resource/Translate/String.php
index c3426f4f142..cd24f87a757 100644
--- a/app/code/core/Mage/Core/Model/Resource/Translate/String.php
+++ b/app/code/core/Mage/Core/Model/Resource/Translate/String.php
@@ -209,7 +209,7 @@ public function saveTranslate($string, $translate, $locale = null, $storeId = nu
if ($row = $write->fetchRow($select, $bind)) {
$original = $string;
- if (strpos($original, '::') !== false) {
+ if (str_contains($original, '::')) {
list($scope, $original) = explode('::', $original);
}
if ($original == $translate) {
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract.php b/app/code/core/Mage/Core/Model/Session/Abstract.php
index bc15d9696d5..4e59592dd64 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract.php
@@ -484,7 +484,7 @@ public function isValidForPath($path)
$urlPath = trim($path, '/') . '/';
- return strpos($urlPath, $cookiePath) === 0;
+ return str_starts_with($urlPath, $cookiePath);
}
/**
diff --git a/app/code/core/Mage/Core/Model/Translate.php b/app/code/core/Mage/Core/Model/Translate.php
index 942f13c1338..6e067d1135b 100644
--- a/app/code/core/Mage/Core/Model/Translate.php
+++ b/app/code/core/Mage/Core/Model/Translate.php
@@ -196,7 +196,7 @@ public function getConfig($key)
* Loading data from module translation files
*
* @param string $moduleName
- * @param string $files
+ * @param array $files
* @param bool $forceReload
* @return $this
*/
@@ -224,7 +224,7 @@ protected function _addData($data, $scope, $forceReload = false)
continue;
}
$key = $this->_prepareDataString($key);
- $value = $this->_prepareDataString($value);
+ $value = $value === null ? '' : $this->_prepareDataString($value);
if ($scope && isset($this->_dataScope[$key]) && !$forceReload) {
/**
* Checking previos value
diff --git a/app/code/core/Mage/Core/Model/Url.php b/app/code/core/Mage/Core/Model/Url.php
index 727eb8d9389..942c6172995 100644
--- a/app/code/core/Mage/Core/Model/Url.php
+++ b/app/code/core/Mage/Core/Model/Url.php
@@ -1138,7 +1138,7 @@ public function getDirectUrl($url, $params = [])
*/
public function sessionUrlVar($html)
{
- if (strpos($html, '__SID') === false) {
+ if (!str_contains($html, '__SID')) {
return $html;
} else {
return preg_replace_callback(
@@ -1211,13 +1211,18 @@ public function sessionVarCallback($match)
public function isOwnOriginUrl()
{
$storeDomains = [];
- $referer = parse_url(Mage::app()->getFrontController()->getRequest()->getServer('HTTP_REFERER'), PHP_URL_HOST);
+ $httpReferer = Mage::app()->getFrontController()->getRequest()->getServer('HTTP_REFERER');
+ $referer = $httpReferer ? parse_url($httpReferer, PHP_URL_HOST) : '';
+ if (empty($referer)) {
+ return true;
+ }
+
foreach (Mage::app()->getStores() as $store) {
$storeDomains[] = parse_url($store->getBaseUrl(), PHP_URL_HOST);
$storeDomains[] = parse_url($store->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true), PHP_URL_HOST);
}
$storeDomains = array_unique($storeDomains);
- if (empty($referer) || in_array($referer, $storeDomains)) {
+ if (in_array($referer, $storeDomains)) {
return true;
}
return false;
diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php
index 7a75e8275a6..b34344301c1 100644
--- a/app/code/core/Mage/Core/functions.php
+++ b/app/code/core/Mage/Core/functions.php
@@ -107,7 +107,7 @@ function mageFindClassFile($class)
*/
function mageCoreErrorHandler($errno, $errstr, $errfile, $errline)
{
- if (strpos($errstr, 'DateTimeZone::__construct') !== false) {
+ if (str_contains($errstr, 'DateTimeZone::__construct')) {
// there's no way to distinguish between caught system exceptions and warnings
return false;
}
diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php
index 27fea671b0b..a133538ac8e 100644
--- a/app/code/core/Mage/Cron/Model/Observer.php
+++ b/app/code/core/Mage/Cron/Model/Observer.php
@@ -220,7 +220,9 @@ public function cleanup()
$now = time();
foreach ($history->getIterator() as $record) {
- if (strtotime($record->getExecutedAt()) < $now - $historyLifetimes[$record->getStatus()]) {
+ if (empty($record->getExecutedAt())
+ || (strtotime($record->getExecutedAt()) < $now - $historyLifetimes[$record->getStatus()])
+ ) {
$record->delete();
}
}
@@ -324,6 +326,11 @@ protected function _processJob($schedule, $jobConfig, $isAlways = false)
$schedule->setStatus($errorStatus)
->setMessages($e->__toString());
}
+
+ if ($schedule->getIsError()) {
+ $schedule->setStatus(Mage_Cron_Model_Schedule::STATUS_ERROR);
+ }
+
$schedule->save();
return $this;
diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php
index 4932fb92762..5158894adab 100644
--- a/app/code/core/Mage/Cron/Model/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Schedule.php
@@ -22,6 +22,7 @@
* @method Mage_Cron_Model_Resource_Schedule _getResource()
* @method Mage_Cron_Model_Resource_Schedule getResource()
* @method Mage_Cron_Model_Resource_Schedule_Collection getCollection()
+ * @method $this setIsError(bool $value)
* @method string getJobCode()
* @method $this setJobCode(string $value)
* @method string getStatus()
@@ -53,6 +54,14 @@ public function _construct()
$this->_init('cron/schedule');
}
+ /**
+ * @return bool
+ */
+ public function getIsError(): bool
+ {
+ return !empty($this->getData('is_error'));
+ }
+
/**
* @param string $expr
* @return $this
@@ -120,7 +129,7 @@ public function matchCronExpression($expr, $num)
}
// handle multiple options
- if (strpos($expr, ',') !== false) {
+ if (str_contains($expr, ',')) {
foreach (explode(',', $expr) as $e) {
if ($this->matchCronExpression($e, $num)) {
return true;
@@ -130,7 +139,7 @@ public function matchCronExpression($expr, $num)
}
// handle modulus
- if (strpos($expr, '/') !== false) {
+ if (str_contains($expr, '/')) {
$e = explode('/', $expr);
if (count($e) !== 2) {
throw Mage::exception('Mage_Cron', "Invalid cron expression, expecting 'match/modulus': " . $expr);
@@ -148,7 +157,7 @@ public function matchCronExpression($expr, $num)
if ($expr === '*') {
$from = 0;
$to = 60;
- } elseif (strpos($expr, '-') !== false) { // handle range
+ } elseif (str_contains($expr, '-')) { // handle range
$e = explode('-', $expr);
if (count($e) !== 2) {
throw Mage::exception('Mage_Cron', "Invalid cron expression, expecting 'from-to' structure: " . $expr);
diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
index 6826360f6de..73e066b8429 100644
--- a/app/code/core/Mage/Customer/Block/Form/Register.php
+++ b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -88,6 +88,10 @@ public function getFormData()
if (isset($data['region_id'])) {
$data['region_id'] = (int)$data['region_id'];
}
+ if ($data->getDob()) {
+ $dob = $data->getYear() . '-' . $data->getMonth() . '-' . $data->getDay();
+ $data->setDob($dob);
+ }
$this->setData('form_data', $data);
}
return $data;
diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php
index 3add2717676..a3fd745101a 100644
--- a/app/code/core/Mage/Customer/Model/Resource/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php
@@ -381,4 +381,19 @@ public function getPasswordTimestamp($customerId)
}
return $value;
}
+
+ /**
+ * Get email by customer ID.
+ *
+ * @param int $customerId
+ * @return string|false
+ */
+ public function getEmail($customerId)
+ {
+ $select = $this->_getReadAdapter()->select()
+ ->from($this->getEntityTable(), 'email')
+ ->where('entity_id = ?', $customerId);
+
+ return $this->_getReadAdapter()->fetchOne($select);
+ }
}
diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php
index 0493cbff974..f8ae1efb3fe 100644
--- a/app/code/core/Mage/Customer/controllers/AddressController.php
+++ b/app/code/core/Mage/Customer/controllers/AddressController.php
@@ -151,9 +151,11 @@ public function formPostAction()
$this->_getSession()->setAddressFormData($this->getRequest()->getPost())
->addException($e, $this->__('Cannot save address.'));
}
+
+ return $this->_redirectError(Mage::getUrl('*/*/edit', ['id' => $address->getId()]));
}
- return $this->_redirectError(Mage::getUrl('*/*/edit', ['id' => $address->getId()]));
+ $this->_redirectReferer();
}
/**
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
index 3e22843fb74..a8d11090464 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
@@ -237,9 +237,9 @@ public function getCsvString($fields = [])
$escapedValue = Mage::helper("core")->getEscapedCSVData([$value]);
$value = $escapedValue[0];
- if (strpos($value, $delimiter) !== false ||
+ if (str_contains($value, $delimiter) ||
empty($enclosure) ||
- strpos($value, $enclosure) !== false ||
+ str_contains($value, $enclosure) ||
strpos($value, "\n") !== false ||
strpos($value, "\r") !== false ||
strpos($value, "\t") !== false ||
diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php
index 56a55a133fa..ce7eb77806f 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile.php
@@ -465,7 +465,7 @@ public function _parseGuiData()
$xml .= ' parse' . $nl;
$xml .= '';
}
- //$xml = $interactiveXml.$fileXml.$parseFileXml.$mapXml.$parseDataXml.$entityXml;
+ //$xml = $interactiveXml.$fileXml.$parseFileXml.$mapXml.$parseDataXml.$entityXml;
} else {
$xml = $entityXml . $parseDataXml . $mapXml . $parseFileXml . $fileXml . $interactiveXml;
}
diff --git a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 2132ace0449..31de8eb27c8 100644
--- a/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -164,41 +164,46 @@ public function getLinkData()
'sample_type' => $item->getSampleType(),
'sort_order' => $item->getSortOrder(),
];
- $file = Mage::helper('downloadable/file')->getFilePath(
- Mage_Downloadable_Model_Link::getBasePath(),
- $item->getLinkFile()
- );
-
- if ($item->getLinkFile() && !is_file($file)) {
- Mage::helper('core/file_storage_database')->saveFileToFilesystem($file);
- }
- if ($item->getLinkFile() && is_file($file)) {
- $name = '' . Mage::helper('downloadable/file')->getFileFromPathFile($item->getLinkFile()) . '';
- $tmpLinkItem['file_save'] = [
- [
- 'file' => $item->getLinkFile(),
- 'name' => $name,
- 'size' => filesize($file),
- 'status' => 'old'
- ]];
+ if ($item->getLinkFile()) {
+ $file = Mage::helper('downloadable/file')->getFilePath(
+ Mage_Downloadable_Model_Link::getBasePath(),
+ $item->getLinkFile()
+ );
+ if (!is_file($file)) {
+ Mage::helper('core/file_storage_database')->saveFileToFilesystem($file);
+ }
+ if (is_file($file)) {
+ $name = '' . Mage::helper('downloadable/file')->getFileFromPathFile($item->getLinkFile()) . '';
+ $tmpLinkItem['file_save'] = [
+ [
+ 'file' => $item->getLinkFile(),
+ 'name' => $name,
+ 'size' => filesize($file),
+ 'status' => 'old'
+ ]
+ ];
+ }
}
- $sampleFile = Mage::helper('downloadable/file')->getFilePath(
- Mage_Downloadable_Model_Link::getBaseSamplePath(),
- $item->getSampleFile()
- );
- if ($item->getSampleFile() && is_file($sampleFile)) {
- $tmpLinkItem['sample_file_save'] = [
- [
- 'file' => $item->getSampleFile(),
- 'name' => Mage::helper('downloadable/file')->getFileFromPathFile($item->getSampleFile()),
- 'size' => filesize($sampleFile),
- 'status' => 'old'
- ]];
+ if ($item->getSampleFile()) {
+ $sampleFile = Mage::helper('downloadable/file')->getFilePath(
+ Mage_Downloadable_Model_Link::getBaseSamplePath(),
+ $item->getSampleFile()
+ );
+ if (is_file($sampleFile)) {
+ $tmpLinkItem['sample_file_save'] = [
+ [
+ 'file' => $item->getSampleFile(),
+ 'name' => Mage::helper('downloadable/file')->getFileFromPathFile($item->getSampleFile()),
+ 'size' => filesize($sampleFile),
+ 'status' => 'old'
+ ]
+ ];
+ }
}
if ($item->getNumberOfDownloads() == '0') {
$tmpLinkItem['is_unlimited'] = ' checked="checked"';
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
index c360025dd0e..0e29ab491cd 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
@@ -478,7 +478,7 @@ protected function _getRequestValue(Zend_Controller_Request_Http $request)
{
$attrCode = $this->getAttribute()->getAttributeCode();
if ($this->_requestScope) {
- if (strpos($this->_requestScope, '/') !== false) {
+ if (str_contains($this->_requestScope, '/')) {
$params = $request->getParams();
$parts = explode('/', $this->_requestScope);
foreach ($parts as $part) {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php
index 0da6a865ae9..9e6d5f3d3fe 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Date.php
@@ -25,12 +25,12 @@ class Mage_Eav_Model_Attribute_Data_Date extends Mage_Eav_Model_Attribute_Data_A
* Extract data from request and return value
*
* @param Zend_Controller_Request_Http $request
- * @return array|string
+ * @return array|string|false
*/
public function extractValue(Zend_Controller_Request_Http $request)
{
$value = $this->_getRequestValue($request);
- return $this->_applyInputFilter($value);
+ return $value ? $this->_applyInputFilter($value) : false;
}
/**
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
index a2b81837f91..189929bcca3 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
@@ -45,7 +45,7 @@ public function extractValue(Zend_Controller_Request_Http $request)
$attrCode = $this->getAttribute()->getAttributeCode();
if ($this->_requestScope) {
$value = [];
- if (strpos($this->_requestScope, '/') !== false) {
+ if (str_contains($this->_requestScope, '/')) {
$scopes = explode('/', $this->_requestScope);
$mainScope = array_shift($scopes);
} else {
diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php
index 363cfd090d4..619c411aef6 100644
--- a/app/code/core/Mage/Eav/Model/Config.php
+++ b/app/code/core/Mage/Eav/Model/Config.php
@@ -186,8 +186,23 @@ protected function _loadEntityTypes()
$this->_entityTypes = [];
$this->_entityTypeByCode = [];
$entityTypeCollection = Mage::getResourceModel('eav/entity_type_collection');
+
/** @var Mage_Eav_Model_Entity_Type $entityType */
foreach ($entityTypeCollection as $entityType) {
+ // Ensure eav entity type model class is defined, otherwise skip processing it.
+ // This check prevents leftover eav_entity_type entries from disabled/removed modules creating errors and
+ // is necessary because the entire EAV model is now loaded eagerly for performance optimization.
+ $entityModelClass = $entityType['entity_model'];
+ $fqEntityModelClass = Mage::getConfig()->getModelClassName($entityModelClass);
+ if (!class_exists($fqEntityModelClass)) {
+ if (Mage::getIsDeveloperMode()) {
+ throw new Exception('Failed loading of eav entity type because it does not exist: ' . $entityModelClass);
+ } else {
+ Mage::log('Skipped loading of eav entity type because it does not exist: ' . $entityModelClass);
+ }
+ continue;
+ }
+
$this->_entityTypes[$entityType->getId()] = $entityType;
$this->_entityTypeByCode[$entityType->getEntityTypeCode()] = $entityType;
}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
index 1f880eb6c06..a0eb7ec0fdd 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
@@ -692,7 +692,7 @@ public function joinField($alias, $table, $field, $bind, $cond = null, $joinType
}
// validate table
- if (strpos($table, '/') !== false) {
+ if (str_contains($table, '/')) {
$table = Mage::getSingleton('core/resource')->getTableName($table);
}
$tableAlias = $this->_getAttributeTableAlias($alias);
@@ -759,7 +759,7 @@ public function joinTable($table, $bind, $fields = null, $cond = null, $joinType
}
// validate table
- if (is_string($tableName) && strpos($tableName, '/') !== false) {
+ if (is_string($tableName) && str_contains($tableName, '/')) {
$tableName = Mage::getSingleton('core/resource')->getTableName($tableName);
}
if (empty($tableAlias)) {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
index 971b3f2984e..eba5bdcc621 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
@@ -35,7 +35,7 @@ public function getNextId()
{
$lastId = $this->getLastId();
- if (strpos($lastId, $this->getPrefix()) === 0) {
+ if (str_starts_with($lastId, $this->getPrefix())) {
$lastId = substr($lastId, strlen($this->getPrefix()));
}
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
index f8c208635f2..8bc1065ca3e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Numeric.php
@@ -28,7 +28,7 @@ public function getNextId()
if (empty($last)) {
$last = 0;
- } elseif (!empty($prefix = (string)$this->getPrefix()) && strpos($last, $prefix) === 0) {
+ } elseif (!empty($prefix = (string)$this->getPrefix()) && str_starts_with($last, $prefix)) {
$last = (int)substr($last, strlen($prefix));
} else {
$last = (int)$last;
diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
index 26141d8299f..01d210f0d17 100644
--- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
+++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
@@ -21,62 +21,62 @@
*/
class Mage_GoogleAnalytics_Block_Ga extends Mage_Core_Block_Template
{
- /**
- * @deprecated after 1.4.1.1
- * @see self::_getOrdersTrackingCode()
- * @return string
- */
- public function getQuoteOrdersHtml()
- {
- return '';
- }
+ protected const CHECKOUT_MODULE_NAME = "checkout";
+ protected const CHECKOUT_CONTROLLER_NAME = "onepage";
/**
- * @deprecated after 1.4.1.1
- * self::_getOrdersTrackingCode()
+ * Render regular page tracking javascript code
+ * The custom "page name" may be set from layout or somewhere else. It must start from slash.
+ *
+ * @param string $accountId
* @return string
*/
- public function getOrderHtml()
+ protected function _getPageTrackingCode($accountId)
{
- return '';
- }
+ /** @var Mage_GoogleAnalytics_Helper_Data $helper */
+ $helper = $this->helper('googleanalytics');
+ if ($helper->isUseAnalytics4()) {
+ return $this->_getPageTrackingCodeAnalytics4($accountId);
+ }
- /**
- * @deprecated after 1.4.1.1
- * @see _toHtml()
- * @return string
- */
- public function getAccount()
- {
return '';
}
- /**
- * Get a specific page name (may be customized via layout)
- *
- * @return string
- */
- public function getPageName()
- {
- return $this->_getData('page_name') ?? '';
- }
-
/**
* Render regular page tracking javascript code
- * The custom "page name" may be set from layout or somewhere else. It must start from slash.
*
+ * @link https://developers.google.com/tag-platform/gtagjs/reference
* @param string $accountId
* @return string
*/
- protected function _getPageTrackingCode($accountId)
+ protected function _getPageTrackingCodeAnalytics4($accountId)
{
- /** @var Mage_GoogleAnalytics_Helper_Data $helper */
- $helper = $this->helper('googleanalytics');
- if ($helper->isUseUniversalAnalytics()) {
- return $this->_getPageTrackingCodeUniversal($accountId);
+ $trackingCode = "
+gtag('js', new Date());
+";
+ if (!$this->helper('googleanalytics')->isDebugModeEnabled()) {
+ $trackingCode .= "
+gtag('config', '{$this->jsQuoteEscape($accountId)}');
+";
+ } else {
+ $trackingCode .= "
+gtag('config', '{$this->jsQuoteEscape($accountId)}', {'debug_mode':true});
+";
+ }
+
+ //add user_id
+ if ($this->helper('googleanalytics')->isUserIdEnabled() && Mage::getSingleton('customer/session')->isLoggedIn()) {
+ $customer = Mage::getSingleton('customer/session')->getCustomer();
+ $trackingCode.= "
+gtag('set', 'user_id', '{$customer->getId()}');
+";
}
- return $this->_getPageTrackingCodeAnalytics($accountId);
+ if ($this->helper('googleanalytics')->isDebugModeEnabled()) {
+ $this->helper('googleanalytics')->log($trackingCode);
+ }
+
+ return $trackingCode;
}
/**
@@ -85,14 +85,11 @@ protected function _getPageTrackingCode($accountId)
*
* @param string $accountId
* @return string
+ * @deprecated
*/
protected function _getPageTrackingCodeUniversal($accountId)
{
- return "
-ga('create', '{$this->jsQuoteEscape($accountId)}', 'auto');
-" . $this->_getAnonymizationCode() . "
-ga('send', 'pageview');
-";
+ return '';
}
/**
@@ -103,19 +100,11 @@ protected function _getPageTrackingCodeUniversal($accountId)
* @link http://code.google.com/apis/analytics/docs/gaJS/gaJSApi_gaq.html
* @param string $accountId
* @return string
+ * @deprecated
*/
protected function _getPageTrackingCodeAnalytics($accountId)
{
- $pageName = trim($this->getPageName());
- $optPageURL = '';
- if ($pageName && preg_match('/^\/.*/i', $pageName)) {
- $optPageURL = ", '{$this->jsQuoteEscape($pageName)}'";
- }
- return "
-_gaq.push(['_setAccount', '{$this->jsQuoteEscape($accountId)}']);
-" . $this->_getAnonymizationCode() . "
-_gaq.push(['_trackPageview'{$optPageURL}]);
-";
+ return '';
}
/**
@@ -123,206 +112,280 @@ protected function _getPageTrackingCodeAnalytics($accountId)
*
* @return string
* @throws Mage_Core_Model_Store_Exception
+ * @deprecated
*/
protected function _getOrdersTrackingCode()
{
- /** @var Mage_GoogleAnalytics_Helper_Data $helper */
- $helper = $this->helper('googleanalytics');
- if ($helper->isUseAnalytics4()) {
- return $this->_getOrdersTrackingCodeAnalytics4();
- } elseif ($helper->isUseUniversalAnalytics()) {
- return $this->_getOrdersTrackingCodeUniversal();
- }
-
- return $this->_getOrdersTrackingCodeAnalytics();
+ return '';
}
/**
* Render information about specified orders and their items
*
* @return string
- * @throws Mage_Core_Model_Store_Exception
+ * @throws JsonException
*/
- protected function _getOrdersTrackingCodeUniversal()
+ protected function _getEnhancedEcommerceDataForAnalytics4()
{
- $orderIds = $this->getOrderIds();
- if (empty($orderIds) || !is_array($orderIds)) {
- return;
- }
- $collection = Mage::getResourceModel('sales/order_collection')
- ->addFieldToFilter('entity_id', ['in' => $orderIds]);
$result = [];
- $result[] = "ga('require', 'ecommerce')";
- foreach ($collection as $order) {
- $result[] = sprintf(
- "ga('ecommerce:addTransaction', {
-'id': '%s',
-'affiliation': '%s',
-'revenue': '%s',
-'tax': '%s',
-'shipping': '%s'
-});",
- $order->getIncrementId(),
- $this->jsQuoteEscape(Mage::app()->getStore()->getFrontendName()),
- $order->getBaseGrandTotal(),
- $order->getBaseTaxAmount(),
- $order->getBaseShippingAmount()
- );
- foreach ($order->getAllVisibleItems() as $item) {
- $result[] = sprintf(
- "ga('ecommerce:addItem', {
-'id': '%s',
-'sku': '%s',
-'name': '%s',
-'category': '%s',
-'price': '%s',
-'quantity': '%s'
-});",
- $order->getIncrementId(),
- $this->jsQuoteEscape($item->getSku()),
- $this->jsQuoteEscape($item->getName()),
- null, // there is no "category" defined for the order item
- $item->getBasePrice(),
- $item->getQtyOrdered()
- );
- }
- $result[] = "ga('ecommerce:send');";
- }
- return implode("\n", $result);
- }
+ $request = $this->getRequest();
+ $moduleName = $request->getModuleName();
+ $controllerName = $request->getControllerName();
+ $helper = Mage::helper('googleanalytics');
- /**
- * @return string
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getOrdersTrackingCodeAnalytics4()
- {
- $orderIds = $this->getOrderIds();
- if (empty($orderIds) || !is_array($orderIds)) {
- return '';
+ /**
+ * This event signifies that an item was removed from a cart.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events#remove_from_cart
+ */
+ $removedProducts = Mage::getSingleton('core/session')->getRemovedProductsForAnalytics();
+ if ($removedProducts) {
+ foreach ($removedProducts as $removedProduct) {
+ $eventData = [];
+ $eventData['currency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
+ $eventData['value'] = $helper->formatPrice($removedProduct['price'] * $removedProduct['qty']);
+ $eventData['items'] = [];
+ $_item = [
+ 'item_id' => $removedProduct['sku'],
+ 'item_name' => $removedProduct['name'],
+ 'price' => $helper->formatPrice($removedProduct['price']),
+ 'quantity' => (int) $removedProduct['qty'],
+ 'item_brand' => $removedProduct['manufacturer'],
+ 'item_category' => $removedProduct['category'],
+ ];
+ $eventData['items'][] = $_item;
+ $result[] = "gtag('event', 'remove_from_cart', " . json_encode($eventData, JSON_THROW_ON_ERROR) . ");";
+ }
+ Mage::getSingleton('core/session')->unsRemovedProductsForAnalytics();
}
- $collection = Mage::getResourceModel('sales/order_collection')
- ->addFieldToFilter('entity_id', ['in' => $orderIds]);
- $result = [];
- /** @var Mage_Sales_Model_Order $order */
- foreach ($collection as $order) {
- $orderData = [
- 'currency' => $order->getBaseCurrencyCode(),
- 'transaction_id' => $order->getIncrementId(),
- 'value' => number_format($order->getBaseGrandTotal(), 2),
- 'coupon' => strtoupper($order->getCouponCode()),
- 'shipping' => number_format($order->getBaseShippingAmount(), 2),
- 'tax' => number_format($order->getBaseTaxAmount(), 2),
- 'items' => []
- ];
- /** @var Mage_Sales_Model_Order_Item $item */
- foreach ($order->getAllVisibleItems() as $item) {
- $orderData['items'][] = [
- 'item_id' => $item->getSku(),
- 'item_name' => $item->getName(),
- 'quantity' => $item->getQtyOrdered(),
- 'price' => $item->getBasePrice(),
- 'discount' => $item->getBaseDiscountAmount()
+ /**
+ * This event signifies that an item was added to a cart for purchase.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events#add_to_cart
+ */
+ $addedProducts = Mage::getSingleton('core/session')->getAddedProductsForAnalytics();
+ if ($addedProducts) {
+ foreach ($addedProducts as $_addedProduct) {
+ $eventData = [];
+ $eventData['currency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
+ $eventData['value'] = $helper->formatPrice($_addedProduct['price'] * $_addedProduct['qty']);
+ $eventData['items'] = [];
+ $_item = [
+ 'item_id' => $_addedProduct['sku'],
+ 'item_name' => $_addedProduct['name'],
+ 'price' => $helper->formatPrice($_addedProduct['price']),
+ 'quantity' => (int) $_addedProduct['qty'],
+ 'item_brand' => $_addedProduct['manufacturer'],
+ 'item_category' => $_addedProduct['category'],
];
+ $eventData['items'][] = $_item;
+ $result[] = "gtag('event', 'add_to_cart', " . json_encode($eventData, JSON_THROW_ON_ERROR) . ");";
+ Mage::getSingleton('core/session')->unsAddedProductsForAnalytics();
}
- $result[] = "gtag('event', 'purchase', " . json_encode($orderData, JSON_THROW_ON_ERROR) . ");";
}
- return implode("\n", $result);
- }
- /**
- * Render information about specified orders and their items
- *
- * @link http://code.google.com/apis/analytics/docs/gaJS/gaJSApiEcommerce.html#_gat.GA_Tracker_._addTrans
- * @return string
- * @throws Mage_Core_Model_Store_Exception
- */
- protected function _getOrdersTrackingCodeAnalytics()
- {
- $orderIds = $this->getOrderIds();
- if (empty($orderIds) || !is_array($orderIds)) {
- return;
+ /**
+ * This event signifies that some content was shown to the user. Use this event to discover the most popular items viewed.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events#view_item
+ */
+ if ($moduleName == 'catalog' && $controllerName == 'product') {
+ $productViewed = Mage::registry('current_product');
+ $category = Mage::registry('current_category') ? Mage::registry('current_category')->getName() : false;
+ $eventData = [];
+ $eventData['currency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
+ $eventData['value'] = $helper->formatPrice($productViewed->getFinalPrice());
+ $eventData['items'] = [];
+ $_item = [
+ 'item_id' => $productViewed->getSku(),
+ 'item_name' => $productViewed->getName(),
+ 'list_name' => 'Product Detail Page',
+ 'item_category' => $category,
+ 'price' => $helper->formatPrice($productViewed->getFinalPrice()),
+ ];
+ if ($productViewed->getAttributeText('manufacturer')) {
+ $_item['item_brand'] = $productViewed->getAttributeText('manufacturer');
+ }
+ array_push($eventData['items'], $_item);
+ $result[] = "gtag('event', 'view_item', " . json_encode($eventData, JSON_THROW_ON_ERROR) . ");";
}
- $collection = Mage::getResourceModel('sales/order_collection')
- ->addFieldToFilter('entity_id', ['in' => $orderIds]);
- $result = [];
- foreach ($collection as $order) {
- if ($order->getIsVirtual()) {
- $address = $order->getBillingAddress();
- } else {
- $address = $order->getShippingAddress();
+
+ /**
+ * Log this event when the user has been presented with a list of items of a certain category.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events#view_item_list
+ */
+ elseif ($moduleName == 'catalog' && $controllerName == 'category') {
+ $layer = Mage::getSingleton('catalog/layer');
+ $category = $layer->getCurrentCategory();
+ $productCollection = clone $layer->getProductCollection();
+ $productCollection->addAttributeToSelect('sku');
+
+ $toolbarBlock = Mage::app()->getLayout()->getBlock('product_list_toolbar');
+ $pageSize = $toolbarBlock->getLimit();
+ $currentPage = $toolbarBlock->getCurrentPage();
+ if ($pageSize !== 'all') {
+ $productCollection->setPageSize($pageSize)->setCurPage($currentPage);
}
- $result[] = sprintf(
- "_gaq.push(['_addTrans', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s']);",
- $order->getIncrementId(),
- $this->jsQuoteEscape(Mage::app()->getStore()->getFrontendName()),
- $order->getBaseGrandTotal(),
- $order->getBaseTaxAmount(),
- $order->getBaseShippingAmount(),
- $this->jsQuoteEscape(Mage::helper('core')->escapeHtml($address->getCity())),
- $this->jsQuoteEscape(Mage::helper('core')->escapeHtml($address->getRegion())),
- $this->jsQuoteEscape(Mage::helper('core')->escapeHtml($address->getCountry()))
- );
- foreach ($order->getAllVisibleItems() as $item) {
- $result[] = sprintf(
- "_gaq.push(['_addItem', '%s', '%s', '%s', '%s', '%s', '%s']);",
- $order->getIncrementId(),
- $this->jsQuoteEscape($item->getSku()),
- $this->jsQuoteEscape($item->getName()),
- null, // there is no "category" defined for the order item
- $item->getBasePrice(),
- $item->getQtyOrdered()
- );
+ $eventData = [];
+ $eventData['currency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
+ $eventData['value'] = 0.00;
+ $eventData['item_list_id'] = 'category_'.$category->getUrlKey();
+ $eventData['item_list_name'] = $category->getName();
+ $eventData['items'] = [];
+
+ $index = 1;
+ foreach ($productCollection as $key => $productViewed) {
+ $_item = [
+ 'item_id' => $productViewed->getSku(),
+ 'index' => $index,
+ 'item_name' => $productViewed->getName(),
+ 'price' => $helper->formatPrice($productViewed->getFinalPrice()),
+ ];
+ if ($productViewed->getAttributeText('manufacturer')) {
+ $_item['item_brand'] = $productViewed->getAttributeText('manufacturer');
+ }
+ if ($productViewed->getCategory()->getName()) {
+ $_item['item_category'] = $productViewed->getCategory()->getName();
+ }
+ array_push($eventData['items'], $_item);
+ $index++;
+ $eventData['value'] += $productViewed->getFinalPrice();
}
- $result[] = "_gaq.push(['_trackTrans']);";
+ $eventData['value'] = $helper->formatPrice($eventData['value']);
+ $result[] = "gtag('event', 'view_item_list', " . json_encode($eventData, JSON_THROW_ON_ERROR) . ");";
}
- return implode("\n", $result);
- }
- /**
- * Render IP anonymization code for page tracking javascript code
- *
- * @return string
- */
- protected function _getAnonymizationCode()
- {
- if (!Mage::helper('googleanalytics')->isIpAnonymizationEnabled()) {
- return '';
+ /**
+ * This event signifies that a user viewed his cart.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events#view_cart
+ */
+ elseif ($moduleName == 'checkout' && $controllerName == 'cart') {
+ $productCollection = Mage::getSingleton('checkout/session')->getQuote()->getAllItems();
+ $eventData = [];
+ $eventData['currency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
+ $eventData['value'] = 0.00;
+ $eventData['items'] = [];
+
+ foreach ($productCollection as $productInCart) {
+ if ($productInCart->getParentItem()) {
+ continue;
+ }
+ $_product = $productInCart->getProduct();
+ $_item = [
+ 'item_id' => $_product->getSku(),
+ 'item_name' => $_product->getName(),
+ 'price' => $helper->formatPrice($_product->getFinalPrice()),
+ 'quantity' => (int) $productInCart->getQty(),
+ ];
+ if ($_product->getAttributeText('manufacturer')) {
+ $_item['item_brand'] = $_product->getAttributeText('manufacturer');
+ }
+ $itemCategory = $helper->getLastCategoryName($_product);
+ if ($itemCategory) {
+ $_item['item_category'] = $itemCategory;
+ }
+ array_push($eventData['items'], $_item);
+ $eventData['value'] += $_product->getFinalPrice() * $productInCart->getQty();
+ }
+ $eventData['value'] = $helper->formatPrice($eventData['value']);
+ $result[] = "gtag('event', 'view_cart', " . json_encode($eventData, JSON_THROW_ON_ERROR) . ");";
}
- /** @var Mage_GoogleAnalytics_Helper_Data $helper */
- $helper = $this->helper('googleanalytics');
- if ($helper->isUseUniversalAnalytics()) {
- return $this->_getAnonymizationCodeUniversal();
+ /**
+ * This event signifies that a user has begun a checkout.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events#begin_checkout
+ */
+ elseif ($moduleName == static::CHECKOUT_MODULE_NAME && $controllerName == static::CHECKOUT_CONTROLLER_NAME) {
+ $productCollection = Mage::getSingleton('checkout/session')->getQuote()->getAllItems();
+ if ($productCollection) {
+ $eventData = [];
+ $eventData['currency'] = Mage::app()->getStore()->getCurrentCurrencyCode();
+ $eventData['value'] = 0.00;
+ $eventData['items'] = [];
+ foreach ($productCollection as $productInCart) {
+ if ($productInCart->getParentItem()) {
+ continue;
+ }
+ $_product = $productInCart->getProduct();
+ $_item = [
+ 'item_id' => $_product->getSku(),
+ 'item_name' => $_product->getName(),
+ 'price' => $helper->formatPrice($_product->getFinalPrice()),
+ 'quantity' => (int) $productInCart->getQty(),
+ ];
+ if ($_product->getAttributeText('manufacturer')) {
+ $_item['item_brand'] = $_product->getAttributeText('manufacturer');
+ }
+ $itemCategory = $helper->getLastCategoryName($_product);
+ if ($itemCategory) {
+ $_item['item_category'] = $itemCategory;
+ }
+ array_push($eventData['items'], $_item);
+ $eventData['value'] += $_product->getFinalPrice();
+ }
+ $eventData['value'] = $helper->formatPrice($eventData['value']);
+ $result[] = "gtag('event', 'begin_checkout', " . json_encode($eventData, JSON_THROW_ON_ERROR) . ");";
+ }
}
- return $this->_getAnonymizationCodeAnalytics();
- }
+ /**
+ * This event signifies when one or more items is purchased by a user.
+ *
+ * @link https://developers.google.com/tag-platform/gtagjs/reference/events?hl=it#purchase
+ */
+ $orderIds = $this->getOrderIds();
+ if (!empty($orderIds) && is_array($orderIds)) {
+ $collection = Mage::getResourceModel('sales/order_collection')
+ ->addFieldToFilter('entity_id', ['in' => $orderIds]);
+ /** @var Mage_Sales_Model_Order $order */
+ foreach ($collection as $order) {
+ $orderData = [
+ 'currency' => $order->getBaseCurrencyCode(),
+ 'transaction_id' => $order->getIncrementId(),
+ 'value' => $helper->formatPrice($order->getBaseGrandTotal()),
+ 'coupon' => strtoupper((string)$order->getCouponCode()),
+ 'shipping' => $helper->formatPrice($order->getBaseShippingAmount()),
+ 'tax' => $helper->formatPrice($order->getBaseTaxAmount()),
+ 'items' => []
+ ];
- /**
- * Render IP anonymization code for page tracking javascript universal analytics code
- *
- * @return string
- */
- protected function _getAnonymizationCodeUniversal()
- {
- return "ga('set', 'anonymizeIp', true);";
- }
+ /** @var Mage_Sales_Model_Order_Item $item */
+ foreach ($order->getAllItems() as $item) {
+ if ($item->getParentItem()) {
+ continue;
+ }
+ $_product = $item->getProduct();
+ $_item = [
+ 'item_id' => $item->getSku(),
+ 'item_name' => $item->getName(),
+ 'quantity' => (int) $item->getQtyOrdered(),
+ 'price' => $helper->formatPrice($item->getBasePrice()),
+ 'discount' => $helper->formatPrice($item->getBaseDiscountAmount())
+ ];
+ if ($_product->getAttributeText('manufacturer')) {
+ $_item['item_brand'] = $_product->getAttributeText('manufacturer');
+ }
+ $itemCategory = $helper->getLastCategoryName($_product);
+ if ($itemCategory) {
+ $_item['item_category'] = $itemCategory;
+ }
+ array_push($orderData['items'], $_item);
+ }
+ $result[] = "gtag('event', 'purchase', " . json_encode($orderData, JSON_THROW_ON_ERROR) . ");";
+ }
+ }
- /**
- * Render IP anonymization code for page tracking javascript google analytics code
- *
- * @return string
- */
- protected function _getAnonymizationCodeAnalytics()
- {
- return "_gaq.push (['_gat._anonymizeIp']);";
+ if ($this->helper('googleanalytics')->isDebugModeEnabled() && count($result) > 0) {
+ $this->helper('googleanalytics')->log($result);
+ }
+ return implode("\n", $result);
}
/**
- * Is ga available
- *
* @return bool
*/
protected function _isAvailable()
diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Gtm.php b/app/code/core/Mage/GoogleAnalytics/Block/Gtm.php
new file mode 100644
index 00000000000..b1d07dadfbb
--- /dev/null
+++ b/app/code/core/Mage/GoogleAnalytics/Block/Gtm.php
@@ -0,0 +1,44 @@
+isGoogleTagManagerAvailable();
+ }
+
+ /**
+ * Render GA tracking scripts
+ *
+ * @return string
+ */
+ protected function _toHtml()
+ {
+ if (!$this->_isAvailable()) {
+ return '';
+ }
+ return parent::_toHtml();
+ }
+}
diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
index 7cb92cf7528..5079f00e022 100644
--- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
+++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php
@@ -27,7 +27,11 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract
public const XML_PATH_ACTIVE = 'google/analytics/active';
public const XML_PATH_TYPE = 'google/analytics/type';
public const XML_PATH_ACCOUNT = 'google/analytics/account';
- public const XML_PATH_ANONYMIZATION = 'google/analytics/anonymization';
+ public const XML_PATH_DEBUG = 'google/analytics/debug';
+ public const XML_PATH_USERID = 'google/analytics/user_id';
+
+ public const XML_PATH_GTM_ACTIVE = 'google/gtm/active';
+ public const XML_PATH_GTM_CONTAINER_ID = 'google/gtm/container_id';
/**
* @var string google analytics 4
@@ -35,18 +39,21 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract
public const TYPE_ANALYTICS4 = 'analytics4';
/**
- * @var string classic google analytics tracking code
- * @deprecated
+ * @var string
*/
- public const TYPE_ANALYTICS = 'analytics';
+ protected $_moduleName = 'Mage_GoogleAnalytics';
/**
- * @var string google analytics universal tracking code
- * @deprecated
+ * Whether GTM is ready to use
+ *
+ * @param mixed $store
+ * @return bool
*/
- public const TYPE_UNIVERSAL = 'universal';
-
- protected $_moduleName = 'Mage_GoogleAnalytics';
+ public function isGoogleTagManagerAvailable($store = null)
+ {
+ $containerId = Mage::getStoreConfig(self::XML_PATH_GTM_CONTAINER_ID, $store);
+ return $containerId && Mage::getStoreConfigFlag(self::XML_PATH_GTM_ACTIVE, $store);
+ }
/**
* Whether GA is ready to use
@@ -65,10 +72,11 @@ public function isGoogleAnalyticsAvailable($store = null)
*
* @param null|string|bool|int|Mage_Core_Model_Store $store $store
* @return bool
+ * @deprecated
*/
public function isIpAnonymizationEnabled($store = null)
{
- return Mage::getStoreConfigFlag(self::XML_PATH_ANONYMIZATION, $store);
+ return false;
}
/**
@@ -82,6 +90,17 @@ public function getAccountId($store = null)
return Mage::getStoreConfig(self::XML_PATH_ACCOUNT, $store);
}
+ /**
+ * Get GTM account id
+ *
+ * @param string $store
+ * @return string
+ */
+ public function getGoogleTagManagerContainerId($store = null)
+ {
+ return Mage::getStoreConfig(self::XML_PATH_GTM_CONTAINER_ID, $store);
+ }
+
/**
* Returns true if should use Google Universal Analytics
*
@@ -91,7 +110,18 @@ public function getAccountId($store = null)
*/
public function isUseUniversalAnalytics($store = null)
{
- return Mage::getStoreConfig(self::XML_PATH_TYPE, $store) == self::TYPE_UNIVERSAL;
+ return false;
+ }
+
+ /**
+ * Returns true if should use Google Tag Manager
+ *
+ * @param string $store
+ * @return bool
+ */
+ public function isUseGoogleTagManager($store = null)
+ {
+ return Mage::getStoreConfigFlag(self::XML_PATH_GTM_ACTIVE, $store);
}
/**
@@ -104,4 +134,63 @@ public function isUseAnalytics4($store = null)
{
return Mage::getStoreConfig(self::XML_PATH_TYPE, $store) == self::TYPE_ANALYTICS4;
}
+
+ /**
+ * Whether GA Debug Mode is enabled (only for development IP)
+ *
+ * @param null $store
+ * @return bool
+ */
+ public function isDebugModeEnabled($store = null)
+ {
+ return Mage::getStoreConfigFlag(self::XML_PATH_DEBUG, $store) && Mage::helper('core')->isDevAllowed();
+ }
+
+ /**
+ * Log debug message
+ *
+ * @param string $message
+ */
+ public function log($message = null)
+ {
+ $filename = sprintf('google%s.log', Mage::getStoreConfig(self::XML_PATH_TYPE));
+ Mage::log($message, Zend_Log::DEBUG, $filename, true);
+ }
+
+ /**
+ * Whether GA IP Anonymization is enabled
+ *
+ * @param null $store
+ * @return bool
+ */
+ public function isUserIdEnabled($store = null)
+ {
+ return Mage::getStoreConfigFlag(self::XML_PATH_USERID, $store);
+ }
+
+ /**
+ * Returns last category name
+ *
+ * @param Mage_Catalog_Model_Product $product
+ * @return string
+ */
+ public function getLastCategoryName($product): string
+ {
+ $_categoryIds = $product->getCategoryIds();
+ if ($_categoryIds) {
+ $_lastCat = array_pop($_categoryIds);
+ $_cat = Mage::getModel('catalog/category')->load($_lastCat);
+ return $_cat->getName();
+ }
+ return '';
+ }
+
+ /**
+ * @param int|float|string $price
+ * @return string
+ */
+ public function formatPrice($price): string
+ {
+ return number_format($price, 2, '.', '');
+ }
}
diff --git a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
index 341f29b21cc..411b6941ee6 100644
--- a/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
+++ b/app/code/core/Mage/GoogleAnalytics/Model/Observer.php
@@ -21,18 +21,6 @@
*/
class Mage_GoogleAnalytics_Model_Observer
{
- /**
- * Create Google Analytics block for success page view
- *
- * @deprecated after 1.3.2.3 Use setGoogleAnalyticsOnOrderSuccessPageView() method instead
- * @param Varien_Event_Observer $observer
- */
- // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
- public function order_success_page_view($observer)
- {
- $this->setGoogleAnalyticsOnOrderSuccessPageView($observer);
- }
-
/**
* Add order information into GA block to render on checkout success pages
*
@@ -49,4 +37,67 @@ public function setGoogleAnalyticsOnOrderSuccessPageView(Varien_Event_Observer $
$block->setOrderIds($orderIds);
}
}
+
+ /**
+ * Process items added or removed from cart for GA4 block to render event on cart view
+ * @param Varien_Event_Observer $observer
+ * @return void
+ */
+ public function processItemsAddedOrRemovedFromCart(Varien_Event_Observer $observer): void
+ {
+ /** @var Mage_Sales_Model_Quote_Item $item */
+ $item = $observer->getEvent()->getItem();
+ if ($item->getParentItem()) {
+ return;
+ }
+
+ // avoid to process the same quote_item more than once
+ // this could happen in case of double save of the same quote_item
+ $processedProductsRegistry = Mage::registry('processed_quote_items_for_analytics') ?? new ArrayObject();
+ if ($processedProductsRegistry->offsetExists($item->getId())) {
+ return;
+ }
+ $processedProductsRegistry[$item->getId()] = true;
+ Mage::register('processed_quote_items_for_analytics', $processedProductsRegistry, true);
+
+ $addedQty = 0;
+ $removedQty = 0;
+ if ($item->isObjectNew()) {
+ $addedQty = $item->getQty();
+ } elseif ($item->isDeleted()) {
+ $removedQty = $item->getQty();
+ } elseif ($item->hasDataChanges()) {
+ $newQty = $item->getQty();
+ $oldQty = $item->getOrigData('qty');
+ if ($newQty > $oldQty) {
+ $addedQty = $newQty - $oldQty;
+ } elseif ($newQty < $oldQty) {
+ $removedQty = $oldQty - $newQty;
+ }
+ }
+
+ if ($addedQty || $removedQty) {
+ $product = $item->getProduct();
+ $dataForAnalytics = [
+ 'id' => $product->getId(),
+ 'sku' => $product->getSku(),
+ 'name' => $product->getName(),
+ 'qty' => $addedQty ?: $removedQty,
+ 'price' => $product->getFinalPrice(),
+ 'manufacturer' => $product->getAttributeText('manufacturer') ?: '',
+ 'category' => Mage::helper('googleanalytics')->getLastCategoryName($product)
+ ];
+
+ $session = Mage::getSingleton('core/session');
+ if ($addedQty) {
+ $addedProducts = $session->getAddedProductsForAnalytics() ?: [];
+ $addedProducts[] = $dataForAnalytics;
+ $session->setAddedProductsForAnalytics($addedProducts);
+ } else {
+ $removedProducts = $session->getRemovedProductsForAnalytics() ?: [];
+ $removedProducts[] = $dataForAnalytics;
+ $session->setRemovedProductsForAnalytics($removedProducts);
+ }
+ }
+ }
}
diff --git a/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php b/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php
index fe55276cc49..d4b76e9511b 100644
--- a/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php
+++ b/app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php
@@ -32,14 +32,6 @@ public function toOptionArray()
[
'value' => Mage_GoogleAnalytics_Helper_Data::TYPE_ANALYTICS4,
'label' => Mage::helper('googleanalytics')->__('Google Analytics 4')
- ],
- [
- 'value' => Mage_GoogleAnalytics_Helper_Data::TYPE_ANALYTICS,
- 'label' => Mage::helper('googleanalytics')->__('Google Analytics')
- ],
- [
- 'value' => Mage_GoogleAnalytics_Helper_Data::TYPE_UNIVERSAL,
- 'label' => Mage::helper('googleanalytics')->__('Universal Analytics')
]
];
}
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/config.xml b/app/code/core/Mage/GoogleAnalytics/etc/config.xml
index 5af53d94f74..d4e605dde6e 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/config.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/config.xml
@@ -72,6 +72,22 @@
+
+
+
+ googleanalytics/observer
+ processItemsAddedOrRemovedFromCart
+
+
+
+
+
+
+ googleanalytics/observer
+ processItemsAddedOrRemovedFromCart
+
+
+
diff --git a/app/code/core/Mage/GoogleAnalytics/etc/system.xml b/app/code/core/Mage/GoogleAnalytics/etc/system.xml
index 64120809aa6..6c35dee2553 100644
--- a/app/code/core/Mage/GoogleAnalytics/etc/system.xml
+++ b/app/code/core/Mage/GoogleAnalytics/etc/system.xml
@@ -24,6 +24,31 @@
11
+
+
+ 10
+ 1
+ 1
+ 1
+
+
+
+ select
+ adminhtml/system_config_source_yesno
+ 10
+ 1
+ 1
+ 1
+
+
+
+ 20
+ 1
+ 1
+ 1
+
+
+ 10
@@ -57,15 +82,32 @@
11
-
-
+
+
+ select
+ adminhtml/system_config_source_yesno
+ 21
+ 1
+ 1
+ 1
+ Enable GA4 User_id tracking for logged in customers.
+
+ analytics4
+
+
+
+
selectadminhtml/system_config_source_yesno
- 30
+ 22111
-
+ Enable GA4 Debug Real Time view for Development IP.
+
+ analytics4
+
+
diff --git a/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php b/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php
deleted file mode 100644
index fed1755fc03..00000000000
--- a/app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php
+++ /dev/null
@@ -1,25 +0,0 @@
-startSetup();
-
-$installer->run("INSERT INTO `{$this->getTable('core/config_data')}` (scope, scope_id, path, value)"
- . " SELECT scope, scope_id, 'google/analytics/type', 'analytics'"
- . " FROM `{$this->getTable('core/config_data')}`"
- . " WHERE path = 'google/analytics/active' AND value = '1'");
-
-$installer->endSetup();
diff --git a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php
index 29f0271ffc8..219ccc1dabd 100644
--- a/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php
+++ b/app/code/core/Mage/Index/Model/Resource/Lock/Resource.php
@@ -103,7 +103,7 @@ public function getConnection($name, $extendConfigWith = '')
*/
protected function _getDefaultConnection($requiredConnectionName, $extendConfigWith = '')
{
- if (strpos($requiredConnectionName, 'read') !== false) {
+ if (str_contains($requiredConnectionName, 'read')) {
return $this->getConnection(self::DEFAULT_READ_RESOURCE, $extendConfigWith);
}
return $this->getConnection(self::DEFAULT_WRITE_RESOURCE, $extendConfigWith);
diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php
index 058c8502bad..b985a0fd3ad 100644
--- a/app/code/core/Mage/Install/Model/Installer.php
+++ b/app/code/core/Mage/Install/Model/Installer.php
@@ -222,7 +222,7 @@ public function createAdministrator($data)
//to support old logic checking if real data was passed
if (is_array($data)) {
$data = $this->validateAndPrepareAdministrator($data);
- if (is_array(data)) {
+ if (is_array($data)) {
throw new Exception(Mage::helper('install')->__('Please correct the user data and try again.'));
}
}
diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php
index 1dd677ff386..e913a93a68b 100644
--- a/app/code/core/Mage/Media/Model/File/Image.php
+++ b/app/code/core/Mage/Media/Model/File/Image.php
@@ -80,7 +80,7 @@ public function delete(Mage_Media_Model_Image $object)
* Create image resource for operation from file
*
* @param Mage_Media_Model_Image $object
- * @return bool|false|resource
+ * @return false|GdImage|resource
* @throws Mage_Core_Exception
*/
public function getImage(Mage_Media_Model_Image $object)
@@ -112,7 +112,7 @@ public function getImage(Mage_Media_Model_Image $object)
* Create tmp image resource for operations
*
* @param Mage_Media_Model_Image $object
- * @return resource
+ * @return false|GdImage|resource
*/
public function getTmpImage(Mage_Media_Model_Image $object)
{
diff --git a/app/code/core/Mage/Media/Model/Image.php b/app/code/core/Mage/Media/Model/Image.php
index 698198b0dd7..2258e0fbd52 100644
--- a/app/code/core/Mage/Media/Model/Image.php
+++ b/app/code/core/Mage/Media/Model/Image.php
@@ -250,7 +250,7 @@ public function getSpecialLink($file, $size, $extension = null, $watermark = nul
$this->addParam('extension', $extension);
if (!$this->hasSpecialImage()) {
- if (strpos($size, 'x') !== false) {
+ if (str_contains($size, 'x')) {
list($width, $height) = explode('x', $size);
} else {
$width = $size;
diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
index 1dbf6f7de6e..94d5a24e8ab 100644
--- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -177,7 +177,7 @@ public function showStoreInfo()
*/
public function _getFieldTableAlias($field)
{
- if (strpos($field, 'customer') === 0) {
+ if (str_starts_with($field, 'customer')) {
return $field . '_table.value';
}
diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php
index b8cee834648..e629bbb5afb 100644
--- a/app/code/core/Mage/Oauth/Model/Server.php
+++ b/app/code/core/Mage/Oauth/Model/Server.php
@@ -219,7 +219,7 @@ protected function _fetchParams()
}
$contentTypeHeader = $this->_request->getHeader(Zend_Http_Client::CONTENT_TYPE);
- if ($contentTypeHeader && strpos($contentTypeHeader, Zend_Http_Client::ENC_URLENCODED) === 0) {
+ if ($contentTypeHeader && str_starts_with($contentTypeHeader, Zend_Http_Client::ENC_URLENCODED)) {
$protocolParamsNotSet = !$this->_protocolParams;
parse_str($this->_request->getRawBody(), $bodyParams);
diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
index 6914471f929..1e51d84dbb9 100644
--- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
+++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/Admin/TokenController.php
@@ -155,6 +155,6 @@ protected function _isAllowed()
{
/** @var Mage_Admin_Model_Session $session */
$session = Mage::getSingleton('admin/session');
- return $session->isAllowed('system/acl/admin_token');
+ return $session->isAllowed('system/api/oauth_admin_token');
}
}
diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
index 55b0e372bc9..d6a1b9e84c6 100644
--- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
+++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/AuthorizedTokensController.php
@@ -149,7 +149,7 @@ protected function _isAllowed()
{
/** @var Mage_Admin_Model_Session $session */
$session = Mage::getSingleton('admin/session');
- return $session->isAllowed('system/oauth/authorizedTokens');
+ return $session->isAllowed('system/api/oauth_authorized_tokens');
}
/**
diff --git a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
index fbf8056771d..bc25301639d 100644
--- a/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
+++ b/app/code/core/Mage/Oauth/controllers/Adminhtml/Oauth/ConsumerController.php
@@ -240,7 +240,7 @@ protected function _isAllowed()
}
/** @var Mage_Admin_Model_Session $session */
$session = Mage::getSingleton('admin/session');
- return $session->isAllowed('system/oauth/consumer' . $action);
+ return $session->isAllowed('system/api/oauth_consumer' . $action);
}
/**
diff --git a/app/code/core/Mage/Oauth/data/oauth_setup/upgrade-1.0.0.0-1.0.0.1.php b/app/code/core/Mage/Oauth/data/oauth_setup/upgrade-1.0.0.0-1.0.0.1.php
new file mode 100644
index 00000000000..fd764978c23
--- /dev/null
+++ b/app/code/core/Mage/Oauth/data/oauth_setup/upgrade-1.0.0.0-1.0.0.1.php
@@ -0,0 +1,35 @@
+startSetup();
+
+$table = $installer->getTable('admin/rule');
+$resourceIds = [
+ 'admin/system/api/consumer' => 'admin/system/api/oauth_consumer',
+ 'admin/system/api/consumer/delete' => 'admin/system/api/oauth_consumer/delete',
+ 'admin/system/api/consumer/edit' => 'admin/system/api/oauth_consumer/edit',
+ 'admin/system/api/authorizedTokens' => 'admin/system/api/oauth_authorized_tokens'
+];
+
+foreach ($resourceIds as $oldId => $newId) {
+ $installer->getConnection()->update(
+ $table,
+ ['resource_id' => $newId],
+ ['resource_id = ?' => $oldId]
+ );
+}
+
+$installer->endSetup();
diff --git a/app/code/core/Mage/Oauth/etc/adminhtml.xml b/app/code/core/Mage/Oauth/etc/adminhtml.xml
index 1e6ea5d4ed0..dc2f3c02664 100644
--- a/app/code/core/Mage/Oauth/etc/adminhtml.xml
+++ b/app/code/core/Mage/Oauth/etc/adminhtml.xml
@@ -23,7 +23,7 @@
-
+ OAuth Consumers20
@@ -36,11 +36,11 @@
40
-
-
+
+ OAuth Authorized Tokens30
-
+
OAuth Admin My Apps40
diff --git a/app/code/core/Mage/Oauth/etc/config.xml b/app/code/core/Mage/Oauth/etc/config.xml
index d1745e635aa..ccf844d1660 100644
--- a/app/code/core/Mage/Oauth/etc/config.xml
+++ b/app/code/core/Mage/Oauth/etc/config.xml
@@ -17,7 +17,7 @@
- 1.0.0.0
+ 1.0.0.1
diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
index d0769e14396..c23b5bc4d24 100644
--- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
+++ b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
@@ -41,7 +41,7 @@ protected function _toHtml()
}
$includeFilePath = realpath(Mage::getBaseDir('design') . DS . $this->getTemplateFile());
- if (strpos($this->getTemplateFile(), '..') === false) {
+ if (!str_contains($this->getTemplateFile(), '..')) {
$this->_templateFile = $includeFilePath;
} else {
throw new Exception('Not valid template file:' . $this->_templateFile);
diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php
index 5e8155de7c5..be0ade494a1 100644
--- a/app/code/core/Mage/Payment/Model/Method/Cc.php
+++ b/app/code/core/Mage/Payment/Model/Method/Cc.php
@@ -234,7 +234,7 @@ public function validateCcNum($ccNumber)
$numSum = 0;
for ($i = 0; $i < strlen($cardNumber); $i++) {
- $currentNum = substr($cardNumber, $i, 1);
+ $currentNum = (int)substr($cardNumber, $i, 1);
/**
* Double every second digit
diff --git a/app/code/core/Mage/Paypal/Model/Cart.php b/app/code/core/Mage/Paypal/Model/Cart.php
index f14b258b307..27c3baccdfe 100644
--- a/app/code/core/Mage/Paypal/Model/Cart.php
+++ b/app/code/core/Mage/Paypal/Model/Cart.php
@@ -435,7 +435,7 @@ protected function _addRegularItem(Varien_Object $salesItem)
if ($this->_salesEntity instanceof Mage_Sales_Model_Order) {
$qty = (int) $salesItem->getQtyOrdered();
$amount = (float) $salesItem->getBasePrice();
- // TODO: nominal item for order
+ // TODO: nominal item for order
} else {
$qty = (int) $salesItem->getTotalQty();
$amount = $salesItem->isNominal() ? 0 : (float) $salesItem->getBaseCalculationPrice();
diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php
index 2e5a1ea2550..aaddaa7ce89 100644
--- a/app/code/core/Mage/Paypal/Model/Ipn.php
+++ b/app/code/core/Mage/Paypal/Model/Ipn.php
@@ -559,7 +559,7 @@ protected function _registerPaymentRefund()
->setTransactionId($this->getRequestData('txn_id'))
->setParentTransactionId($this->getRequestData('parent_txn_id'))
->setIsTransactionClosed($isRefundFinal)
- ->registerRefundNotification(-1 * $this->getRequestData('mc_gross'));
+ ->registerRefundNotification(-1 * (float)$this->getRequestData('mc_gross'));
$this->_order->addStatusHistoryComment($comment, false);
$this->_order->save();
diff --git a/app/code/core/Mage/ProductAlert/Helper/Data.php b/app/code/core/Mage/ProductAlert/Helper/Data.php
index cd0b6b604de..a82cdde1472 100644
--- a/app/code/core/Mage/ProductAlert/Helper/Data.php
+++ b/app/code/core/Mage/ProductAlert/Helper/Data.php
@@ -93,7 +93,7 @@ public function createBlock($block)
{
$error = Mage::helper('core')->__('Invalid block type: %s', $block);
if (is_string($block)) {
- if (strpos($block, '/') !== false) {
+ if (str_contains($block, '/')) {
if (!$block = Mage::getConfig()->getBlockClassName($block)) {
Mage::throwException($error);
}
diff --git a/app/code/core/Mage/Reports/etc/config.xml b/app/code/core/Mage/Reports/etc/config.xml
index d07b18a00a3..c3de0daf8a2 100644
--- a/app/code/core/Mage/Reports/etc/config.xml
+++ b/app/code/core/Mage/Reports/etc/config.xml
@@ -199,13 +199,16 @@
1,11
+
+ 0 0 * * *
+
- 0 0 * * *
+ reports/crontab/viewed_exprreports/observer::aggregateReportsReportProductViewedData
diff --git a/app/code/core/Mage/Reports/etc/system.xml b/app/code/core/Mage/Reports/etc/system.xml
index 9c7d9c8c3f6..3278ba6bec4 100644
--- a/app/code/core/Mage/Reports/etc/system.xml
+++ b/app/code/core/Mage/Reports/etc/system.xml
@@ -106,6 +106,23 @@
+
+
+ 3
+ 1
+ 0
+ 0
+
+
+
+ 800
+ 1
+ 0
+ 0
+ Most Viewed Products Report
+
+
+
diff --git a/app/code/core/Mage/Rule/Block/Editable.php b/app/code/core/Mage/Rule/Block/Editable.php
index ad97092b114..002f3748a6f 100644
--- a/app/code/core/Mage/Rule/Block/Editable.php
+++ b/app/code/core/Mage/Rule/Block/Editable.php
@@ -46,8 +46,9 @@ public function render(Varien_Data_Form_Element_Abstract $element)
$translate = Mage::getSingleton('core/translate_inline');
- $html .= $translate->isAllowed() ? Mage::helper('core')->escapeHtml($valueName) :
- Mage::helper('core')->escapeHtml(Mage::helper('core/string')->truncate($valueName, 33, '...'));
+ $html .= $translate->isAllowed()
+ ? Mage::helper('core')->escapeHtml($valueName)
+ : Mage::helper('core')->escapeHtml(Mage::helper('core/string')->truncate($valueName, 100, '...'));
$html .= ' ' . $element->getElementHtml();
diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php
index 220ec819388..d3919683542 100644
--- a/app/code/core/Mage/Rule/Model/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Abstract.php
@@ -319,10 +319,7 @@ protected function _convertFlatToRecursive(array $data)
$path = explode('--', $id);
$node =& $arr;
for ($i = 0, $l = count($path); $i < $l; $i++) {
- if (!isset($node[$key][$path[$i]])) {
- $node[$key][$path[$i]] = [];
- }
- $node =& $node[$key][$path[$i]];
+ $node =& $node[$key][$path[$i]] ?? [];
}
foreach ($data as $k => $v) {
$node[$k] = $v;
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index 2cd594eee09..46a6f10d4d8 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -577,7 +577,7 @@ public function getValueElementType()
*/
public function getValueElementRenderer()
{
- if (strpos($this->getValueElementType(), '/') !== false) {
+ if (str_contains($this->getValueElementType(), '/')) {
return Mage::getBlockSingleton($this->getValueElementType());
}
return Mage::getBlockSingleton('rule/editable');
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php
index b59f807ecae..2d2f0f702d6 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Report/Filter/Form.php
@@ -38,7 +38,7 @@ protected function _prepareForm()
$statuses = Mage::getModel('sales/order_config')->getStatuses();
$values = [];
foreach ($statuses as $code => $label) {
- if (strpos($code, 'pending') === false) {
+ if (!str_contains($code, 'pending')) {
$values[] = [
'label' => Mage::helper('reports')->__($label),
'value' => $code
diff --git a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php
index f6ed7158972..c5405f1eee5 100644
--- a/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php
+++ b/app/code/core/Mage/Sales/Model/Api2/Order/Comment/Rest/Admin/V1.php
@@ -21,4 +21,68 @@
*/
class Mage_Sales_Model_Api2_Order_Comment_Rest_Admin_V1 extends Mage_Sales_Model_Api2_Order_Comment_Rest
{
+ /**
+ * Add comment to order
+ *
+ * @param array $data
+ * @return string
+ */
+ protected function _create(array $data)
+ {
+ $orderId = $this->getRequest()->getParam(self::PARAM_ORDER_ID);
+ $order = $this->_loadOrderById($orderId);
+
+ $status = $data['status'] ?? false;
+ $comment = $data['comment'] ?? '';
+ $visibleOnFront = $data['is_visible_on_front'] ?? 0;
+ $notifyCustomer = array_key_exists('is_customer_notified', $data) ? $data['is_customer_notified'] : false;
+
+ $historyItem = $order->addStatusHistoryComment($comment, $status);
+ $historyItem->setIsCustomerNotified($notifyCustomer)
+ ->setIsVisibleOnFront((int) $visibleOnFront)
+ ->save();
+
+ try {
+ $oldStore = Mage::getDesign()->getStore();
+ $oldArea = Mage::getDesign()->getArea();
+
+ if ($notifyCustomer && $comment) {
+ Mage::getDesign()->setStore($order->getStoreId());
+ Mage::getDesign()->setArea('frontend');
+ }
+
+ $order->save();
+ $order->sendOrderUpdateEmail((bool) $notifyCustomer, $comment);
+
+ if ($notifyCustomer && $comment) {
+ Mage::getDesign()->setStore($oldStore);
+ Mage::getDesign()->setArea($oldArea);
+ }
+ } catch (Mage_Core_Exception $e) {
+ $this->_critical($e->getMessage(), self::RESOURCE_INTERNAL_ERROR);
+ } catch (Throwable $t) {
+ Mage::logException($t);
+ $this->_critical($t->getMessage(), self::RESOURCE_UNKNOWN_ERROR);
+ }
+
+ return $this->_getLocation($historyItem);
+ }
+
+ /**
+ * Retrieve order comment by id
+ *
+ * @return array
+ */
+ protected function _retrieve()
+ {
+ $comment = Mage::getModel('sales/order_status_history')->load(
+ $this->getRequest()->getParam(self::PARAM_COMMENT_ID)
+ );
+
+ if (!$comment->getId()) {
+ $this->_critical(self::RESOURCE_NOT_FOUND);
+ }
+
+ return $comment->getData();
+ }
}
diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php
index 53398f05dd2..eba17cfd3d6 100644
--- a/app/code/core/Mage/Sales/Model/Observer.php
+++ b/app/code/core/Mage/Sales/Model/Observer.php
@@ -38,17 +38,19 @@ class Mage_Sales_Model_Observer
public function cleanExpiredQuotes($schedule)
{
Mage::dispatchEvent('clear_expired_quotes_before', ['sales_observer' => $this]);
-
$lifetimes = Mage::getConfig()->getStoresConfigByPath('checkout/cart/delete_quote_after');
- foreach ($lifetimes as $storeId => $lifetime) {
- $lifetime = (int)$lifetime * 86400;
- /** @var Mage_Sales_Model_Resource_Quote_Collection $quotes */
- $quotes = Mage::getModel('sales/quote')->getCollection();
+ foreach ($lifetimes as $storeId => $day) {
+ $day = (int) $day;
+ $lifetime = 86400 * $day;
+ /** @var Mage_Sales_Model_Resource_Quote_Collection $quotes */
+ $quotes = Mage::getResourceModel('sales/quote_collection');
$quotes->addFieldToFilter('store_id', $storeId);
- $quotes->addFieldToFilter('updated_at', ['to' => date("Y-m-d", time() - $lifetime)]);
- $quotes->addFieldToFilter('is_active', 0);
+ $quotes->addFieldToFilter('updated_at', ['to' => date('Y-m-d', time() - $lifetime)]);
+ if ($day == 0) {
+ $quotes->addFieldToFilter('is_active', 0);
+ }
foreach ($this->getExpireQuotesAdditionalFilterFields() as $field => $condition) {
$quotes->addFieldToFilter($field, $condition);
@@ -56,6 +58,7 @@ public function cleanExpiredQuotes($schedule)
$quotes->walk('delete');
}
+
return $this;
}
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 0e4886d6d4d..8ef66866d32 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -1358,6 +1358,29 @@ public function getShippingMethod($asObject = false)
}
}
+ /**
+ * Get the current customer email.
+ *
+ * @return string
+ */
+ public function getCurrentCustomerEmail()
+ {
+ if (!$this->getData('current_customer_email')) {
+ if ($this->getCustomer()) {
+ $email = $this->getCustomer()->getEmail();
+ } elseif ($this->getCustomerId()) {
+ $email = Mage::getResourceSingleton('customer/customer')->getEmail($this->getCustomerId());
+ }
+ // Guest checkout or customer was deleted.
+ if (empty($email)) {
+ $email = $this->getCustomerEmail();
+ }
+ $this->setData('current_customer_email', $email);
+ }
+
+ return $this->getData('current_customer_email');
+ }
+
/**
* Queue email with new order data
*
@@ -1417,7 +1440,7 @@ public function queueNewOrderEmail($forceMode = false)
$mailer = Mage::getModel('core/email_template_mailer');
/** @var Mage_Core_Model_Email_Info $emailInfo */
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($this->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($this->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod == 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
@@ -1509,7 +1532,7 @@ public function queueOrderUpdateEmail($notifyCustomer = true, $comment = '', $fo
if ($notifyCustomer) {
/** @var Mage_Core_Model_Email_Info $emailInfo */
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($this->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($this->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod == 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
index 8c9c6e5ae9d..7f826a74af7 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
@@ -798,7 +798,7 @@ public function sendEmail($notifyCustomer = true, $comment = '')
$mailer = Mage::getModel('core/email_template_mailer');
if ($notifyCustomer) {
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($order->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($order->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod === 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
@@ -873,7 +873,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
$mailer = Mage::getModel('core/email_template_mailer');
if ($notifyCustomer) {
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($order->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($order->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod === 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php
index 13ea6634f40..f0af543c235 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php
@@ -830,7 +830,7 @@ public function sendEmail($notifyCustomer = true, $comment = '')
$mailer = Mage::getModel('core/email_template_mailer');
if ($notifyCustomer) {
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($order->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($order->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod == 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
@@ -905,7 +905,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
$mailer = Mage::getModel('core/email_template_mailer');
if ($notifyCustomer) {
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($order->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($order->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod == 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php
index 3bcff32a721..91d69a94219 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php
@@ -473,7 +473,7 @@ public function sendEmail($notifyCustomer = true, $comment = '')
$mailer = Mage::getModel('core/email_template_mailer');
if ($notifyCustomer) {
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($order->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($order->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod == 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
@@ -543,7 +543,7 @@ public function sendUpdateEmail($notifyCustomer = true, $comment = '')
$mailer = Mage::getModel('core/email_template_mailer');
if ($notifyCustomer) {
$emailInfo = Mage::getModel('core/email_info');
- $emailInfo->addTo($order->getCustomerEmail(), $customerName);
+ $emailInfo->addTo($order->getCurrentCustomerEmail(), $customerName);
if ($copyTo && $copyMethod == 'bcc') {
// Add bcc to customer email
foreach ($copyTo as $email) {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php
index b3ca22dc0b2..60bcfa76a41 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address.php
@@ -427,6 +427,9 @@ public function setQuote(Mage_Sales_Model_Quote $quote)
*/
public function getQuote()
{
+ if (is_null($this->_quote)) {
+ $this->_quote = Mage::getModel('sales/quote')->load($this->getQuoteId());
+ }
return $this->_quote;
}
@@ -1167,8 +1170,12 @@ public function validateMinimumAmount()
*/
public function getAppliedTaxes()
{
+ $tax = $this->getData('applied_taxes');
+ if (empty($tax)) {
+ return [];
+ }
try {
- $return = Mage::helper('core/unserializeArray')->unserialize($this->getData('applied_taxes'));
+ $return = Mage::helper('core/unserializeArray')->unserialize($tax);
} catch (Exception $e) {
$return = [];
}
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php
index 0001e7c0332..08206170b31 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item.php
@@ -272,6 +272,9 @@ public function setQuote(Mage_Sales_Model_Quote $quote)
*/
public function getQuote()
{
+ if (is_null($this->_quote)) {
+ $this->_quote = Mage::getModel('sales/quote')->load($this->getQuoteId());
+ }
return $this->_quote;
}
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
index 9aa86705968..e925e9a7f6c 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
@@ -83,7 +83,7 @@ public function addItemFilter($item)
if (empty($item)) {
$this->_totalRecords = 0;
$this->_setIsLoaded(true);
- //$this->addFieldToFilter('item_id', '');
+ //$this->addFieldToFilter('item_id', '');
} elseif (is_array($item)) {
$this->addFieldToFilter('item_id', ['in' => $item]);
} elseif ($item instanceof Mage_Sales_Model_Quote_Item) {
diff --git a/app/code/core/Mage/Sales/controllers/DownloadController.php b/app/code/core/Mage/Sales/controllers/DownloadController.php
index 89c39a4583c..95a6cdd6312 100644
--- a/app/code/core/Mage/Sales/controllers/DownloadController.php
+++ b/app/code/core/Mage/Sales/controllers/DownloadController.php
@@ -160,7 +160,7 @@ public function downloadCustomOptionAction()
}
$optionId = null;
- if (strpos($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX) === 0) {
+ if (str_starts_with($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX)) {
$optionId = str_replace(Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX, '', $option->getCode());
if (!is_numeric($optionId)) {
$optionId = null;
diff --git a/app/code/core/Mage/Sales/etc/config.xml b/app/code/core/Mage/Sales/etc/config.xml
index b362010f0b1..a0c6d6d9607 100644
--- a/app/code/core/Mage/Sales/etc/config.xml
+++ b/app/code/core/Mage/Sales/etc/config.xml
@@ -1703,6 +1703,15 @@
0
+
+
+ 0 0 * * *
+ 0 0 * * *
+ 0 0 * * *
+ 0 0 * * *
+ 0 0 * * *
+
+
@@ -1716,7 +1725,7 @@
- 0 0 * * *
+ reports/crontab/sales_exprsales/observer::aggregateSalesReportOrderData
@@ -1724,7 +1733,7 @@
- 0 0 * * *
+ reports/crontab/shipping_exprsales/observer::aggregateSalesReportShipmentData
@@ -1732,7 +1741,7 @@
- 0 0 * * *
+ reports/crontab/invoiced_exprsales/observer::aggregateSalesReportInvoicedData
@@ -1740,7 +1749,7 @@
- 0 0 * * *
+ reports/crontab/refunded_exprsales/observer::aggregateSalesReportRefundedData
@@ -1748,7 +1757,7 @@
- 0 0 * * *
+ reports/crontab/bestsellers_exprsales/observer::aggregateSalesReportBestsellersData
diff --git a/app/code/core/Mage/Sales/etc/system.xml b/app/code/core/Mage/Sales/etc/system.xml
index c0cabfe00a8..3336908b870 100644
--- a/app/code/core/Mage/Sales/etc/system.xml
+++ b/app/code/core/Mage/Sales/etc/system.xml
@@ -819,5 +819,58 @@
+
+
+
+
+
+
+ text
+ 100
+ 1
+ 0
+ 0
+ Total Ordered Report
+
+
+
+ text
+ 300
+ 1
+ 0
+ 0
+ Total Shipped Report
+
+
+
+ text
+ 400
+ 1
+ 0
+ 0
+ Total Invoiced VS Paid Report
+
+
+
+ text
+ 500
+ 1
+ 0
+ 0
+ Total Refunded Report
+
+
+
+ text
+ 700
+ 1
+ 0
+ 0
+ Products Bestsellers Report
+
+
+
+
+
diff --git a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php
index 5283bef0fdf..4b48c3ba993 100644
--- a/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php
+++ b/app/code/core/Mage/SalesRule/Model/Rule/Condition/Product/Combine.php
@@ -56,7 +56,7 @@ protected function _getHelper()
*/
protected function _getIsQuoteItemAttribute($attributeCode)
{
- return strpos($attributeCode, 'quote_item_') === 0;
+ return str_starts_with($attributeCode, 'quote_item_');
}
/**
diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml
index 9ae259337ee..0fdf8b999f2 100644
--- a/app/code/core/Mage/SalesRule/etc/config.xml
+++ b/app/code/core/Mage/SalesRule/etc/config.xml
@@ -203,7 +203,7 @@
- 0 0 * * *
+ reports/crontab/coupons_exprsalesrule/observer::aggregateSalesReportCouponsData
@@ -218,5 +218,10 @@
1
+
+
+ 0 0 * * *
+
+
diff --git a/app/code/core/Mage/SalesRule/etc/system.xml b/app/code/core/Mage/SalesRule/etc/system.xml
index e920f918eda..e8b1831c38c 100644
--- a/app/code/core/Mage/SalesRule/etc/system.xml
+++ b/app/code/core/Mage/SalesRule/etc/system.xml
@@ -75,5 +75,22 @@
+
+
+
+
+
+
+ text
+ 600
+ 1
+ 0
+ 0
+ Promotion Coupons Usage Report
+
+
+
+
+
diff --git a/app/code/core/Mage/Tax/Model/Resource/Calculation.php b/app/code/core/Mage/Tax/Model/Resource/Calculation.php
index e118cc86e5c..e61138bcfad 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Calculation.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Calculation.php
@@ -26,14 +26,14 @@ class Mage_Tax_Model_Resource_Calculation extends Mage_Core_Model_Resource_Db_Ab
*
* @var array
*/
- protected $_ratesCache = [];
+ protected $_ratesCache = [];
/**
* Primery key auto increment flag
*
* @var bool
*/
- protected $_isPkAutoIncrement = false;
+ protected $_isPkAutoIncrement = false;
protected function _construct()
{
@@ -81,8 +81,8 @@ public function getRateInfo($request)
{
$rates = $this->_getRates($request);
return [
- 'process' => $this->getCalculationProcess($request, $rates),
- 'value' => $this->_calculateRate($rates)
+ 'process' => $this->getCalculationProcess($request, $rates),
+ 'value' => $this->_calculateRate($rates),
];
}
@@ -235,7 +235,7 @@ protected function _getRates($request)
$customerClassId = $request->getCustomerClassId();
$countryId = $request->getCountryId();
$regionId = $request->getRegionId();
- $postcode = trim($request->getPostcode());
+ $postcode = trim((string)$request->getPostcode());
// Process productClassId as it can be array or usual value. Form best key for cache.
$productClassId = $request->getProductClassId();
diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml
index ae7a09ca59b..736c5e49f80 100644
--- a/app/code/core/Mage/Tax/etc/config.xml
+++ b/app/code/core/Mage/Tax/etc/config.xml
@@ -291,12 +291,17 @@
https://web.archive.org/web/20150315064836/https://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc
+
+
+ 0 0 * * *
+
+
- 0 0 * * *
+ reports/crontab/tax_exprtax/observer::aggregateSalesReportTaxData
diff --git a/app/code/core/Mage/Tax/etc/system.xml b/app/code/core/Mage/Tax/etc/system.xml
index 5b1b6bf6bc9..87f1779b1a1 100644
--- a/app/code/core/Mage/Tax/etc/system.xml
+++ b/app/code/core/Mage/Tax/etc/system.xml
@@ -261,7 +261,7 @@
11
-
+ selectadminhtml/system_config_source_yesno
@@ -336,7 +336,7 @@
11
-
+ selectadminhtml/system_config_source_yesno
@@ -349,5 +349,22 @@
+
+
+
+
+
+
+ text
+ 200
+ 1
+ 0
+ 0
+ Order Taxes Report Grouped by Tax Rates
+
+
+
+
+
diff --git a/app/code/core/Mage/Uploader/Helper/File.php b/app/code/core/Mage/Uploader/Helper/File.php
index c256683d557..236adfbedb6 100644
--- a/app/code/core/Mage/Uploader/Helper/File.php
+++ b/app/code/core/Mage/Uploader/Helper/File.php
@@ -717,7 +717,7 @@ public function getDataMaxSize()
public function getDataMaxSizeInBytes()
{
$iniSize = $this->getDataMaxSize();
- $size = substr($iniSize, 0, -1);
+ $size = (int)substr($iniSize, 0, -1);
$parsedSize = 0;
switch (strtolower(substr($iniSize, strlen($iniSize) - 1))) {
case 't':
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
index eb2a59c7ec2..0dce39492e6 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -305,9 +305,6 @@ public function getResult()
protected function _getQuotes()
{
switch ($this->getConfigData('type')) {
- case 'UPS':
- return $this->_getCgiQuotes();
-
case 'UPS_XML':
return $this->_getXmlQuotes();
}
@@ -1058,9 +1055,7 @@ public function getTracking($trackings)
$trackings = [$trackings];
}
- if ($this->getConfigData('type') == 'UPS') {
- $this->_getCgiTracking($trackings);
- } elseif ($this->getConfigData('type') == 'UPS_XML') {
+ if ($this->getConfigData('type') == 'UPS_XML') {
$this->setXMLAccessRequest();
$this->_getXmlTracking($trackings);
}
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php
index 51ce51b2d51..25a87592302 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php
@@ -25,8 +25,6 @@ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Type
public function toOptionArray()
{
return [
- ['value' => 'UPS', 'label' => Mage::helper('usa')->__('United Parcel Service')],
- #array('value' => Mage_Paypal_Model_Api_Abstract::PAYMENT_TYPE_ORDER, 'label' => Mage::helper('usa')->__('Order')),
['value' => 'UPS_XML', 'label' => Mage::helper('usa')->__('United Parcel Service XML')],
];
}
diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml
index 8875aebf016..4dac78bc100 100644
--- a/app/code/core/Mage/Usa/etc/config.xml
+++ b/app/code/core/Mage/Usa/etc/config.xml
@@ -154,7 +154,6 @@
RESGND
- http://www.ups.com/using/services/rave/qcostcgi.cgihttps://onlinetools.ups.com/ups.app/xml/Ratehttps://onlinetools.ups.com/ups.app/xml/Trackhttps://onlinetools.ups.com/ups.app/xml/ShipConfirm
diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
index 57593e17a98..c84bd080220 100644
--- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
+++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Options.php
@@ -168,7 +168,7 @@ protected function _addField($parameter)
// hidden element
if (!$parameter->getVisible()) {
$fieldType = 'hidden';
- } elseif (strpos($fieldType, '/') !== false) { // just an element renderer
+ } elseif (str_contains($fieldType, '/')) { // just an element renderer
$fieldRenderer = $this->getLayout()->createBlock($fieldType);
$fieldType = $this->_defaultElementType;
}
diff --git a/app/code/core/Mage/Widget/Model/Widget/Instance.php b/app/code/core/Mage/Widget/Model/Widget/Instance.php
index da6a0eac52a..39512094197 100644
--- a/app/code/core/Mage/Widget/Model/Widget/Instance.php
+++ b/app/code/core/Mage/Widget/Model/Widget/Instance.php
@@ -222,7 +222,7 @@ public function getType()
*/
protected function _prepareType()
{
- if (strpos((string)$this->_getData('type'), '-') !== false) {
+ if (str_contains((string)$this->_getData('type'), '-')) {
$this->setData('type', str_replace('-', '/', $this->_getData('type')));
}
return $this;
diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php
index d021467a559..426d18832e5 100644
--- a/app/code/core/Mage/Wishlist/controllers/IndexController.php
+++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php
@@ -721,7 +721,7 @@ public function downloadCustomOptionAction()
}
$optionId = null;
- if (strpos($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX) === 0) {
+ if (str_starts_with($option->getCode(), Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX)) {
$optionId = str_replace(Mage_Catalog_Model_Product_Type_Abstract::OPTION_PREFIX, '', $option->getCode());
if (!is_numeric($optionId)) {
return $this->_forward('noRoute');
diff --git a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
index 924eb99e5c0..5719cfb21c4 100644
--- a/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
+++ b/app/design/adminhtml/default/default/template/catalog/product/attribute/set/main.phtml
@@ -60,7 +60,7 @@
-
+
diff --git a/app/design/frontend/base/default/template/googleanalytics/ga.phtml b/app/design/frontend/base/default/template/googleanalytics/ga.phtml
index 08762b3195b..e922a545dd0 100644
--- a/app/design/frontend/base/default/template/googleanalytics/ga.phtml
+++ b/app/design/frontend/base/default/template/googleanalytics/ga.phtml
@@ -16,51 +16,18 @@
helper('googleanalytics');
-$_accountId = $_helper->getAccountId();
?>
helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
isUseAnalytics4()): ?>
+ getAccountId() ?>
-
+
- isUseUniversalAnalytics()): ?>
-
-
-
-
-
-
-
diff --git a/app/design/frontend/base/default/template/googleanalytics/gtm.phtml b/app/design/frontend/base/default/template/googleanalytics/gtm.phtml
new file mode 100644
index 00000000000..a1c841fb494
--- /dev/null
+++ b/app/design/frontend/base/default/template/googleanalytics/gtm.phtml
@@ -0,0 +1,33 @@
+
+helper('googleanalytics');
+?>
+helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
+ isUseGoogleTagManager()): ?>
+ getGoogleTagManagerContainerId() ?>
+
+
+
+
+
+
diff --git a/app/design/frontend/rwd/default/layout/page.xml b/app/design/frontend/rwd/default/layout/page.xml
index 5e05ec85299..80d9c39ae33 100644
--- a/app/design/frontend/rwd/default/layout/page.xml
+++ b/app/design/frontend/rwd/default/layout/page.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
index 10af46dd229..1a29dc4c4db 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
@@ -108,7 +108,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
__("What's this?"); ?>
diff --git a/app/locale/en_US/Mage_GoogleAnalytics.csv b/app/locale/en_US/Mage_GoogleAnalytics.csv
index 1b90846f791..54b35787571 100644
--- a/app/locale/en_US/Mage_GoogleAnalytics.csv
+++ b/app/locale/en_US/Mage_GoogleAnalytics.csv
@@ -6,3 +6,5 @@
"Type","Type"
"Universal Analytics","Universal Analytics"
"Google Analytics 4","Google Analytics 4"
+"Enable GA4 User_id tracking for logged in customers.","Enable GA4 User_id tracking for logged in customers."
+"Enable GA4 Debug Real Time view for Development IP.","Enable GA4 Debug Real Time view for Development IP."
\ No newline at end of file
diff --git a/composer.json b/composer.json
index fa521e89635..23005eb9a57 100644
--- a/composer.json
+++ b/composer.json
@@ -84,9 +84,6 @@
}
},
"extra": {
- "branch-alias": {
- "dev-main": "1.9.4.x-dev"
- },
"magento-root-dir": ".",
"magento-deploystrategy": "copy",
"magento-deploystrategy-dev": "symlink",
diff --git a/composer.lock b/composer.lock
index 4d252094dc9..e9ff8918641 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "71fd42ba8746782c5daae84373290d52",
+ "content-hash": "bd9c6926886f768d8b354f3686deeee2",
"packages": [
{
"name": "colinmollenhour/cache-backend-redis",
@@ -772,16 +772,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "3.0.19",
+ "version": "3.0.21",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "cc181005cf548bfd8a4896383bb825d859259f95"
+ "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95",
- "reference": "cc181005cf548bfd8a4896383bb825d859259f95",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
+ "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1",
"shasum": ""
},
"require": {
@@ -862,7 +862,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
- "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19"
+ "source": "https://github.com/phpseclib/phpseclib/tree/3.0.21"
},
"funding": [
{
@@ -878,7 +878,7 @@
"type": "tidelift"
}
],
- "time": "2023-03-05T17:13:09+00:00"
+ "time": "2023-07-09T15:24:48+00:00"
},
{
"name": "psr/container",
@@ -1043,16 +1043,16 @@
},
{
"name": "symfony/console",
- "version": "v5.4.22",
+ "version": "v5.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8"
+ "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8",
- "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8",
+ "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8",
+ "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8",
"shasum": ""
},
"require": {
@@ -1122,7 +1122,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.4.22"
+ "source": "https://github.com/symfony/console/tree/v5.4.24"
},
"funding": [
{
@@ -1138,7 +1138,7 @@
"type": "tidelift"
}
],
- "time": "2023-03-25T09:27:28+00:00"
+ "time": "2023-05-26T05:13:16+00:00"
},
{
"name": "symfony/css-selector",
@@ -2469,25 +2469,29 @@
},
{
"name": "doctrine/deprecations",
- "version": "v1.0.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
- "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+ "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
"shasum": ""
},
"require": {
- "php": "^7.1|^8.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
- "phpunit/phpunit": "^7.5|^8.5|^9.5",
- "psr/log": "^1|^2|^3"
+ "phpstan/phpstan": "1.4.10 || 1.10.15",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "psalm/plugin-phpunit": "0.18.4",
+ "psr/log": "^1 || ^2 || ^3",
+ "vimeo/psalm": "4.30.0 || 5.12.0"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -2506,9 +2510,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+ "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
},
- "time": "2022-05-02T15:47:09+00:00"
+ "time": "2023-06-03T09:27:29+00:00"
},
{
"name": "doctrine/instantiator",
@@ -2660,16 +2664,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.16.0",
+ "version": "v3.21.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc"
+ "reference": "f29a0598c022baf99d2136da533820fec63167ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
- "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f29a0598c022baf99d2136da533820fec63167ed",
+ "reference": "f29a0598c022baf99d2136da533820fec63167ed",
"shasum": ""
},
"require": {
@@ -2744,7 +2748,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.21.0"
},
"funding": [
{
@@ -2752,20 +2756,20 @@
"type": "github"
}
],
- "time": "2023-04-02T19:30:06+00:00"
+ "time": "2023-07-05T21:28:10+00:00"
},
{
"name": "macopedia/phpstan-magento1",
- "version": "v1.0.5",
+ "version": "v1.0.7",
"source": {
"type": "git",
"url": "https://github.com/macopedia/phpstan-magento1.git",
- "reference": "69346472b19422b2aefeb928d6488b5d907e8b1d"
+ "reference": "348ab687063bdd78c571091a16b0865935798b18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/macopedia/phpstan-magento1/zipball/69346472b19422b2aefeb928d6488b5d907e8b1d",
- "reference": "69346472b19422b2aefeb928d6488b5d907e8b1d",
+ "url": "https://api.github.com/repos/macopedia/phpstan-magento1/zipball/348ab687063bdd78c571091a16b0865935798b18",
+ "reference": "348ab687063bdd78c571091a16b0865935798b18",
"shasum": ""
},
"require": {
@@ -2789,22 +2793,22 @@
"description": "Extension for PHPStan to allow analysis of Magento 1 code.",
"support": {
"issues": "https://github.com/macopedia/phpstan-magento1/issues",
- "source": "https://github.com/macopedia/phpstan-magento1/tree/v1.0.5"
+ "source": "https://github.com/macopedia/phpstan-magento1/tree/v1.0.7"
},
- "time": "2022-12-30T08:43:52+00:00"
+ "time": "2023-06-13T14:11:06+00:00"
},
{
"name": "magento-ecg/coding-standard",
- "version": "4.5.2",
+ "version": "4.5.4",
"source": {
"type": "git",
"url": "https://github.com/magento-ecg/coding-standard.git",
- "reference": "4269fe560c0b20b30ccfdb76b745d23f34996b0c"
+ "reference": "1db1da45447682108c63ea94ce07119a002a6504"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento-ecg/coding-standard/zipball/4269fe560c0b20b30ccfdb76b745d23f34996b0c",
- "reference": "4269fe560c0b20b30ccfdb76b745d23f34996b0c",
+ "url": "https://api.github.com/repos/magento-ecg/coding-standard/zipball/1db1da45447682108c63ea94ce07119a002a6504",
+ "reference": "1db1da45447682108c63ea94ce07119a002a6504",
"shasum": ""
},
"require": {
@@ -2826,9 +2830,9 @@
"homepage": "https://github.com/magento-ecg/coding-standard",
"support": {
"issues": "https://github.com/magento-ecg/coding-standard/issues",
- "source": "https://github.com/magento-ecg/coding-standard/tree/4.5.2"
+ "source": "https://github.com/magento-ecg/coding-standard/tree/v4.5.2"
},
- "time": "2022-12-06T11:33:03+00:00"
+ "time": "2023-07-05T15:24:16+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -2891,16 +2895,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.15.4",
+ "version": "v4.15.5",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
+ "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
- "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+ "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
"shasum": ""
},
"require": {
@@ -2941,9 +2945,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
},
- "time": "2023-03-05T19:49:14+00:00"
+ "time": "2023-05-19T20:20:00+00:00"
},
{
"name": "openmage/dev-copyright",
@@ -3368,16 +3372,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.15",
+ "version": "1.10.25",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd"
+ "reference": "578f4e70d117f9a90699324c555922800ac38d8c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd",
- "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/578f4e70d117f9a90699324c555922800ac38d8c",
+ "reference": "578f4e70d117f9a90699324c555922800ac38d8c",
"shasum": ""
},
"require": {
@@ -3426,7 +3430,7 @@
"type": "tidelift"
}
],
- "time": "2023-05-09T15:28:01+00:00"
+ "time": "2023-07-06T12:11:37+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -3748,16 +3752,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.8",
+ "version": "9.6.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
+ "reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
- "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
+ "reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
"shasum": ""
},
"require": {
@@ -3831,7 +3835,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
},
"funding": [
{
@@ -3847,7 +3851,7 @@
"type": "tidelift"
}
],
- "time": "2023-05-11T05:14:45+00:00"
+ "time": "2023-06-11T06:13:56+00:00"
},
{
"name": "psr/cache",
@@ -5353,16 +5357,16 @@
},
{
"name": "symfony/filesystem",
- "version": "v5.4.21",
+ "version": "v5.4.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f"
+ "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/e75960b1bbfd2b8c9e483e0d74811d555ca3de9f",
- "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
+ "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
"shasum": ""
},
"require": {
@@ -5397,7 +5401,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.4.21"
+ "source": "https://github.com/symfony/filesystem/tree/v5.4.25"
},
"funding": [
{
@@ -5413,7 +5417,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T08:03:56+00:00"
+ "time": "2023-05-31T13:04:02+00:00"
},
{
"name": "symfony/finder",
@@ -5549,16 +5553,16 @@
},
{
"name": "symfony/process",
- "version": "v5.4.22",
+ "version": "v5.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b"
+ "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b",
- "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b",
+ "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64",
+ "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64",
"shasum": ""
},
"require": {
@@ -5591,7 +5595,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.4.22"
+ "source": "https://github.com/symfony/process/tree/v5.4.24"
},
"funding": [
{
@@ -5607,7 +5611,7 @@
"type": "tidelift"
}
],
- "time": "2023-03-06T21:29:33+00:00"
+ "time": "2023-05-17T11:26:05+00:00"
},
{
"name": "symfony/stopwatch",
diff --git a/dev/openmage/apache/Dockerfile b/dev/openmage/apache/Dockerfile
new file mode 100644
index 00000000000..6b2cf3ad67c
--- /dev/null
+++ b/dev/openmage/apache/Dockerfile
@@ -0,0 +1,6 @@
+FROM ghcr.io/colinmollenhour/docker-openmage-dev:8.2-apache
+
+ENV APACHE_DOCUMENT_ROOT /var/www/html/pub/default
+
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
\ No newline at end of file
diff --git a/dev/openmage/docker-compose.yml b/dev/openmage/docker-compose.yml
index 1ae91aaa292..be5614440bb 100644
--- a/dev/openmage/docker-compose.yml
+++ b/dev/openmage/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
apache:
- image: ghcr.io/colinmollenhour/docker-openmage-dev:8.2-apache
+ build: apache
hostname: ${HOST_NAME:-openmage-7f000001.nip.io}
ports:
- "${HOST_PORT:-80}:80"
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Page.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Page.php
index e5d1649c522..4752212d0e5 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Page.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Page.php
@@ -177,10 +177,10 @@ protected function generatePageClassBlock($blockName, array $params, $indent = '
*/
protected function getParentPage($folderPath, $mca, $area)
{
- if (strpos($folderPath, 'Adminhtml') !== false && $area === 'Adminhtml') {
+ if (str_contains($folderPath, 'Adminhtml') && $area === 'Adminhtml') {
$areaMtfPage = 'BackendPage';
} else {
- if (strpos($mca, 'http') === false) {
+ if (!str_contains($mca, 'http')) {
$areaMtfPage = 'FrontendPage';
} else {
$areaMtfPage = 'ExternalPage';
diff --git a/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserWithRestrictedResources.php b/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserWithRestrictedResources.php
index 9cd305a5925..10489ca9561 100644
--- a/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserWithRestrictedResources.php
+++ b/dev/tests/functional/tests/app/Mage/Admin/Test/Constraint/AssertUserWithRestrictedResources.php
@@ -67,7 +67,7 @@ public function processAssert(User $user, AdminAuthLogin $adminAuthLogin, Dashbo
$browser->open($_ENV['app_backend_url'] . $this->manageProductsUrl);
\PHPUnit_Framework_Assert::assertTrue(
- strpos($dashboard->getMainBlock()->getMainBlockText(), self::ACCESS_DENIED) !== false,
+ str_contains($dashboard->getMainBlock()->getMainBlockText(), self::ACCESS_DENIED),
self::ACCESS_DENIED . " text is not visible on dashboard page.");
}
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/CustomAttribute.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/CustomAttribute.php
index 8d6556536a2..d6a4c6b34c6 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/CustomAttribute.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/CustomAttribute.php
@@ -155,7 +155,7 @@ protected function getElementByClass($class)
{
$element = null;
foreach ($this->classReference as $key => $reference) {
- if (strpos($class, $key) !== false) {
+ if (str_contains($class, $key)) {
$element = $reference;
}
}
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Sales/Order/Comments.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Sales/Order/Comments.php
index e6cce43d9b4..9e1c8334974 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Sales/Order/Comments.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Sales/Order/Comments.php
@@ -56,7 +56,7 @@ public function isCommentPresent($commentText)
{
$comments = $this->getCommentsElements();
foreach ($comments as $comment) {
- if (strpos($comment->getText(), $commentText) !== false) {
+ if (str_contains($comment->getText(), $commentText)) {
return true;
}
}
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
index 478e5de95a1..b6595a9143a 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
@@ -80,7 +80,7 @@ protected function getPaths()
{
$realPath = str_replace('\\', '/', get_class($this)) . '.xml';
$paths = glob(MTF_TESTS_PATH . preg_replace('/Mage\/\w+/', '*/*', $realPath));
- if (strpos($realPath, 'Adminhtml') !== false) {
+ if (str_contains($realPath, 'Adminhtml')) {
$paths = array_merge(
$paths,
glob(MTF_TESTS_PATH . preg_replace('/Mage\/(\w+)(\/.*Block\/)/', '*/*$2$1/', $realPath)),
diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/Constraint/AssertProductCompareItemsLink.php b/dev/tests/functional/tests/app/Mage/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
index b57c0a14ace..4b1ad8865f4 100644
--- a/dev/tests/functional/tests/app/Mage/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
+++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
@@ -50,7 +50,7 @@ public function processAssert(CmsIndex $cmsIndex, array $products)
);
\PHPUnit_Framework_Assert::assertTrue(
- strpos($cmsIndex->getCompareBlock()->getCompareLinkUrl(), $this->compareProductUrl) !== false,
+ str_contains($cmsIndex->getCompareBlock()->getCompareLinkUrl(), $this->compareProductUrl),
'Compare product link isn\'t lead to Compare Product Page.'
);
}
diff --git a/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertCurrencySelected.php
index b75b89271b3..feaca10fd16 100644
--- a/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertCurrencySelected.php
+++ b/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertCurrencySelected.php
@@ -33,7 +33,7 @@ public function processAssert(Dashboard $dashboard, $currencySymbol)
{
$dashboard->open();
\PHPUnit_Framework_Assert::assertTrue(
- strpos($dashboard->getMainBlock()->getRevenuePrice(), $currencySymbol) !== false,
+ str_contains($dashboard->getMainBlock()->getRevenuePrice(), $currencySymbol),
'Selected currency symbol not displays on dashboard.'
);
}
diff --git a/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertRewritesEnabled.php
index 79bfa1481fa..a0cac979165 100644
--- a/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -37,7 +37,7 @@ public function processAssert(CatalogCategory $category, CmsIndex $homePage, Bro
$homePage->open();
$homePage->getTopmenu()->selectCategory($category->getName());
\PHPUnit_Framework_Assert::assertTrue(
- strpos($browser->getUrl(), 'index.php') === false,
+ !str_contains($browser->getUrl(), 'index.php'),
'Apache redirect for category does not work.'
);
}
diff --git a/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertSecureUrlEnabled.php
index e9e183ef684..e29b59716ec 100644
--- a/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Mage/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -34,7 +34,7 @@ public function processAssert(BrowserInterface $browser, Dashboard $dashboard)
{
$dashboard->open();
\PHPUnit_Framework_Assert::assertTrue(
- strpos($browser->getUrl(), 'https://') !== false,
+ str_contains($browser->getUrl(), 'https://'),
'Secure Url is not displayed on backend.'
);
}
diff --git a/dev/tests/functional/tests/app/Mage/Sitemap/Test/Constraint/AssertSitemapContent.php b/dev/tests/functional/tests/app/Mage/Sitemap/Test/Constraint/AssertSitemapContent.php
index b95bfad7756..c95f76e03bc 100644
--- a/dev/tests/functional/tests/app/Mage/Sitemap/Test/Constraint/AssertSitemapContent.php
+++ b/dev/tests/functional/tests/app/Mage/Sitemap/Test/Constraint/AssertSitemapContent.php
@@ -79,7 +79,7 @@ public function processAssert(
protected function checkContent($content, $urls)
{
foreach ($urls as $url) {
- if (strpos($content, $url) === false) {
+ if (!str_contains($content, $url)) {
return false;
}
}
diff --git a/dev/tests/unit/Base/XmlFileLoadingTest.php b/dev/tests/unit/Base/XmlFileLoadingTest.php
index e50e36935a6..0f8b6b50fd4 100644
--- a/dev/tests/unit/Base/XmlFileLoadingTest.php
+++ b/dev/tests/unit/Base/XmlFileLoadingTest.php
@@ -1,52 +1,52 @@
-assertNotEmpty($simplexml->asXML());
- }
-
- /**
- *
- * @dataProvider provideXmlFiles
- * @param $filepath
- * @return void
- */
- public function testXmlReaderIsValid($filepath): void
- {
- $xml = \XMLReader::open($filepath);
- $xml->setParserProperty(\XMLReader::VALIDATE, true);
- $this->assertTrue($xml->isValid());
- }
-}
+assertNotEmpty($simplexml->asXML());
+ }
+
+ /**
+ *
+ * @dataProvider provideXmlFiles
+ * @param $filepath
+ * @return void
+ */
+ public function testXmlReaderIsValid($filepath): void
+ {
+ $xml = \XMLReader::open($filepath);
+ $xml->setParserProperty(\XMLReader::VALIDATE, true);
+ $this->assertTrue($xml->isValid());
+ }
+}
diff --git a/errors/processor.php b/errors/processor.php
index 94abf98c2df..0ebce64d4a9 100644
--- a/errors/processor.php
+++ b/errors/processor.php
@@ -111,8 +111,8 @@ public function __construct()
$this->_root = is_dir($this->_indexDir.'app');
$this->_prepareConfig();
- if (isset($_GET['skin'])) {
- $this->_setSkin($_GET['skin']);
+ if (isset($_SERVER['MAGE_ERRORS_SKIN']) || isset($_GET['skin'])) {
+ $this->_setSkin($_SERVER['MAGE_ERRORS_SKIN'] ?? $_GET['skin']);
}
}
@@ -208,7 +208,7 @@ public function getBaseUrl(bool $param = false): string
*/
protected function _getClientIp(): string
{
- return $_SERVER['REMOTE_ADDR'] ?? 'undefined';
+ return $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'undefined';
}
protected function _getIndexDir(): string
diff --git a/index.php b/index.php
index ca190786dca..4432c63b0c4 100644
--- a/index.php
+++ b/index.php
@@ -51,6 +51,10 @@
include_once __DIR__ . '/errors/503.php';
exit;
}
+
+ // remove config cache to make the system check for DB updates
+ $config = Mage::app()->getConfig();
+ $config->getCache()->remove($config->getCacheId());
}
Mage::run($mageRunCode, $mageRunType);
diff --git a/js/extjs/ext-tree-checkbox.js b/js/extjs/ext-tree-checkbox.js
index 3067adb1515..503d4e65462 100644
--- a/js/extjs/ext-tree-checkbox.js
+++ b/js/extjs/ext-tree-checkbox.js
@@ -65,7 +65,7 @@ Ext.extend(Ext.tree.CheckboxNodeUI, Ext.tree.TreeNodeUI, {
render : function(bulkRender){
var n = this.node;
var targetNode = n.parentNode ?
- n.parentNode.ui.getContainer() : n.ownerTree.container.dom; /* in later svn builds this changes to n.ownerTree.innerCt.dom */
+ n.parentNode.ui.getContainer() : n.ownerTree.innerCt.dom; /* in previous svn builds this was n.ownerTree.container.dom */
if(!this.rendered){
this.rendered = true;
var a = n.attributes;
diff --git a/js/lib/jquery/jquery-1.12.4.js b/js/lib/jquery/jquery-1.12.4.js
deleted file mode 100644
index 7fc60fca78b..00000000000
--- a/js/lib/jquery/jquery-1.12.4.js
+++ /dev/null
@@ -1,11008 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.12.4
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2016-05-20T17:17Z
- */
-
-(function( global, factory ) {
-
- if ( typeof module === "object" && typeof module.exports === "object" ) {
- // For CommonJS and CommonJS-like environments where a proper `window`
- // is present, execute the factory and get jQuery.
- // For environments that do not have a `window` with a `document`
- // (such as Node.js), expose a factory as module.exports.
- // This accentuates the need for the creation of a real `window`.
- // e.g. var jQuery = require("jquery")(window);
- // See ticket #14549 for more info.
- module.exports = global.document ?
- factory( global, true ) :
- function( w ) {
- if ( !w.document ) {
- throw new Error( "jQuery requires a window with a document" );
- }
- return factory( w );
- };
- } else {
- factory( global );
- }
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//"use strict";
-var deletedIds = [];
-
-var document = window.document;
-
-var slice = deletedIds.slice;
-
-var concat = deletedIds.concat;
-
-var push = deletedIds.push;
-
-var indexOf = deletedIds.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
- version = "1.12.4",
-
- // Define a local copy of jQuery
- jQuery = function( selector, context ) {
-
- // The jQuery object is actually just the init constructor 'enhanced'
- // Need init if jQuery is called (just allow error to be thrown if not included)
- return new jQuery.fn.init( selector, context );
- },
-
- // Support: Android<4.1, IE<9
- // Make sure we trim BOM and NBSP
- rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
- // Matches dashed string for camelizing
- rmsPrefix = /^-ms-/,
- rdashAlpha = /-([\da-z])/gi,
-
- // Used by jQuery.camelCase as callback to replace()
- fcamelCase = function( all, letter ) {
- return letter.toUpperCase();
- };
-
-jQuery.fn = jQuery.prototype = {
-
- // The current version of jQuery being used
- jquery: version,
-
- constructor: jQuery,
-
- // Start with an empty selector
- selector: "",
-
- // The default length of a jQuery object is 0
- length: 0,
-
- toArray: function() {
- return slice.call( this );
- },
-
- // Get the Nth element in the matched element set OR
- // Get the whole matched element set as a clean array
- get: function( num ) {
- return num != null ?
-
- // Return just the one element from the set
- ( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
- // Return all the elements in a clean array
- slice.call( this );
- },
-
- // Take an array of elements and push it onto the stack
- // (returning the new matched element set)
- pushStack: function( elems ) {
-
- // Build a new jQuery matched element set
- var ret = jQuery.merge( this.constructor(), elems );
-
- // Add the old object onto the stack (as a reference)
- ret.prevObject = this;
- ret.context = this.context;
-
- // Return the newly-formed element set
- return ret;
- },
-
- // Execute a callback for every element in the matched set.
- each: function( callback ) {
- return jQuery.each( this, callback );
- },
-
- map: function( callback ) {
- return this.pushStack( jQuery.map( this, function( elem, i ) {
- return callback.call( elem, i, elem );
- } ) );
- },
-
- slice: function() {
- return this.pushStack( slice.apply( this, arguments ) );
- },
-
- first: function() {
- return this.eq( 0 );
- },
-
- last: function() {
- return this.eq( -1 );
- },
-
- eq: function( i ) {
- var len = this.length,
- j = +i + ( i < 0 ? len : 0 );
- return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
- },
-
- end: function() {
- return this.prevObject || this.constructor();
- },
-
- // For internal use only.
- // Behaves like an Array's method, not like a jQuery method.
- push: push,
- sort: deletedIds.sort,
- splice: deletedIds.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
- var src, copyIsArray, copy, name, options, clone,
- target = arguments[ 0 ] || {},
- i = 1,
- length = arguments.length,
- deep = false;
-
- // Handle a deep copy situation
- if ( typeof target === "boolean" ) {
- deep = target;
-
- // skip the boolean and the target
- target = arguments[ i ] || {};
- i++;
- }
-
- // Handle case when target is a string or something (possible in deep copy)
- if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
- target = {};
- }
-
- // extend jQuery itself if only one argument is passed
- if ( i === length ) {
- target = this;
- i--;
- }
-
- for ( ; i < length; i++ ) {
-
- // Only deal with non-null/undefined values
- if ( ( options = arguments[ i ] ) != null ) {
-
- // Extend the base object
- for ( name in options ) {
- src = target[ name ];
- copy = options[ name ];
-
- // Prevent never-ending loop
- if ( target === copy ) {
- continue;
- }
-
- // Recurse if we're merging plain objects or arrays
- if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
- ( copyIsArray = jQuery.isArray( copy ) ) ) ) {
-
- if ( copyIsArray ) {
- copyIsArray = false;
- clone = src && jQuery.isArray( src ) ? src : [];
-
- } else {
- clone = src && jQuery.isPlainObject( src ) ? src : {};
- }
-
- // Never move original objects, clone them
- target[ name ] = jQuery.extend( deep, clone, copy );
-
- // Don't bring in undefined values
- } else if ( copy !== undefined ) {
- target[ name ] = copy;
- }
- }
- }
- }
-
- // Return the modified object
- return target;
-};
-
-jQuery.extend( {
-
- // Unique for each copy of jQuery on the page
- expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
- // Assume jQuery is ready without the ready module
- isReady: true,
-
- error: function( msg ) {
- throw new Error( msg );
- },
-
- noop: function() {},
-
- // See test/unit/core.js for details concerning isFunction.
- // Since version 1.3, DOM methods and functions like alert
- // aren't supported. They return false on IE (#2968).
- isFunction: function( obj ) {
- return jQuery.type( obj ) === "function";
- },
-
- isArray: Array.isArray || function( obj ) {
- return jQuery.type( obj ) === "array";
- },
-
- isWindow: function( obj ) {
- /* jshint eqeqeq: false */
- return obj != null && obj == obj.window;
- },
-
- isNumeric: function( obj ) {
-
- // parseFloat NaNs numeric-cast false positives (null|true|false|"")
- // ...but misinterprets leading-number strings, particularly hex literals ("0x...")
- // subtraction forces infinities to NaN
- // adding 1 corrects loss of precision from parseFloat (#15100)
- var realStringObj = obj && obj.toString();
- return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
- },
-
- isEmptyObject: function( obj ) {
- var name;
- for ( name in obj ) {
- return false;
- }
- return true;
- },
-
- isPlainObject: function( obj ) {
- var key;
-
- // Must be an Object.
- // Because of IE, we also have to check the presence of the constructor property.
- // Make sure that DOM nodes and window objects don't pass through, as well
- if ( !obj || jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
- return false;
- }
-
- try {
-
- // Not own constructor property must be Object
- if ( obj.constructor &&
- !hasOwn.call( obj, "constructor" ) &&
- !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) {
- return false;
- }
- } catch ( e ) {
-
- // IE8,9 Will throw exceptions on certain host objects #9897
- return false;
- }
-
- // Support: IE<9
- // Handle iteration over inherited properties before own properties.
- if ( !support.ownFirst ) {
- for ( key in obj ) {
- return hasOwn.call( obj, key );
- }
- }
-
- // Own properties are enumerated firstly, so to speed up,
- // if last one is own, then all properties are own.
- for ( key in obj ) {}
-
- return key === undefined || hasOwn.call( obj, key );
- },
-
- type: function( obj ) {
- if ( obj == null ) {
- return obj + "";
- }
- return typeof obj === "object" || typeof obj === "function" ?
- class2type[ toString.call( obj ) ] || "object" :
- typeof obj;
- },
-
- // Workarounds based on findings by Jim Driscoll
- // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
- globalEval: function( data ) {
- if ( data && jQuery.trim( data ) ) {
-
- // We use execScript on Internet Explorer
- // We use an anonymous function so that context is window
- // rather than jQuery in Firefox
- ( window.execScript || function( data ) {
- window[ "eval" ].call( window, data ); // jscs:ignore requireDotNotation
- } )( data );
- }
- },
-
- // Convert dashed to camelCase; used by the css and data modules
- // Microsoft forgot to hump their vendor prefix (#9572)
- camelCase: function( string ) {
- return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
- },
-
- nodeName: function( elem, name ) {
- return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
- },
-
- each: function( obj, callback ) {
- var length, i = 0;
-
- if ( isArrayLike( obj ) ) {
- length = obj.length;
- for ( ; i < length; i++ ) {
- if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
- break;
- }
- }
- } else {
- for ( i in obj ) {
- if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
- break;
- }
- }
- }
-
- return obj;
- },
-
- // Support: Android<4.1, IE<9
- trim: function( text ) {
- return text == null ?
- "" :
- ( text + "" ).replace( rtrim, "" );
- },
-
- // results is for internal usage only
- makeArray: function( arr, results ) {
- var ret = results || [];
-
- if ( arr != null ) {
- if ( isArrayLike( Object( arr ) ) ) {
- jQuery.merge( ret,
- typeof arr === "string" ?
- [ arr ] : arr
- );
- } else {
- push.call( ret, arr );
- }
- }
-
- return ret;
- },
-
- inArray: function( elem, arr, i ) {
- var len;
-
- if ( arr ) {
- if ( indexOf ) {
- return indexOf.call( arr, elem, i );
- }
-
- len = arr.length;
- i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
- for ( ; i < len; i++ ) {
-
- // Skip accessing in sparse arrays
- if ( i in arr && arr[ i ] === elem ) {
- return i;
- }
- }
- }
-
- return -1;
- },
-
- merge: function( first, second ) {
- var len = +second.length,
- j = 0,
- i = first.length;
-
- while ( j < len ) {
- first[ i++ ] = second[ j++ ];
- }
-
- // Support: IE<9
- // Workaround casting of .length to NaN on otherwise arraylike objects (e.g., NodeLists)
- if ( len !== len ) {
- while ( second[ j ] !== undefined ) {
- first[ i++ ] = second[ j++ ];
- }
- }
-
- first.length = i;
-
- return first;
- },
-
- grep: function( elems, callback, invert ) {
- var callbackInverse,
- matches = [],
- i = 0,
- length = elems.length,
- callbackExpect = !invert;
-
- // Go through the array, only saving the items
- // that pass the validator function
- for ( ; i < length; i++ ) {
- callbackInverse = !callback( elems[ i ], i );
- if ( callbackInverse !== callbackExpect ) {
- matches.push( elems[ i ] );
- }
- }
-
- return matches;
- },
-
- // arg is for internal usage only
- map: function( elems, callback, arg ) {
- var length, value,
- i = 0,
- ret = [];
-
- // Go through the array, translating each of the items to their new values
- if ( isArrayLike( elems ) ) {
- length = elems.length;
- for ( ; i < length; i++ ) {
- value = callback( elems[ i ], i, arg );
-
- if ( value != null ) {
- ret.push( value );
- }
- }
-
- // Go through every key on the object,
- } else {
- for ( i in elems ) {
- value = callback( elems[ i ], i, arg );
-
- if ( value != null ) {
- ret.push( value );
- }
- }
- }
-
- // Flatten any nested arrays
- return concat.apply( [], ret );
- },
-
- // A global GUID counter for objects
- guid: 1,
-
- // Bind a function to a context, optionally partially applying any
- // arguments.
- proxy: function( fn, context ) {
- var args, proxy, tmp;
-
- if ( typeof context === "string" ) {
- tmp = fn[ context ];
- context = fn;
- fn = tmp;
- }
-
- // Quick check to determine if target is callable, in the spec
- // this throws a TypeError, but we will just return undefined.
- if ( !jQuery.isFunction( fn ) ) {
- return undefined;
- }
-
- // Simulated bind
- args = slice.call( arguments, 2 );
- proxy = function() {
- return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
- };
-
- // Set the guid of unique handler to the same of original handler, so it can be removed
- proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
- return proxy;
- },
-
- now: function() {
- return +( new Date() );
- },
-
- // jQuery.support is not used in Core but other projects attach their
- // properties to it so it needs to exist.
- support: support
-} );
-
-// JSHint would error on this code due to the Symbol not being defined in ES5.
-// Defining this global in .jshintrc would create a danger of using the global
-// unguarded in another place, it seems safer to just disable JSHint for these
-// three lines.
-/* jshint ignore: start */
-if ( typeof Symbol === "function" ) {
- jQuery.fn[ Symbol.iterator ] = deletedIds[ Symbol.iterator ];
-}
-/* jshint ignore: end */
-
-// Populate the class2type map
-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
- class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
-
-function isArrayLike( obj ) {
-
- // Support: iOS 8.2 (not reproducible in simulator)
- // `in` check used to prevent JIT error (gh-2145)
- // hasOwn isn't used here due to false negatives
- // regarding Nodelist length in IE
- var length = !!obj && "length" in obj && obj.length,
- type = jQuery.type( obj );
-
- if ( type === "function" || jQuery.isWindow( obj ) ) {
- return false;
- }
-
- return type === "array" || length === 0 ||
- typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.2.1
- * http://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2015-10-17
- */
-(function( window ) {
-
-var i,
- support,
- Expr,
- getText,
- isXML,
- tokenize,
- compile,
- select,
- outermostContext,
- sortInput,
- hasDuplicate,
-
- // Local document vars
- setDocument,
- document,
- docElem,
- documentIsHTML,
- rbuggyQSA,
- rbuggyMatches,
- matches,
- contains,
-
- // Instance-specific data
- expando = "sizzle" + 1 * new Date(),
- preferredDoc = window.document,
- dirruns = 0,
- done = 0,
- classCache = createCache(),
- tokenCache = createCache(),
- compilerCache = createCache(),
- sortOrder = function( a, b ) {
- if ( a === b ) {
- hasDuplicate = true;
- }
- return 0;
- },
-
- // General-purpose constants
- MAX_NEGATIVE = 1 << 31,
-
- // Instance methods
- hasOwn = ({}).hasOwnProperty,
- arr = [],
- pop = arr.pop,
- push_native = arr.push,
- push = arr.push,
- slice = arr.slice,
- // Use a stripped-down indexOf as it's faster than native
- // http://jsperf.com/thor-indexof-vs-for/5
- indexOf = function( list, elem ) {
- var i = 0,
- len = list.length;
- for ( ; i < len; i++ ) {
- if ( list[i] === elem ) {
- return i;
- }
- }
- return -1;
- },
-
- booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
- // Regular expressions
-
- // http://www.w3.org/TR/css3-selectors/#whitespace
- whitespace = "[\\x20\\t\\r\\n\\f]",
-
- // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
- identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
- // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
- attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
- // Operator (capture 2)
- "*([*^$|!~]?=)" + whitespace +
- // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
- "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
- "*\\]",
-
- pseudos = ":(" + identifier + ")(?:\\((" +
- // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
- // 1. quoted (capture 3; capture 4 or capture 5)
- "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
- // 2. simple (capture 6)
- "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
- // 3. anything else (capture 2)
- ".*" +
- ")\\)|)",
-
- // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
- rwhitespace = new RegExp( whitespace + "+", "g" ),
- rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
- rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
- rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
- rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
- rpseudo = new RegExp( pseudos ),
- ridentifier = new RegExp( "^" + identifier + "$" ),
-
- matchExpr = {
- "ID": new RegExp( "^#(" + identifier + ")" ),
- "CLASS": new RegExp( "^\\.(" + identifier + ")" ),
- "TAG": new RegExp( "^(" + identifier + "|[*])" ),
- "ATTR": new RegExp( "^" + attributes ),
- "PSEUDO": new RegExp( "^" + pseudos ),
- "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
- "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
- "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
- "bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
- // For use in libraries implementing .is()
- // We use this for POS matching in `select`
- "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
- whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
- },
-
- rinputs = /^(?:input|select|textarea|button)$/i,
- rheader = /^h\d$/i,
-
- rnative = /^[^{]+\{\s*\[native \w/,
-
- // Easily-parseable/retrievable ID or TAG or CLASS selectors
- rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
- rsibling = /[+~]/,
- rescape = /'|\\/g,
-
- // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
- runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
- funescape = function( _, escaped, escapedWhitespace ) {
- var high = "0x" + escaped - 0x10000;
- // NaN means non-codepoint
- // Support: Firefox<24
- // Workaround erroneous numeric interpretation of +"0x"
- return high !== high || escapedWhitespace ?
- escaped :
- high < 0 ?
- // BMP codepoint
- String.fromCharCode( high + 0x10000 ) :
- // Supplemental Plane codepoint (surrogate pair)
- String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
- },
-
- // Used for iframes
- // See setDocument()
- // Removing the function wrapper causes a "Permission Denied"
- // error in IE
- unloadHandler = function() {
- setDocument();
- };
-
-// Optimize for push.apply( _, NodeList )
-try {
- push.apply(
- (arr = slice.call( preferredDoc.childNodes )),
- preferredDoc.childNodes
- );
- // Support: Android<4.0
- // Detect silently failing push.apply
- arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
- push = { apply: arr.length ?
-
- // Leverage slice if possible
- function( target, els ) {
- push_native.apply( target, slice.call(els) );
- } :
-
- // Support: IE<9
- // Otherwise append directly
- function( target, els ) {
- var j = target.length,
- i = 0;
- // Can't trust NodeList.length
- while ( (target[j++] = els[i++]) ) {}
- target.length = j - 1;
- }
- };
-}
-
-function Sizzle( selector, context, results, seed ) {
- var m, i, elem, nid, nidselect, match, groups, newSelector,
- newContext = context && context.ownerDocument,
-
- // nodeType defaults to 9, since context defaults to document
- nodeType = context ? context.nodeType : 9;
-
- results = results || [];
-
- // Return early from calls with invalid selector or context
- if ( typeof selector !== "string" || !selector ||
- nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
- return results;
- }
-
- // Try to shortcut find operations (as opposed to filters) in HTML documents
- if ( !seed ) {
-
- if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
- setDocument( context );
- }
- context = context || document;
-
- if ( documentIsHTML ) {
-
- // If the selector is sufficiently simple, try using a "get*By*" DOM method
- // (excepting DocumentFragment context, where the methods don't exist)
- if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-
- // ID selector
- if ( (m = match[1]) ) {
-
- // Document context
- if ( nodeType === 9 ) {
- if ( (elem = context.getElementById( m )) ) {
-
- // Support: IE, Opera, Webkit
- // TODO: identify versions
- // getElementById can match elements by name instead of ID
- if ( elem.id === m ) {
- results.push( elem );
- return results;
- }
- } else {
- return results;
- }
-
- // Element context
- } else {
-
- // Support: IE, Opera, Webkit
- // TODO: identify versions
- // getElementById can match elements by name instead of ID
- if ( newContext && (elem = newContext.getElementById( m )) &&
- contains( context, elem ) &&
- elem.id === m ) {
-
- results.push( elem );
- return results;
- }
- }
-
- // Type selector
- } else if ( match[2] ) {
- push.apply( results, context.getElementsByTagName( selector ) );
- return results;
-
- // Class selector
- } else if ( (m = match[3]) && support.getElementsByClassName &&
- context.getElementsByClassName ) {
-
- push.apply( results, context.getElementsByClassName( m ) );
- return results;
- }
- }
-
- // Take advantage of querySelectorAll
- if ( support.qsa &&
- !compilerCache[ selector + " " ] &&
- (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-
- if ( nodeType !== 1 ) {
- newContext = context;
- newSelector = selector;
-
- // qSA looks outside Element context, which is not what we want
- // Thanks to Andrew Dupont for this workaround technique
- // Support: IE <=8
- // Exclude object elements
- } else if ( context.nodeName.toLowerCase() !== "object" ) {
-
- // Capture the context ID, setting it first if necessary
- if ( (nid = context.getAttribute( "id" )) ) {
- nid = nid.replace( rescape, "\\$&" );
- } else {
- context.setAttribute( "id", (nid = expando) );
- }
-
- // Prefix every selector in the list
- groups = tokenize( selector );
- i = groups.length;
- nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
- while ( i-- ) {
- groups[i] = nidselect + " " + toSelector( groups[i] );
- }
- newSelector = groups.join( "," );
-
- // Expand context for sibling selectors
- newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
- context;
- }
-
- if ( newSelector ) {
- try {
- push.apply( results,
- newContext.querySelectorAll( newSelector )
- );
- return results;
- } catch ( qsaError ) {
- } finally {
- if ( nid === expando ) {
- context.removeAttribute( "id" );
- }
- }
- }
- }
- }
- }
-
- // All others
- return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {function(string, object)} Returns the Object data after storing it on itself with
- * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- * deleting the oldest entry
- */
-function createCache() {
- var keys = [];
-
- function cache( key, value ) {
- // Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
- if ( keys.push( key + " " ) > Expr.cacheLength ) {
- // Only keep the most recent entries
- delete cache[ keys.shift() ];
- }
- return (cache[ key + " " ] = value);
- }
- return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
- fn[ expando ] = true;
- return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
- var div = document.createElement("div");
-
- try {
- return !!fn( div );
- } catch (e) {
- return false;
- } finally {
- // Remove from its parent by default
- if ( div.parentNode ) {
- div.parentNode.removeChild( div );
- }
- // release memory in IE
- div = null;
- }
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
- var arr = attrs.split("|"),
- i = arr.length;
-
- while ( i-- ) {
- Expr.attrHandle[ arr[i] ] = handler;
- }
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
- var cur = b && a,
- diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
- ( ~b.sourceIndex || MAX_NEGATIVE ) -
- ( ~a.sourceIndex || MAX_NEGATIVE );
-
- // Use IE sourceIndex if available on both nodes
- if ( diff ) {
- return diff;
- }
-
- // Check if b follows a
- if ( cur ) {
- while ( (cur = cur.nextSibling) ) {
- if ( cur === b ) {
- return -1;
- }
- }
- }
-
- return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
- return function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return name === "input" && elem.type === type;
- };
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
- return function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return (name === "input" || name === "button") && elem.type === type;
- };
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
- return markFunction(function( argument ) {
- argument = +argument;
- return markFunction(function( seed, matches ) {
- var j,
- matchIndexes = fn( [], seed.length, argument ),
- i = matchIndexes.length;
-
- // Match elements found at the specified indexes
- while ( i-- ) {
- if ( seed[ (j = matchIndexes[i]) ] ) {
- seed[j] = !(matches[j] = seed[j]);
- }
- }
- });
- });
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
- return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
- // documentElement is verified for cases where it doesn't yet exist
- // (such as loading iframes in IE - #4833)
- var documentElement = elem && (elem.ownerDocument || elem).documentElement;
- return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
- var hasCompare, parent,
- doc = node ? node.ownerDocument || node : preferredDoc;
-
- // Return early if doc is invalid or already selected
- if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
- return document;
- }
-
- // Update global variables
- document = doc;
- docElem = document.documentElement;
- documentIsHTML = !isXML( document );
-
- // Support: IE 9-11, Edge
- // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
- if ( (parent = document.defaultView) && parent.top !== parent ) {
- // Support: IE 11
- if ( parent.addEventListener ) {
- parent.addEventListener( "unload", unloadHandler, false );
-
- // Support: IE 9 - 10 only
- } else if ( parent.attachEvent ) {
- parent.attachEvent( "onunload", unloadHandler );
- }
- }
-
- /* Attributes
- ---------------------------------------------------------------------- */
-
- // Support: IE<8
- // Verify that getAttribute really returns attributes and not properties
- // (excepting IE8 booleans)
- support.attributes = assert(function( div ) {
- div.className = "i";
- return !div.getAttribute("className");
- });
-
- /* getElement(s)By*
- ---------------------------------------------------------------------- */
-
- // Check if getElementsByTagName("*") returns only elements
- support.getElementsByTagName = assert(function( div ) {
- div.appendChild( document.createComment("") );
- return !div.getElementsByTagName("*").length;
- });
-
- // Support: IE<9
- support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
- // Support: IE<10
- // Check if getElementById returns elements by name
- // The broken getElementById methods don't pick up programatically-set names,
- // so use a roundabout getElementsByName test
- support.getById = assert(function( div ) {
- docElem.appendChild( div ).id = expando;
- return !document.getElementsByName || !document.getElementsByName( expando ).length;
- });
-
- // ID find and filter
- if ( support.getById ) {
- Expr.find["ID"] = function( id, context ) {
- if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
- var m = context.getElementById( id );
- return m ? [ m ] : [];
- }
- };
- Expr.filter["ID"] = function( id ) {
- var attrId = id.replace( runescape, funescape );
- return function( elem ) {
- return elem.getAttribute("id") === attrId;
- };
- };
- } else {
- // Support: IE6/7
- // getElementById is not reliable as a find shortcut
- delete Expr.find["ID"];
-
- Expr.filter["ID"] = function( id ) {
- var attrId = id.replace( runescape, funescape );
- return function( elem ) {
- var node = typeof elem.getAttributeNode !== "undefined" &&
- elem.getAttributeNode("id");
- return node && node.value === attrId;
- };
- };
- }
-
- // Tag
- Expr.find["TAG"] = support.getElementsByTagName ?
- function( tag, context ) {
- if ( typeof context.getElementsByTagName !== "undefined" ) {
- return context.getElementsByTagName( tag );
-
- // DocumentFragment nodes don't have gEBTN
- } else if ( support.qsa ) {
- return context.querySelectorAll( tag );
- }
- } :
-
- function( tag, context ) {
- var elem,
- tmp = [],
- i = 0,
- // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
- results = context.getElementsByTagName( tag );
-
- // Filter out possible comments
- if ( tag === "*" ) {
- while ( (elem = results[i++]) ) {
- if ( elem.nodeType === 1 ) {
- tmp.push( elem );
- }
- }
-
- return tmp;
- }
- return results;
- };
-
- // Class
- Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
- if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
- return context.getElementsByClassName( className );
- }
- };
-
- /* QSA/matchesSelector
- ---------------------------------------------------------------------- */
-
- // QSA and matchesSelector support
-
- // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
- rbuggyMatches = [];
-
- // qSa(:focus) reports false when true (Chrome 21)
- // We allow this because of a bug in IE8/9 that throws an error
- // whenever `document.activeElement` is accessed on an iframe
- // So, we allow :focus to pass through QSA all the time to avoid the IE error
- // See http://bugs.jquery.com/ticket/13378
- rbuggyQSA = [];
-
- if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
- // Build QSA regex
- // Regex strategy adopted from Diego Perini
- assert(function( div ) {
- // Select is set to empty string on purpose
- // This is to test IE's treatment of not explicitly
- // setting a boolean content attribute,
- // since its presence should be enough
- // http://bugs.jquery.com/ticket/12359
- docElem.appendChild( div ).innerHTML = "" +
- "";
-
- // Support: IE8, Opera 11-12.16
- // Nothing should be selected when empty strings follow ^= or $= or *=
- // The test attribute must be unknown in Opera but "safe" for WinRT
- // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
- if ( div.querySelectorAll("[msallowcapture^='']").length ) {
- rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
- }
-
- // Support: IE8
- // Boolean attributes and "value" are not treated correctly
- if ( !div.querySelectorAll("[selected]").length ) {
- rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
- }
-
- // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
- if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
- rbuggyQSA.push("~=");
- }
-
- // Webkit/Opera - :checked should return selected option elements
- // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
- // IE8 throws error here and will not see later tests
- if ( !div.querySelectorAll(":checked").length ) {
- rbuggyQSA.push(":checked");
- }
-
- // Support: Safari 8+, iOS 8+
- // https://bugs.webkit.org/show_bug.cgi?id=136851
- // In-page `selector#id sibing-combinator selector` fails
- if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
- rbuggyQSA.push(".#.+[+~]");
- }
- });
-
- assert(function( div ) {
- // Support: Windows 8 Native Apps
- // The type and name attributes are restricted during .innerHTML assignment
- var input = document.createElement("input");
- input.setAttribute( "type", "hidden" );
- div.appendChild( input ).setAttribute( "name", "D" );
-
- // Support: IE8
- // Enforce case-sensitivity of name attribute
- if ( div.querySelectorAll("[name=d]").length ) {
- rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
- }
-
- // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
- // IE8 throws error here and will not see later tests
- if ( !div.querySelectorAll(":enabled").length ) {
- rbuggyQSA.push( ":enabled", ":disabled" );
- }
-
- // Opera 10-11 does not throw on post-comma invalid pseudos
- div.querySelectorAll("*,:x");
- rbuggyQSA.push(",.*:");
- });
- }
-
- if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
- docElem.webkitMatchesSelector ||
- docElem.mozMatchesSelector ||
- docElem.oMatchesSelector ||
- docElem.msMatchesSelector) )) ) {
-
- assert(function( div ) {
- // Check to see if it's possible to do matchesSelector
- // on a disconnected node (IE 9)
- support.disconnectedMatch = matches.call( div, "div" );
-
- // This should fail with an exception
- // Gecko does not error, returns false instead
- matches.call( div, "[s!='']:x" );
- rbuggyMatches.push( "!=", pseudos );
- });
- }
-
- rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
- rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
- /* Contains
- ---------------------------------------------------------------------- */
- hasCompare = rnative.test( docElem.compareDocumentPosition );
-
- // Element contains another
- // Purposefully self-exclusive
- // As in, an element does not contain itself
- contains = hasCompare || rnative.test( docElem.contains ) ?
- function( a, b ) {
- var adown = a.nodeType === 9 ? a.documentElement : a,
- bup = b && b.parentNode;
- return a === bup || !!( bup && bup.nodeType === 1 && (
- adown.contains ?
- adown.contains( bup ) :
- a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
- ));
- } :
- function( a, b ) {
- if ( b ) {
- while ( (b = b.parentNode) ) {
- if ( b === a ) {
- return true;
- }
- }
- }
- return false;
- };
-
- /* Sorting
- ---------------------------------------------------------------------- */
-
- // Document order sorting
- sortOrder = hasCompare ?
- function( a, b ) {
-
- // Flag for duplicate removal
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
- }
-
- // Sort on method existence if only one input has compareDocumentPosition
- var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
- if ( compare ) {
- return compare;
- }
-
- // Calculate position if both inputs belong to the same document
- compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
- a.compareDocumentPosition( b ) :
-
- // Otherwise we know they are disconnected
- 1;
-
- // Disconnected nodes
- if ( compare & 1 ||
- (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
- // Choose the first element that is related to our preferred document
- if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
- return -1;
- }
- if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
- return 1;
- }
-
- // Maintain original order
- return sortInput ?
- ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
- 0;
- }
-
- return compare & 4 ? -1 : 1;
- } :
- function( a, b ) {
- // Exit early if the nodes are identical
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
- }
-
- var cur,
- i = 0,
- aup = a.parentNode,
- bup = b.parentNode,
- ap = [ a ],
- bp = [ b ];
-
- // Parentless nodes are either documents or disconnected
- if ( !aup || !bup ) {
- return a === document ? -1 :
- b === document ? 1 :
- aup ? -1 :
- bup ? 1 :
- sortInput ?
- ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
- 0;
-
- // If the nodes are siblings, we can do a quick check
- } else if ( aup === bup ) {
- return siblingCheck( a, b );
- }
-
- // Otherwise we need full lists of their ancestors for comparison
- cur = a;
- while ( (cur = cur.parentNode) ) {
- ap.unshift( cur );
- }
- cur = b;
- while ( (cur = cur.parentNode) ) {
- bp.unshift( cur );
- }
-
- // Walk down the tree looking for a discrepancy
- while ( ap[i] === bp[i] ) {
- i++;
- }
-
- return i ?
- // Do a sibling check if the nodes have a common ancestor
- siblingCheck( ap[i], bp[i] ) :
-
- // Otherwise nodes in our document sort first
- ap[i] === preferredDoc ? -1 :
- bp[i] === preferredDoc ? 1 :
- 0;
- };
-
- return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
- return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
- // Set document vars if needed
- if ( ( elem.ownerDocument || elem ) !== document ) {
- setDocument( elem );
- }
-
- // Make sure that attribute selectors are quoted
- expr = expr.replace( rattributeQuotes, "='$1']" );
-
- if ( support.matchesSelector && documentIsHTML &&
- !compilerCache[ expr + " " ] &&
- ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
- ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) {
-
- try {
- var ret = matches.call( elem, expr );
-
- // IE 9's matchesSelector returns false on disconnected nodes
- if ( ret || support.disconnectedMatch ||
- // As well, disconnected nodes are said to be in a document
- // fragment in IE 9
- elem.document && elem.document.nodeType !== 11 ) {
- return ret;
- }
- } catch (e) {}
- }
-
- return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
- // Set document vars if needed
- if ( ( context.ownerDocument || context ) !== document ) {
- setDocument( context );
- }
- return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
- // Set document vars if needed
- if ( ( elem.ownerDocument || elem ) !== document ) {
- setDocument( elem );
- }
-
- var fn = Expr.attrHandle[ name.toLowerCase() ],
- // Don't get fooled by Object.prototype properties (jQuery #13807)
- val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
- fn( elem, name, !documentIsHTML ) :
- undefined;
-
- return val !== undefined ?
- val :
- support.attributes || !documentIsHTML ?
- elem.getAttribute( name ) :
- (val = elem.getAttributeNode(name)) && val.specified ?
- val.value :
- null;
-};
-
-Sizzle.error = function( msg ) {
- throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
- var elem,
- duplicates = [],
- j = 0,
- i = 0;
-
- // Unless we *know* we can detect duplicates, assume their presence
- hasDuplicate = !support.detectDuplicates;
- sortInput = !support.sortStable && results.slice( 0 );
- results.sort( sortOrder );
-
- if ( hasDuplicate ) {
- while ( (elem = results[i++]) ) {
- if ( elem === results[ i ] ) {
- j = duplicates.push( i );
- }
- }
- while ( j-- ) {
- results.splice( duplicates[ j ], 1 );
- }
- }
-
- // Clear input after sorting to release objects
- // See https://github.com/jquery/sizzle/pull/225
- sortInput = null;
-
- return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
- var node,
- ret = "",
- i = 0,
- nodeType = elem.nodeType;
-
- if ( !nodeType ) {
- // If no nodeType, this is expected to be an array
- while ( (node = elem[i++]) ) {
- // Do not traverse comment nodes
- ret += getText( node );
- }
- } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
- // Use textContent for elements
- // innerText usage removed for consistency of new lines (jQuery #11153)
- if ( typeof elem.textContent === "string" ) {
- return elem.textContent;
- } else {
- // Traverse its children
- for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
- ret += getText( elem );
- }
- }
- } else if ( nodeType === 3 || nodeType === 4 ) {
- return elem.nodeValue;
- }
- // Do not include comment or processing instruction nodes
-
- return ret;
-};
-
-Expr = Sizzle.selectors = {
-
- // Can be adjusted by the user
- cacheLength: 50,
-
- createPseudo: markFunction,
-
- match: matchExpr,
-
- attrHandle: {},
-
- find: {},
-
- relative: {
- ">": { dir: "parentNode", first: true },
- " ": { dir: "parentNode" },
- "+": { dir: "previousSibling", first: true },
- "~": { dir: "previousSibling" }
- },
-
- preFilter: {
- "ATTR": function( match ) {
- match[1] = match[1].replace( runescape, funescape );
-
- // Move the given value to match[3] whether quoted or unquoted
- match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
- if ( match[2] === "~=" ) {
- match[3] = " " + match[3] + " ";
- }
-
- return match.slice( 0, 4 );
- },
-
- "CHILD": function( match ) {
- /* matches from matchExpr["CHILD"]
- 1 type (only|nth|...)
- 2 what (child|of-type)
- 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
- 4 xn-component of xn+y argument ([+-]?\d*n|)
- 5 sign of xn-component
- 6 x of xn-component
- 7 sign of y-component
- 8 y of y-component
- */
- match[1] = match[1].toLowerCase();
-
- if ( match[1].slice( 0, 3 ) === "nth" ) {
- // nth-* requires argument
- if ( !match[3] ) {
- Sizzle.error( match[0] );
- }
-
- // numeric x and y parameters for Expr.filter.CHILD
- // remember that false/true cast respectively to 0/1
- match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
- match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
- // other types prohibit arguments
- } else if ( match[3] ) {
- Sizzle.error( match[0] );
- }
-
- return match;
- },
-
- "PSEUDO": function( match ) {
- var excess,
- unquoted = !match[6] && match[2];
-
- if ( matchExpr["CHILD"].test( match[0] ) ) {
- return null;
- }
-
- // Accept quoted arguments as-is
- if ( match[3] ) {
- match[2] = match[4] || match[5] || "";
-
- // Strip excess characters from unquoted arguments
- } else if ( unquoted && rpseudo.test( unquoted ) &&
- // Get excess from tokenize (recursively)
- (excess = tokenize( unquoted, true )) &&
- // advance to the next closing parenthesis
- (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
- // excess is a negative index
- match[0] = match[0].slice( 0, excess );
- match[2] = unquoted.slice( 0, excess );
- }
-
- // Return only captures needed by the pseudo filter method (type and argument)
- return match.slice( 0, 3 );
- }
- },
-
- filter: {
-
- "TAG": function( nodeNameSelector ) {
- var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
- return nodeNameSelector === "*" ?
- function() { return true; } :
- function( elem ) {
- return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
- };
- },
-
- "CLASS": function( className ) {
- var pattern = classCache[ className + " " ];
-
- return pattern ||
- (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
- classCache( className, function( elem ) {
- return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
- });
- },
-
- "ATTR": function( name, operator, check ) {
- return function( elem ) {
- var result = Sizzle.attr( elem, name );
-
- if ( result == null ) {
- return operator === "!=";
- }
- if ( !operator ) {
- return true;
- }
-
- result += "";
-
- return operator === "=" ? result === check :
- operator === "!=" ? result !== check :
- operator === "^=" ? check && result.indexOf( check ) === 0 :
- operator === "*=" ? check && result.indexOf( check ) > -1 :
- operator === "$=" ? check && result.slice( -check.length ) === check :
- operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
- operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
- false;
- };
- },
-
- "CHILD": function( type, what, argument, first, last ) {
- var simple = type.slice( 0, 3 ) !== "nth",
- forward = type.slice( -4 ) !== "last",
- ofType = what === "of-type";
-
- return first === 1 && last === 0 ?
-
- // Shortcut for :nth-*(n)
- function( elem ) {
- return !!elem.parentNode;
- } :
-
- function( elem, context, xml ) {
- var cache, uniqueCache, outerCache, node, nodeIndex, start,
- dir = simple !== forward ? "nextSibling" : "previousSibling",
- parent = elem.parentNode,
- name = ofType && elem.nodeName.toLowerCase(),
- useCache = !xml && !ofType,
- diff = false;
-
- if ( parent ) {
-
- // :(first|last|only)-(child|of-type)
- if ( simple ) {
- while ( dir ) {
- node = elem;
- while ( (node = node[ dir ]) ) {
- if ( ofType ?
- node.nodeName.toLowerCase() === name :
- node.nodeType === 1 ) {
-
- return false;
- }
- }
- // Reverse direction for :only-* (if we haven't yet done so)
- start = dir = type === "only" && !start && "nextSibling";
- }
- return true;
- }
-
- start = [ forward ? parent.firstChild : parent.lastChild ];
-
- // non-xml :nth-child(...) stores cache data on `parent`
- if ( forward && useCache ) {
-
- // Seek `elem` from a previously-cached index
-
- // ...in a gzip-friendly way
- node = parent;
- outerCache = node[ expando ] || (node[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
-
- cache = uniqueCache[ type ] || [];
- nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
- diff = nodeIndex && cache[ 2 ];
- node = nodeIndex && parent.childNodes[ nodeIndex ];
-
- while ( (node = ++nodeIndex && node && node[ dir ] ||
-
- // Fallback to seeking `elem` from the start
- (diff = nodeIndex = 0) || start.pop()) ) {
-
- // When found, cache indexes on `parent` and break
- if ( node.nodeType === 1 && ++diff && node === elem ) {
- uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
- break;
- }
- }
-
- } else {
- // Use previously-cached element index if available
- if ( useCache ) {
- // ...in a gzip-friendly way
- node = elem;
- outerCache = node[ expando ] || (node[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
-
- cache = uniqueCache[ type ] || [];
- nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
- diff = nodeIndex;
- }
-
- // xml :nth-child(...)
- // or :nth-last-child(...) or :nth(-last)?-of-type(...)
- if ( diff === false ) {
- // Use the same loop as above to seek `elem` from the start
- while ( (node = ++nodeIndex && node && node[ dir ] ||
- (diff = nodeIndex = 0) || start.pop()) ) {
-
- if ( ( ofType ?
- node.nodeName.toLowerCase() === name :
- node.nodeType === 1 ) &&
- ++diff ) {
-
- // Cache the index of each encountered element
- if ( useCache ) {
- outerCache = node[ expando ] || (node[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ node.uniqueID ] ||
- (outerCache[ node.uniqueID ] = {});
-
- uniqueCache[ type ] = [ dirruns, diff ];
- }
-
- if ( node === elem ) {
- break;
- }
- }
- }
- }
- }
-
- // Incorporate the offset, then check against cycle size
- diff -= last;
- return diff === first || ( diff % first === 0 && diff / first >= 0 );
- }
- };
- },
-
- "PSEUDO": function( pseudo, argument ) {
- // pseudo-class names are case-insensitive
- // http://www.w3.org/TR/selectors/#pseudo-classes
- // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
- // Remember that setFilters inherits from pseudos
- var args,
- fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
- Sizzle.error( "unsupported pseudo: " + pseudo );
-
- // The user may use createPseudo to indicate that
- // arguments are needed to create the filter function
- // just as Sizzle does
- if ( fn[ expando ] ) {
- return fn( argument );
- }
-
- // But maintain support for old signatures
- if ( fn.length > 1 ) {
- args = [ pseudo, pseudo, "", argument ];
- return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
- markFunction(function( seed, matches ) {
- var idx,
- matched = fn( seed, argument ),
- i = matched.length;
- while ( i-- ) {
- idx = indexOf( seed, matched[i] );
- seed[ idx ] = !( matches[ idx ] = matched[i] );
- }
- }) :
- function( elem ) {
- return fn( elem, 0, args );
- };
- }
-
- return fn;
- }
- },
-
- pseudos: {
- // Potentially complex pseudos
- "not": markFunction(function( selector ) {
- // Trim the selector passed to compile
- // to avoid treating leading and trailing
- // spaces as combinators
- var input = [],
- results = [],
- matcher = compile( selector.replace( rtrim, "$1" ) );
-
- return matcher[ expando ] ?
- markFunction(function( seed, matches, context, xml ) {
- var elem,
- unmatched = matcher( seed, null, xml, [] ),
- i = seed.length;
-
- // Match elements unmatched by `matcher`
- while ( i-- ) {
- if ( (elem = unmatched[i]) ) {
- seed[i] = !(matches[i] = elem);
- }
- }
- }) :
- function( elem, context, xml ) {
- input[0] = elem;
- matcher( input, null, xml, results );
- // Don't keep the element (issue #299)
- input[0] = null;
- return !results.pop();
- };
- }),
-
- "has": markFunction(function( selector ) {
- return function( elem ) {
- return Sizzle( selector, elem ).length > 0;
- };
- }),
-
- "contains": markFunction(function( text ) {
- text = text.replace( runescape, funescape );
- return function( elem ) {
- return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
- };
- }),
-
- // "Whether an element is represented by a :lang() selector
- // is based solely on the element's language value
- // being equal to the identifier C,
- // or beginning with the identifier C immediately followed by "-".
- // The matching of C against the element's language value is performed case-insensitively.
- // The identifier C does not have to be a valid language name."
- // http://www.w3.org/TR/selectors/#lang-pseudo
- "lang": markFunction( function( lang ) {
- // lang value must be a valid identifier
- if ( !ridentifier.test(lang || "") ) {
- Sizzle.error( "unsupported lang: " + lang );
- }
- lang = lang.replace( runescape, funescape ).toLowerCase();
- return function( elem ) {
- var elemLang;
- do {
- if ( (elemLang = documentIsHTML ?
- elem.lang :
- elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
- elemLang = elemLang.toLowerCase();
- return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
- }
- } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
- return false;
- };
- }),
-
- // Miscellaneous
- "target": function( elem ) {
- var hash = window.location && window.location.hash;
- return hash && hash.slice( 1 ) === elem.id;
- },
-
- "root": function( elem ) {
- return elem === docElem;
- },
-
- "focus": function( elem ) {
- return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
- },
-
- // Boolean properties
- "enabled": function( elem ) {
- return elem.disabled === false;
- },
-
- "disabled": function( elem ) {
- return elem.disabled === true;
- },
-
- "checked": function( elem ) {
- // In CSS3, :checked should return both checked and selected elements
- // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
- var nodeName = elem.nodeName.toLowerCase();
- return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
- },
-
- "selected": function( elem ) {
- // Accessing this property makes selected-by-default
- // options in Safari work properly
- if ( elem.parentNode ) {
- elem.parentNode.selectedIndex;
- }
-
- return elem.selected === true;
- },
-
- // Contents
- "empty": function( elem ) {
- // http://www.w3.org/TR/selectors/#empty-pseudo
- // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
- // but not by others (comment: 8; processing instruction: 7; etc.)
- // nodeType < 6 works because attributes (2) do not appear as children
- for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
- if ( elem.nodeType < 6 ) {
- return false;
- }
- }
- return true;
- },
-
- "parent": function( elem ) {
- return !Expr.pseudos["empty"]( elem );
- },
-
- // Element/input types
- "header": function( elem ) {
- return rheader.test( elem.nodeName );
- },
-
- "input": function( elem ) {
- return rinputs.test( elem.nodeName );
- },
-
- "button": function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return name === "input" && elem.type === "button" || name === "button";
- },
-
- "text": function( elem ) {
- var attr;
- return elem.nodeName.toLowerCase() === "input" &&
- elem.type === "text" &&
-
- // Support: IE<8
- // New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
- ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
- },
-
- // Position-in-collection
- "first": createPositionalPseudo(function() {
- return [ 0 ];
- }),
-
- "last": createPositionalPseudo(function( matchIndexes, length ) {
- return [ length - 1 ];
- }),
-
- "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
- return [ argument < 0 ? argument + length : argument ];
- }),
-
- "even": createPositionalPseudo(function( matchIndexes, length ) {
- var i = 0;
- for ( ; i < length; i += 2 ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- }),
-
- "odd": createPositionalPseudo(function( matchIndexes, length ) {
- var i = 1;
- for ( ; i < length; i += 2 ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- }),
-
- "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
- var i = argument < 0 ? argument + length : argument;
- for ( ; --i >= 0; ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- }),
-
- "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
- var i = argument < 0 ? argument + length : argument;
- for ( ; ++i < length; ) {
- matchIndexes.push( i );
- }
- return matchIndexes;
- })
- }
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
- Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
- Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
- var matched, match, tokens, type,
- soFar, groups, preFilters,
- cached = tokenCache[ selector + " " ];
-
- if ( cached ) {
- return parseOnly ? 0 : cached.slice( 0 );
- }
-
- soFar = selector;
- groups = [];
- preFilters = Expr.preFilter;
-
- while ( soFar ) {
-
- // Comma and first run
- if ( !matched || (match = rcomma.exec( soFar )) ) {
- if ( match ) {
- // Don't consume trailing commas as valid
- soFar = soFar.slice( match[0].length ) || soFar;
- }
- groups.push( (tokens = []) );
- }
-
- matched = false;
-
- // Combinators
- if ( (match = rcombinators.exec( soFar )) ) {
- matched = match.shift();
- tokens.push({
- value: matched,
- // Cast descendant combinators to space
- type: match[0].replace( rtrim, " " )
- });
- soFar = soFar.slice( matched.length );
- }
-
- // Filters
- for ( type in Expr.filter ) {
- if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
- (match = preFilters[ type ]( match ))) ) {
- matched = match.shift();
- tokens.push({
- value: matched,
- type: type,
- matches: match
- });
- soFar = soFar.slice( matched.length );
- }
- }
-
- if ( !matched ) {
- break;
- }
- }
-
- // Return the length of the invalid excess
- // if we're just parsing
- // Otherwise, throw an error or return tokens
- return parseOnly ?
- soFar.length :
- soFar ?
- Sizzle.error( selector ) :
- // Cache the tokens
- tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
- var i = 0,
- len = tokens.length,
- selector = "";
- for ( ; i < len; i++ ) {
- selector += tokens[i].value;
- }
- return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
- var dir = combinator.dir,
- checkNonElements = base && dir === "parentNode",
- doneName = done++;
-
- return combinator.first ?
- // Check against closest ancestor/preceding element
- function( elem, context, xml ) {
- while ( (elem = elem[ dir ]) ) {
- if ( elem.nodeType === 1 || checkNonElements ) {
- return matcher( elem, context, xml );
- }
- }
- } :
-
- // Check against all ancestor/preceding elements
- function( elem, context, xml ) {
- var oldCache, uniqueCache, outerCache,
- newCache = [ dirruns, doneName ];
-
- // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
- if ( xml ) {
- while ( (elem = elem[ dir ]) ) {
- if ( elem.nodeType === 1 || checkNonElements ) {
- if ( matcher( elem, context, xml ) ) {
- return true;
- }
- }
- }
- } else {
- while ( (elem = elem[ dir ]) ) {
- if ( elem.nodeType === 1 || checkNonElements ) {
- outerCache = elem[ expando ] || (elem[ expando ] = {});
-
- // Support: IE <9 only
- // Defend against cloned attroperties (jQuery gh-1709)
- uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
-
- if ( (oldCache = uniqueCache[ dir ]) &&
- oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
- // Assign to newCache so results back-propagate to previous elements
- return (newCache[ 2 ] = oldCache[ 2 ]);
- } else {
- // Reuse newcache so results back-propagate to previous elements
- uniqueCache[ dir ] = newCache;
-
- // A match means we're done; a fail means we have to keep checking
- if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
- return true;
- }
- }
- }
- }
- }
- };
-}
-
-function elementMatcher( matchers ) {
- return matchers.length > 1 ?
- function( elem, context, xml ) {
- var i = matchers.length;
- while ( i-- ) {
- if ( !matchers[i]( elem, context, xml ) ) {
- return false;
- }
- }
- return true;
- } :
- matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
- var i = 0,
- len = contexts.length;
- for ( ; i < len; i++ ) {
- Sizzle( selector, contexts[i], results );
- }
- return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
- var elem,
- newUnmatched = [],
- i = 0,
- len = unmatched.length,
- mapped = map != null;
-
- for ( ; i < len; i++ ) {
- if ( (elem = unmatched[i]) ) {
- if ( !filter || filter( elem, context, xml ) ) {
- newUnmatched.push( elem );
- if ( mapped ) {
- map.push( i );
- }
- }
- }
- }
-
- return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
- if ( postFilter && !postFilter[ expando ] ) {
- postFilter = setMatcher( postFilter );
- }
- if ( postFinder && !postFinder[ expando ] ) {
- postFinder = setMatcher( postFinder, postSelector );
- }
- return markFunction(function( seed, results, context, xml ) {
- var temp, i, elem,
- preMap = [],
- postMap = [],
- preexisting = results.length,
-
- // Get initial elements from seed or context
- elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
- // Prefilter to get matcher input, preserving a map for seed-results synchronization
- matcherIn = preFilter && ( seed || !selector ) ?
- condense( elems, preMap, preFilter, context, xml ) :
- elems,
-
- matcherOut = matcher ?
- // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
- postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
- // ...intermediate processing is necessary
- [] :
-
- // ...otherwise use results directly
- results :
- matcherIn;
-
- // Find primary matches
- if ( matcher ) {
- matcher( matcherIn, matcherOut, context, xml );
- }
-
- // Apply postFilter
- if ( postFilter ) {
- temp = condense( matcherOut, postMap );
- postFilter( temp, [], context, xml );
-
- // Un-match failing elements by moving them back to matcherIn
- i = temp.length;
- while ( i-- ) {
- if ( (elem = temp[i]) ) {
- matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
- }
- }
- }
-
- if ( seed ) {
- if ( postFinder || preFilter ) {
- if ( postFinder ) {
- // Get the final matcherOut by condensing this intermediate into postFinder contexts
- temp = [];
- i = matcherOut.length;
- while ( i-- ) {
- if ( (elem = matcherOut[i]) ) {
- // Restore matcherIn since elem is not yet a final match
- temp.push( (matcherIn[i] = elem) );
- }
- }
- postFinder( null, (matcherOut = []), temp, xml );
- }
-
- // Move matched elements from seed to results to keep them synchronized
- i = matcherOut.length;
- while ( i-- ) {
- if ( (elem = matcherOut[i]) &&
- (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
- seed[temp] = !(results[temp] = elem);
- }
- }
- }
-
- // Add elements to results, through postFinder if defined
- } else {
- matcherOut = condense(
- matcherOut === results ?
- matcherOut.splice( preexisting, matcherOut.length ) :
- matcherOut
- );
- if ( postFinder ) {
- postFinder( null, results, matcherOut, xml );
- } else {
- push.apply( results, matcherOut );
- }
- }
- });
-}
-
-function matcherFromTokens( tokens ) {
- var checkContext, matcher, j,
- len = tokens.length,
- leadingRelative = Expr.relative[ tokens[0].type ],
- implicitRelative = leadingRelative || Expr.relative[" "],
- i = leadingRelative ? 1 : 0,
-
- // The foundational matcher ensures that elements are reachable from top-level context(s)
- matchContext = addCombinator( function( elem ) {
- return elem === checkContext;
- }, implicitRelative, true ),
- matchAnyContext = addCombinator( function( elem ) {
- return indexOf( checkContext, elem ) > -1;
- }, implicitRelative, true ),
- matchers = [ function( elem, context, xml ) {
- var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
- (checkContext = context).nodeType ?
- matchContext( elem, context, xml ) :
- matchAnyContext( elem, context, xml ) );
- // Avoid hanging onto element (issue #299)
- checkContext = null;
- return ret;
- } ];
-
- for ( ; i < len; i++ ) {
- if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
- matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
- } else {
- matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
- // Return special upon seeing a positional matcher
- if ( matcher[ expando ] ) {
- // Find the next relative operator (if any) for proper handling
- j = ++i;
- for ( ; j < len; j++ ) {
- if ( Expr.relative[ tokens[j].type ] ) {
- break;
- }
- }
- return setMatcher(
- i > 1 && elementMatcher( matchers ),
- i > 1 && toSelector(
- // If the preceding token was a descendant combinator, insert an implicit any-element `*`
- tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
- ).replace( rtrim, "$1" ),
- matcher,
- i < j && matcherFromTokens( tokens.slice( i, j ) ),
- j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
- j < len && toSelector( tokens )
- );
- }
- matchers.push( matcher );
- }
- }
-
- return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
- var bySet = setMatchers.length > 0,
- byElement = elementMatchers.length > 0,
- superMatcher = function( seed, context, xml, results, outermost ) {
- var elem, j, matcher,
- matchedCount = 0,
- i = "0",
- unmatched = seed && [],
- setMatched = [],
- contextBackup = outermostContext,
- // We must always have either seed elements or outermost context
- elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
- // Use integer dirruns iff this is the outermost matcher
- dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
- len = elems.length;
-
- if ( outermost ) {
- outermostContext = context === document || context || outermost;
- }
-
- // Add elements passing elementMatchers directly to results
- // Support: IE<9, Safari
- // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id
- for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
- if ( byElement && elem ) {
- j = 0;
- if ( !context && elem.ownerDocument !== document ) {
- setDocument( elem );
- xml = !documentIsHTML;
- }
- while ( (matcher = elementMatchers[j++]) ) {
- if ( matcher( elem, context || document, xml) ) {
- results.push( elem );
- break;
- }
- }
- if ( outermost ) {
- dirruns = dirrunsUnique;
- }
- }
-
- // Track unmatched elements for set filters
- if ( bySet ) {
- // They will have gone through all possible matchers
- if ( (elem = !matcher && elem) ) {
- matchedCount--;
- }
-
- // Lengthen the array for every element, matched or not
- if ( seed ) {
- unmatched.push( elem );
- }
- }
- }
-
- // `i` is now the count of elements visited above, and adding it to `matchedCount`
- // makes the latter nonnegative.
- matchedCount += i;
-
- // Apply set filters to unmatched elements
- // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
- // equals `i`), unless we didn't visit _any_ elements in the above loop because we have
- // no element matchers and no seed.
- // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
- // case, which will result in a "00" `matchedCount` that differs from `i` but is also
- // numerically zero.
- if ( bySet && i !== matchedCount ) {
- j = 0;
- while ( (matcher = setMatchers[j++]) ) {
- matcher( unmatched, setMatched, context, xml );
- }
-
- if ( seed ) {
- // Reintegrate element matches to eliminate the need for sorting
- if ( matchedCount > 0 ) {
- while ( i-- ) {
- if ( !(unmatched[i] || setMatched[i]) ) {
- setMatched[i] = pop.call( results );
- }
- }
- }
-
- // Discard index placeholder values to get only actual matches
- setMatched = condense( setMatched );
- }
-
- // Add matches to results
- push.apply( results, setMatched );
-
- // Seedless set matches succeeding multiple successful matchers stipulate sorting
- if ( outermost && !seed && setMatched.length > 0 &&
- ( matchedCount + setMatchers.length ) > 1 ) {
-
- Sizzle.uniqueSort( results );
- }
- }
-
- // Override manipulation of globals by nested matchers
- if ( outermost ) {
- dirruns = dirrunsUnique;
- outermostContext = contextBackup;
- }
-
- return unmatched;
- };
-
- return bySet ?
- markFunction( superMatcher ) :
- superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
- var i,
- setMatchers = [],
- elementMatchers = [],
- cached = compilerCache[ selector + " " ];
-
- if ( !cached ) {
- // Generate a function of recursive functions that can be used to check each element
- if ( !match ) {
- match = tokenize( selector );
- }
- i = match.length;
- while ( i-- ) {
- cached = matcherFromTokens( match[i] );
- if ( cached[ expando ] ) {
- setMatchers.push( cached );
- } else {
- elementMatchers.push( cached );
- }
- }
-
- // Cache the compiled function
- cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
- // Save selector and tokenization
- cached.selector = selector;
- }
- return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- * selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- * selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
- var i, tokens, token, type, find,
- compiled = typeof selector === "function" && selector,
- match = !seed && tokenize( (selector = compiled.selector || selector) );
-
- results = results || [];
-
- // Try to minimize operations if there is only one selector in the list and no seed
- // (the latter of which guarantees us context)
- if ( match.length === 1 ) {
-
- // Reduce context if the leading compound selector is an ID
- tokens = match[0] = match[0].slice( 0 );
- if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
- support.getById && context.nodeType === 9 && documentIsHTML &&
- Expr.relative[ tokens[1].type ] ) {
-
- context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
- if ( !context ) {
- return results;
-
- // Precompiled matchers will still verify ancestry, so step up a level
- } else if ( compiled ) {
- context = context.parentNode;
- }
-
- selector = selector.slice( tokens.shift().value.length );
- }
-
- // Fetch a seed set for right-to-left matching
- i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
- while ( i-- ) {
- token = tokens[i];
-
- // Abort if we hit a combinator
- if ( Expr.relative[ (type = token.type) ] ) {
- break;
- }
- if ( (find = Expr.find[ type ]) ) {
- // Search, expanding context for leading sibling combinators
- if ( (seed = find(
- token.matches[0].replace( runescape, funescape ),
- rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
- )) ) {
-
- // If seed is empty or no tokens remain, we can return early
- tokens.splice( i, 1 );
- selector = seed.length && toSelector( tokens );
- if ( !selector ) {
- push.apply( results, seed );
- return results;
- }
-
- break;
- }
- }
- }
- }
-
- // Compile and execute a filtering function if one is not provided
- // Provide `match` to avoid retokenization if we modified the selector above
- ( compiled || compile( selector, match ) )(
- seed,
- context,
- !documentIsHTML,
- results,
- !context || rsibling.test( selector ) && testContext( context.parentNode ) || context
- );
- return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
- // Should return 1, but returns 4 (following)
- return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
- div.innerHTML = "";
- return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
- addHandle( "type|href|height|width", function( elem, name, isXML ) {
- if ( !isXML ) {
- return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
- }
- });
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
- div.innerHTML = "";
- div.firstChild.setAttribute( "value", "" );
- return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
- addHandle( "value", function( elem, name, isXML ) {
- if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
- return elem.defaultValue;
- }
- });
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
- return div.getAttribute("disabled") == null;
-}) ) {
- addHandle( booleans, function( elem, name, isXML ) {
- var val;
- if ( !isXML ) {
- return elem[ name ] === true ? name.toLowerCase() :
- (val = elem.getAttributeNode( name )) && val.specified ?
- val.value :
- null;
- }
- });
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var dir = function( elem, dir, until ) {
- var matched = [],
- truncate = until !== undefined;
-
- while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
- if ( elem.nodeType === 1 ) {
- if ( truncate && jQuery( elem ).is( until ) ) {
- break;
- }
- matched.push( elem );
- }
- }
- return matched;
-};
-
-
-var siblings = function( n, elem ) {
- var matched = [];
-
- for ( ; n; n = n.nextSibling ) {
- if ( n.nodeType === 1 && n !== elem ) {
- matched.push( n );
- }
- }
-
- return matched;
-};
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
- if ( jQuery.isFunction( qualifier ) ) {
- return jQuery.grep( elements, function( elem, i ) {
- /* jshint -W018 */
- return !!qualifier.call( elem, i, elem ) !== not;
- } );
-
- }
-
- if ( qualifier.nodeType ) {
- return jQuery.grep( elements, function( elem ) {
- return ( elem === qualifier ) !== not;
- } );
-
- }
-
- if ( typeof qualifier === "string" ) {
- if ( risSimple.test( qualifier ) ) {
- return jQuery.filter( qualifier, elements, not );
- }
-
- qualifier = jQuery.filter( qualifier, elements );
- }
-
- return jQuery.grep( elements, function( elem ) {
- return ( jQuery.inArray( elem, qualifier ) > -1 ) !== not;
- } );
-}
-
-jQuery.filter = function( expr, elems, not ) {
- var elem = elems[ 0 ];
-
- if ( not ) {
- expr = ":not(" + expr + ")";
- }
-
- return elems.length === 1 && elem.nodeType === 1 ?
- jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
- jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
- return elem.nodeType === 1;
- } ) );
-};
-
-jQuery.fn.extend( {
- find: function( selector ) {
- var i,
- ret = [],
- self = this,
- len = self.length;
-
- if ( typeof selector !== "string" ) {
- return this.pushStack( jQuery( selector ).filter( function() {
- for ( i = 0; i < len; i++ ) {
- if ( jQuery.contains( self[ i ], this ) ) {
- return true;
- }
- }
- } ) );
- }
-
- for ( i = 0; i < len; i++ ) {
- jQuery.find( selector, self[ i ], ret );
- }
-
- // Needed because $( selector, context ) becomes $( context ).find( selector )
- ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
- ret.selector = this.selector ? this.selector + " " + selector : selector;
- return ret;
- },
- filter: function( selector ) {
- return this.pushStack( winnow( this, selector || [], false ) );
- },
- not: function( selector ) {
- return this.pushStack( winnow( this, selector || [], true ) );
- },
- is: function( selector ) {
- return !!winnow(
- this,
-
- // If this is a positional/relative selector, check membership in the returned set
- // so $("p:first").is("p:last") won't return true for a doc with two "p".
- typeof selector === "string" && rneedsContext.test( selector ) ?
- jQuery( selector ) :
- selector || [],
- false
- ).length;
- }
-} );
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
- // A simple way to check for HTML strings
- // Prioritize #id over to avoid XSS via location.hash (#9521)
- // Strict HTML recognition (#11290: must start with <)
- rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
- init = jQuery.fn.init = function( selector, context, root ) {
- var match, elem;
-
- // HANDLE: $(""), $(null), $(undefined), $(false)
- if ( !selector ) {
- return this;
- }
-
- // init accepts an alternate rootjQuery
- // so migrate can support jQuery.sub (gh-2101)
- root = root || rootjQuery;
-
- // Handle HTML strings
- if ( typeof selector === "string" ) {
- if ( selector.charAt( 0 ) === "<" &&
- selector.charAt( selector.length - 1 ) === ">" &&
- selector.length >= 3 ) {
-
- // Assume that strings that start and end with <> are HTML and skip the regex check
- match = [ null, selector, null ];
-
- } else {
- match = rquickExpr.exec( selector );
- }
-
- // Match html or make sure no context is specified for #id
- if ( match && ( match[ 1 ] || !context ) ) {
-
- // HANDLE: $(html) -> $(array)
- if ( match[ 1 ] ) {
- context = context instanceof jQuery ? context[ 0 ] : context;
-
- // scripts is true for back-compat
- // Intentionally let the error be thrown if parseHTML is not present
- jQuery.merge( this, jQuery.parseHTML(
- match[ 1 ],
- context && context.nodeType ? context.ownerDocument || context : document,
- true
- ) );
-
- // HANDLE: $(html, props)
- if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
- for ( match in context ) {
-
- // Properties of context are called as methods if possible
- if ( jQuery.isFunction( this[ match ] ) ) {
- this[ match ]( context[ match ] );
-
- // ...and otherwise set as attributes
- } else {
- this.attr( match, context[ match ] );
- }
- }
- }
-
- return this;
-
- // HANDLE: $(#id)
- } else {
- elem = document.getElementById( match[ 2 ] );
-
- // Check parentNode to catch when Blackberry 4.6 returns
- // nodes that are no longer in the document #6963
- if ( elem && elem.parentNode ) {
-
- // Handle the case where IE and Opera return items
- // by name instead of ID
- if ( elem.id !== match[ 2 ] ) {
- return rootjQuery.find( selector );
- }
-
- // Otherwise, we inject the element directly into the jQuery object
- this.length = 1;
- this[ 0 ] = elem;
- }
-
- this.context = document;
- this.selector = selector;
- return this;
- }
-
- // HANDLE: $(expr, $(...))
- } else if ( !context || context.jquery ) {
- return ( context || root ).find( selector );
-
- // HANDLE: $(expr, context)
- // (which is just equivalent to: $(context).find(expr)
- } else {
- return this.constructor( context ).find( selector );
- }
-
- // HANDLE: $(DOMElement)
- } else if ( selector.nodeType ) {
- this.context = this[ 0 ] = selector;
- this.length = 1;
- return this;
-
- // HANDLE: $(function)
- // Shortcut for document ready
- } else if ( jQuery.isFunction( selector ) ) {
- return typeof root.ready !== "undefined" ?
- root.ready( selector ) :
-
- // Execute immediately if ready is not present
- selector( jQuery );
- }
-
- if ( selector.selector !== undefined ) {
- this.selector = selector.selector;
- this.context = selector.context;
- }
-
- return jQuery.makeArray( selector, this );
- };
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-
- // methods guaranteed to produce a unique set when starting from a unique set
- guaranteedUnique = {
- children: true,
- contents: true,
- next: true,
- prev: true
- };
-
-jQuery.fn.extend( {
- has: function( target ) {
- var i,
- targets = jQuery( target, this ),
- len = targets.length;
-
- return this.filter( function() {
- for ( i = 0; i < len; i++ ) {
- if ( jQuery.contains( this, targets[ i ] ) ) {
- return true;
- }
- }
- } );
- },
-
- closest: function( selectors, context ) {
- var cur,
- i = 0,
- l = this.length,
- matched = [],
- pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
- jQuery( selectors, context || this.context ) :
- 0;
-
- for ( ; i < l; i++ ) {
- for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
-
- // Always skip document fragments
- if ( cur.nodeType < 11 && ( pos ?
- pos.index( cur ) > -1 :
-
- // Don't pass non-elements to Sizzle
- cur.nodeType === 1 &&
- jQuery.find.matchesSelector( cur, selectors ) ) ) {
-
- matched.push( cur );
- break;
- }
- }
- }
-
- return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
- },
-
- // Determine the position of an element within
- // the matched set of elements
- index: function( elem ) {
-
- // No argument, return index in parent
- if ( !elem ) {
- return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
- }
-
- // index in selector
- if ( typeof elem === "string" ) {
- return jQuery.inArray( this[ 0 ], jQuery( elem ) );
- }
-
- // Locate the position of the desired element
- return jQuery.inArray(
-
- // If it receives a jQuery object, the first element is used
- elem.jquery ? elem[ 0 ] : elem, this );
- },
-
- add: function( selector, context ) {
- return this.pushStack(
- jQuery.uniqueSort(
- jQuery.merge( this.get(), jQuery( selector, context ) )
- )
- );
- },
-
- addBack: function( selector ) {
- return this.add( selector == null ?
- this.prevObject : this.prevObject.filter( selector )
- );
- }
-} );
-
-function sibling( cur, dir ) {
- do {
- cur = cur[ dir ];
- } while ( cur && cur.nodeType !== 1 );
-
- return cur;
-}
-
-jQuery.each( {
- parent: function( elem ) {
- var parent = elem.parentNode;
- return parent && parent.nodeType !== 11 ? parent : null;
- },
- parents: function( elem ) {
- return dir( elem, "parentNode" );
- },
- parentsUntil: function( elem, i, until ) {
- return dir( elem, "parentNode", until );
- },
- next: function( elem ) {
- return sibling( elem, "nextSibling" );
- },
- prev: function( elem ) {
- return sibling( elem, "previousSibling" );
- },
- nextAll: function( elem ) {
- return dir( elem, "nextSibling" );
- },
- prevAll: function( elem ) {
- return dir( elem, "previousSibling" );
- },
- nextUntil: function( elem, i, until ) {
- return dir( elem, "nextSibling", until );
- },
- prevUntil: function( elem, i, until ) {
- return dir( elem, "previousSibling", until );
- },
- siblings: function( elem ) {
- return siblings( ( elem.parentNode || {} ).firstChild, elem );
- },
- children: function( elem ) {
- return siblings( elem.firstChild );
- },
- contents: function( elem ) {
- return jQuery.nodeName( elem, "iframe" ) ?
- elem.contentDocument || elem.contentWindow.document :
- jQuery.merge( [], elem.childNodes );
- }
-}, function( name, fn ) {
- jQuery.fn[ name ] = function( until, selector ) {
- var ret = jQuery.map( this, fn, until );
-
- if ( name.slice( -5 ) !== "Until" ) {
- selector = until;
- }
-
- if ( selector && typeof selector === "string" ) {
- ret = jQuery.filter( selector, ret );
- }
-
- if ( this.length > 1 ) {
-
- // Remove duplicates
- if ( !guaranteedUnique[ name ] ) {
- ret = jQuery.uniqueSort( ret );
- }
-
- // Reverse order for parents* and prev-derivatives
- if ( rparentsprev.test( name ) ) {
- ret = ret.reverse();
- }
- }
-
- return this.pushStack( ret );
- };
-} );
-var rnotwhite = ( /\S+/g );
-
-
-
-// Convert String-formatted options into Object-formatted ones
-function createOptions( options ) {
- var object = {};
- jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
- object[ flag ] = true;
- } );
- return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- * options: an optional list of space-separated options that will change how
- * the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- * once: will ensure the callback list can only be fired once (like a Deferred)
- *
- * memory: will keep track of previous values and will call any callback added
- * after the list has been fired right away with the latest "memorized"
- * values (like a Deferred)
- *
- * unique: will ensure a callback can only be added once (no duplicate in the list)
- *
- * stopOnFalse: interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
- // Convert options from String-formatted to Object-formatted if needed
- // (we check in cache first)
- options = typeof options === "string" ?
- createOptions( options ) :
- jQuery.extend( {}, options );
-
- var // Flag to know if list is currently firing
- firing,
-
- // Last fire value for non-forgettable lists
- memory,
-
- // Flag to know if list was already fired
- fired,
-
- // Flag to prevent firing
- locked,
-
- // Actual callback list
- list = [],
-
- // Queue of execution data for repeatable lists
- queue = [],
-
- // Index of currently firing callback (modified by add/remove as needed)
- firingIndex = -1,
-
- // Fire callbacks
- fire = function() {
-
- // Enforce single-firing
- locked = options.once;
-
- // Execute callbacks for all pending executions,
- // respecting firingIndex overrides and runtime changes
- fired = firing = true;
- for ( ; queue.length; firingIndex = -1 ) {
- memory = queue.shift();
- while ( ++firingIndex < list.length ) {
-
- // Run callback and check for early termination
- if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
- options.stopOnFalse ) {
-
- // Jump to end and forget the data so .add doesn't re-fire
- firingIndex = list.length;
- memory = false;
- }
- }
- }
-
- // Forget the data if we're done with it
- if ( !options.memory ) {
- memory = false;
- }
-
- firing = false;
-
- // Clean up if we're done firing for good
- if ( locked ) {
-
- // Keep an empty list if we have data for future add calls
- if ( memory ) {
- list = [];
-
- // Otherwise, this object is spent
- } else {
- list = "";
- }
- }
- },
-
- // Actual Callbacks object
- self = {
-
- // Add a callback or a collection of callbacks to the list
- add: function() {
- if ( list ) {
-
- // If we have memory from a past run, we should fire after adding
- if ( memory && !firing ) {
- firingIndex = list.length - 1;
- queue.push( memory );
- }
-
- ( function add( args ) {
- jQuery.each( args, function( _, arg ) {
- if ( jQuery.isFunction( arg ) ) {
- if ( !options.unique || !self.has( arg ) ) {
- list.push( arg );
- }
- } else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
-
- // Inspect recursively
- add( arg );
- }
- } );
- } )( arguments );
-
- if ( memory && !firing ) {
- fire();
- }
- }
- return this;
- },
-
- // Remove a callback from the list
- remove: function() {
- jQuery.each( arguments, function( _, arg ) {
- var index;
- while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
- list.splice( index, 1 );
-
- // Handle firing indexes
- if ( index <= firingIndex ) {
- firingIndex--;
- }
- }
- } );
- return this;
- },
-
- // Check if a given callback is in the list.
- // If no argument is given, return whether or not list has callbacks attached.
- has: function( fn ) {
- return fn ?
- jQuery.inArray( fn, list ) > -1 :
- list.length > 0;
- },
-
- // Remove all callbacks from the list
- empty: function() {
- if ( list ) {
- list = [];
- }
- return this;
- },
-
- // Disable .fire and .add
- // Abort any current/pending executions
- // Clear all callbacks and values
- disable: function() {
- locked = queue = [];
- list = memory = "";
- return this;
- },
- disabled: function() {
- return !list;
- },
-
- // Disable .fire
- // Also disable .add unless we have memory (since it would have no effect)
- // Abort any pending executions
- lock: function() {
- locked = true;
- if ( !memory ) {
- self.disable();
- }
- return this;
- },
- locked: function() {
- return !!locked;
- },
-
- // Call all callbacks with the given context and arguments
- fireWith: function( context, args ) {
- if ( !locked ) {
- args = args || [];
- args = [ context, args.slice ? args.slice() : args ];
- queue.push( args );
- if ( !firing ) {
- fire();
- }
- }
- return this;
- },
-
- // Call all the callbacks with the given arguments
- fire: function() {
- self.fireWith( this, arguments );
- return this;
- },
-
- // To know if the callbacks have already been called at least once
- fired: function() {
- return !!fired;
- }
- };
-
- return self;
-};
-
-
-jQuery.extend( {
-
- Deferred: function( func ) {
- var tuples = [
-
- // action, add listener, listener list, final state
- [ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
- [ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
- [ "notify", "progress", jQuery.Callbacks( "memory" ) ]
- ],
- state = "pending",
- promise = {
- state: function() {
- return state;
- },
- always: function() {
- deferred.done( arguments ).fail( arguments );
- return this;
- },
- then: function( /* fnDone, fnFail, fnProgress */ ) {
- var fns = arguments;
- return jQuery.Deferred( function( newDefer ) {
- jQuery.each( tuples, function( i, tuple ) {
- var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-
- // deferred[ done | fail | progress ] for forwarding actions to newDefer
- deferred[ tuple[ 1 ] ]( function() {
- var returned = fn && fn.apply( this, arguments );
- if ( returned && jQuery.isFunction( returned.promise ) ) {
- returned.promise()
- .progress( newDefer.notify )
- .done( newDefer.resolve )
- .fail( newDefer.reject );
- } else {
- newDefer[ tuple[ 0 ] + "With" ](
- this === promise ? newDefer.promise() : this,
- fn ? [ returned ] : arguments
- );
- }
- } );
- } );
- fns = null;
- } ).promise();
- },
-
- // Get a promise for this deferred
- // If obj is provided, the promise aspect is added to the object
- promise: function( obj ) {
- return obj != null ? jQuery.extend( obj, promise ) : promise;
- }
- },
- deferred = {};
-
- // Keep pipe for back-compat
- promise.pipe = promise.then;
-
- // Add list-specific methods
- jQuery.each( tuples, function( i, tuple ) {
- var list = tuple[ 2 ],
- stateString = tuple[ 3 ];
-
- // promise[ done | fail | progress ] = list.add
- promise[ tuple[ 1 ] ] = list.add;
-
- // Handle state
- if ( stateString ) {
- list.add( function() {
-
- // state = [ resolved | rejected ]
- state = stateString;
-
- // [ reject_list | resolve_list ].disable; progress_list.lock
- }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
- }
-
- // deferred[ resolve | reject | notify ]
- deferred[ tuple[ 0 ] ] = function() {
- deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
- return this;
- };
- deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
- } );
-
- // Make the deferred a promise
- promise.promise( deferred );
-
- // Call given func if any
- if ( func ) {
- func.call( deferred, deferred );
- }
-
- // All done!
- return deferred;
- },
-
- // Deferred helper
- when: function( subordinate /* , ..., subordinateN */ ) {
- var i = 0,
- resolveValues = slice.call( arguments ),
- length = resolveValues.length,
-
- // the count of uncompleted subordinates
- remaining = length !== 1 ||
- ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
- // the master Deferred.
- // If resolveValues consist of only a single Deferred, just use that.
- deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
- // Update function for both resolve and progress values
- updateFunc = function( i, contexts, values ) {
- return function( value ) {
- contexts[ i ] = this;
- values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
- if ( values === progressValues ) {
- deferred.notifyWith( contexts, values );
-
- } else if ( !( --remaining ) ) {
- deferred.resolveWith( contexts, values );
- }
- };
- },
-
- progressValues, progressContexts, resolveContexts;
-
- // add listeners to Deferred subordinates; treat others as resolved
- if ( length > 1 ) {
- progressValues = new Array( length );
- progressContexts = new Array( length );
- resolveContexts = new Array( length );
- for ( ; i < length; i++ ) {
- if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
- resolveValues[ i ].promise()
- .progress( updateFunc( i, progressContexts, progressValues ) )
- .done( updateFunc( i, resolveContexts, resolveValues ) )
- .fail( deferred.reject );
- } else {
- --remaining;
- }
- }
- }
-
- // if we're not waiting on anything, resolve the master
- if ( !remaining ) {
- deferred.resolveWith( resolveContexts, resolveValues );
- }
-
- return deferred.promise();
- }
-} );
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-
- // Add the callback
- jQuery.ready.promise().done( fn );
-
- return this;
-};
-
-jQuery.extend( {
-
- // Is the DOM ready to be used? Set to true once it occurs.
- isReady: false,
-
- // A counter to track how many items to wait for before
- // the ready event fires. See #6781
- readyWait: 1,
-
- // Hold (or release) the ready event
- holdReady: function( hold ) {
- if ( hold ) {
- jQuery.readyWait++;
- } else {
- jQuery.ready( true );
- }
- },
-
- // Handle when the DOM is ready
- ready: function( wait ) {
-
- // Abort if there are pending holds or we're already ready
- if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
- return;
- }
-
- // Remember that the DOM is ready
- jQuery.isReady = true;
-
- // If a normal DOM Ready event fired, decrement, and wait if need be
- if ( wait !== true && --jQuery.readyWait > 0 ) {
- return;
- }
-
- // If there are functions bound, to execute
- readyList.resolveWith( document, [ jQuery ] );
-
- // Trigger any bound ready events
- if ( jQuery.fn.triggerHandler ) {
- jQuery( document ).triggerHandler( "ready" );
- jQuery( document ).off( "ready" );
- }
- }
-} );
-
-/**
- * Clean-up method for dom ready events
- */
-function detach() {
- if ( document.addEventListener ) {
- document.removeEventListener( "DOMContentLoaded", completed );
- window.removeEventListener( "load", completed );
-
- } else {
- document.detachEvent( "onreadystatechange", completed );
- window.detachEvent( "onload", completed );
- }
-}
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-
- // readyState === "complete" is good enough for us to call the dom ready in oldIE
- if ( document.addEventListener ||
- window.event.type === "load" ||
- document.readyState === "complete" ) {
-
- detach();
- jQuery.ready();
- }
-}
-
-jQuery.ready.promise = function( obj ) {
- if ( !readyList ) {
-
- readyList = jQuery.Deferred();
-
- // Catch cases where $(document).ready() is called
- // after the browser event has already occurred.
- // Support: IE6-10
- // Older IE sometimes signals "interactive" too soon
- if ( document.readyState === "complete" ||
- ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
-
- // Handle it asynchronously to allow scripts the opportunity to delay ready
- window.setTimeout( jQuery.ready );
-
- // Standards-based browsers support DOMContentLoaded
- } else if ( document.addEventListener ) {
-
- // Use the handy event callback
- document.addEventListener( "DOMContentLoaded", completed );
-
- // A fallback to window.onload, that will always work
- window.addEventListener( "load", completed );
-
- // If IE event model is used
- } else {
-
- // Ensure firing before onload, maybe late but safe also for iframes
- document.attachEvent( "onreadystatechange", completed );
-
- // A fallback to window.onload, that will always work
- window.attachEvent( "onload", completed );
-
- // If IE and not a frame
- // continually check to see if the document is ready
- var top = false;
-
- try {
- top = window.frameElement == null && document.documentElement;
- } catch ( e ) {}
-
- if ( top && top.doScroll ) {
- ( function doScrollCheck() {
- if ( !jQuery.isReady ) {
-
- try {
-
- // Use the trick by Diego Perini
- // http://javascript.nwbox.com/IEContentLoaded/
- top.doScroll( "left" );
- } catch ( e ) {
- return window.setTimeout( doScrollCheck, 50 );
- }
-
- // detach all dom ready events
- detach();
-
- // and execute any waiting functions
- jQuery.ready();
- }
- } )();
- }
- }
- }
- return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Support: IE<9
-// Iteration over object's inherited properties before its own
-var i;
-for ( i in jQuery( support ) ) {
- break;
-}
-support.ownFirst = i === "0";
-
-// Note: most support tests are defined in their respective modules.
-// false until the test is run
-support.inlineBlockNeedsLayout = false;
-
-// Execute ASAP in case we need to set body.style.zoom
-jQuery( function() {
-
- // Minified: var a,b,c,d
- var val, div, body, container;
-
- body = document.getElementsByTagName( "body" )[ 0 ];
- if ( !body || !body.style ) {
-
- // Return for frameset docs that don't have a body
- return;
- }
-
- // Setup
- div = document.createElement( "div" );
- container = document.createElement( "div" );
- container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
- body.appendChild( container ).appendChild( div );
-
- if ( typeof div.style.zoom !== "undefined" ) {
-
- // Support: IE<8
- // Check if natively block-level elements act like inline-block
- // elements when setting their display to 'inline' and giving
- // them layout
- div.style.cssText = "display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1";
-
- support.inlineBlockNeedsLayout = val = div.offsetWidth === 3;
- if ( val ) {
-
- // Prevent IE 6 from affecting layout for positioned elements #11048
- // Prevent IE from shrinking the body in IE 7 mode #12869
- // Support: IE<8
- body.style.zoom = 1;
- }
- }
-
- body.removeChild( container );
-} );
-
-
-( function() {
- var div = document.createElement( "div" );
-
- // Support: IE<9
- support.deleteExpando = true;
- try {
- delete div.test;
- } catch ( e ) {
- support.deleteExpando = false;
- }
-
- // Null elements to avoid leaks in IE.
- div = null;
-} )();
-var acceptData = function( elem ) {
- var noData = jQuery.noData[ ( elem.nodeName + " " ).toLowerCase() ],
- nodeType = +elem.nodeType || 1;
-
- // Do not set data on non-element DOM nodes because it will not be cleared (#8335).
- return nodeType !== 1 && nodeType !== 9 ?
- false :
-
- // Nodes accept data unless otherwise specified; rejection can be conditional
- !noData || noData !== true && elem.getAttribute( "classid" ) === noData;
-};
-
-
-
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
- rmultiDash = /([A-Z])/g;
-
-function dataAttr( elem, key, data ) {
-
- // If nothing was found internally, try to fetch any
- // data from the HTML5 data-* attribute
- if ( data === undefined && elem.nodeType === 1 ) {
-
- var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
- data = elem.getAttribute( name );
-
- if ( typeof data === "string" ) {
- try {
- data = data === "true" ? true :
- data === "false" ? false :
- data === "null" ? null :
-
- // Only convert to a number if it doesn't change the string
- +data + "" === data ? +data :
- rbrace.test( data ) ? jQuery.parseJSON( data ) :
- data;
- } catch ( e ) {}
-
- // Make sure we set the data so it isn't changed later
- jQuery.data( elem, key, data );
-
- } else {
- data = undefined;
- }
- }
-
- return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
- var name;
- for ( name in obj ) {
-
- // if the public data object is empty, the private is still empty
- if ( name === "data" && jQuery.isEmptyObject( obj[ name ] ) ) {
- continue;
- }
- if ( name !== "toJSON" ) {
- return false;
- }
- }
-
- return true;
-}
-
-function internalData( elem, name, data, pvt /* Internal Use Only */ ) {
- if ( !acceptData( elem ) ) {
- return;
- }
-
- var ret, thisCache,
- internalKey = jQuery.expando,
-
- // We have to handle DOM nodes and JS objects differently because IE6-7
- // can't GC object references properly across the DOM-JS boundary
- isNode = elem.nodeType,
-
- // Only DOM nodes need the global jQuery cache; JS object data is
- // attached directly to the object so GC can occur automatically
- cache = isNode ? jQuery.cache : elem,
-
- // Only defining an ID for JS objects if its cache already exists allows
- // the code to shortcut on the same path as a DOM node with no cache
- id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
- // Avoid doing any more work than we need to when trying to get data on an
- // object that has no data at all
- if ( ( !id || !cache[ id ] || ( !pvt && !cache[ id ].data ) ) &&
- data === undefined && typeof name === "string" ) {
- return;
- }
-
- if ( !id ) {
-
- // Only DOM nodes need a new unique ID for each element since their data
- // ends up in the global cache
- if ( isNode ) {
- id = elem[ internalKey ] = deletedIds.pop() || jQuery.guid++;
- } else {
- id = internalKey;
- }
- }
-
- if ( !cache[ id ] ) {
-
- // Avoid exposing jQuery metadata on plain JS objects when the object
- // is serialized using JSON.stringify
- cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
- }
-
- // An object can be passed to jQuery.data instead of a key/value pair; this gets
- // shallow copied over onto the existing cache
- if ( typeof name === "object" || typeof name === "function" ) {
- if ( pvt ) {
- cache[ id ] = jQuery.extend( cache[ id ], name );
- } else {
- cache[ id ].data = jQuery.extend( cache[ id ].data, name );
- }
- }
-
- thisCache = cache[ id ];
-
- // jQuery data() is stored in a separate object inside the object's internal data
- // cache in order to avoid key collisions between internal data and user-defined
- // data.
- if ( !pvt ) {
- if ( !thisCache.data ) {
- thisCache.data = {};
- }
-
- thisCache = thisCache.data;
- }
-
- if ( data !== undefined ) {
- thisCache[ jQuery.camelCase( name ) ] = data;
- }
-
- // Check for both converted-to-camel and non-converted data property names
- // If a data property was specified
- if ( typeof name === "string" ) {
-
- // First Try to find as-is property data
- ret = thisCache[ name ];
-
- // Test for null|undefined property data
- if ( ret == null ) {
-
- // Try to find the camelCased property
- ret = thisCache[ jQuery.camelCase( name ) ];
- }
- } else {
- ret = thisCache;
- }
-
- return ret;
-}
-
-function internalRemoveData( elem, name, pvt ) {
- if ( !acceptData( elem ) ) {
- return;
- }
-
- var thisCache, i,
- isNode = elem.nodeType,
-
- // See jQuery.data for more information
- cache = isNode ? jQuery.cache : elem,
- id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
- // If there is already no cache entry for this object, there is no
- // purpose in continuing
- if ( !cache[ id ] ) {
- return;
- }
-
- if ( name ) {
-
- thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
- if ( thisCache ) {
-
- // Support array or space separated string names for data keys
- if ( !jQuery.isArray( name ) ) {
-
- // try the string as a key before any manipulation
- if ( name in thisCache ) {
- name = [ name ];
- } else {
-
- // split the camel cased version by spaces unless a key with the spaces exists
- name = jQuery.camelCase( name );
- if ( name in thisCache ) {
- name = [ name ];
- } else {
- name = name.split( " " );
- }
- }
- } else {
-
- // If "name" is an array of keys...
- // When data is initially created, via ("key", "val") signature,
- // keys will be converted to camelCase.
- // Since there is no way to tell _how_ a key was added, remove
- // both plain key and camelCase key. #12786
- // This will only penalize the array argument path.
- name = name.concat( jQuery.map( name, jQuery.camelCase ) );
- }
-
- i = name.length;
- while ( i-- ) {
- delete thisCache[ name[ i ] ];
- }
-
- // If there is no data left in the cache, we want to continue
- // and let the cache object itself get destroyed
- if ( pvt ? !isEmptyDataObject( thisCache ) : !jQuery.isEmptyObject( thisCache ) ) {
- return;
- }
- }
- }
-
- // See jQuery.data for more information
- if ( !pvt ) {
- delete cache[ id ].data;
-
- // Don't destroy the parent cache unless the internal data object
- // had been the only thing left in it
- if ( !isEmptyDataObject( cache[ id ] ) ) {
- return;
- }
- }
-
- // Destroy the cache
- if ( isNode ) {
- jQuery.cleanData( [ elem ], true );
-
- // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
- /* jshint eqeqeq: false */
- } else if ( support.deleteExpando || cache != cache.window ) {
- /* jshint eqeqeq: true */
- delete cache[ id ];
-
- // When all else fails, undefined
- } else {
- cache[ id ] = undefined;
- }
-}
-
-jQuery.extend( {
- cache: {},
-
- // The following elements (space-suffixed to avoid Object.prototype collisions)
- // throw uncatchable exceptions if you attempt to set expando properties
- noData: {
- "applet ": true,
- "embed ": true,
-
- // ...but Flash objects (which have this classid) *can* handle expandos
- "object ": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
- },
-
- hasData: function( elem ) {
- elem = elem.nodeType ? jQuery.cache[ elem[ jQuery.expando ] ] : elem[ jQuery.expando ];
- return !!elem && !isEmptyDataObject( elem );
- },
-
- data: function( elem, name, data ) {
- return internalData( elem, name, data );
- },
-
- removeData: function( elem, name ) {
- return internalRemoveData( elem, name );
- },
-
- // For internal use only.
- _data: function( elem, name, data ) {
- return internalData( elem, name, data, true );
- },
-
- _removeData: function( elem, name ) {
- return internalRemoveData( elem, name, true );
- }
-} );
-
-jQuery.fn.extend( {
- data: function( key, value ) {
- var i, name, data,
- elem = this[ 0 ],
- attrs = elem && elem.attributes;
-
- // Special expections of .data basically thwart jQuery.access,
- // so implement the relevant behavior ourselves
-
- // Gets all values
- if ( key === undefined ) {
- if ( this.length ) {
- data = jQuery.data( elem );
-
- if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
- i = attrs.length;
- while ( i-- ) {
-
- // Support: IE11+
- // The attrs elements can be null (#14894)
- if ( attrs[ i ] ) {
- name = attrs[ i ].name;
- if ( name.indexOf( "data-" ) === 0 ) {
- name = jQuery.camelCase( name.slice( 5 ) );
- dataAttr( elem, name, data[ name ] );
- }
- }
- }
- jQuery._data( elem, "parsedAttrs", true );
- }
- }
-
- return data;
- }
-
- // Sets multiple values
- if ( typeof key === "object" ) {
- return this.each( function() {
- jQuery.data( this, key );
- } );
- }
-
- return arguments.length > 1 ?
-
- // Sets one value
- this.each( function() {
- jQuery.data( this, key, value );
- } ) :
-
- // Gets one value
- // Try to fetch any internally stored data first
- elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : undefined;
- },
-
- removeData: function( key ) {
- return this.each( function() {
- jQuery.removeData( this, key );
- } );
- }
-} );
-
-
-jQuery.extend( {
- queue: function( elem, type, data ) {
- var queue;
-
- if ( elem ) {
- type = ( type || "fx" ) + "queue";
- queue = jQuery._data( elem, type );
-
- // Speed up dequeue by getting out quickly if this is just a lookup
- if ( data ) {
- if ( !queue || jQuery.isArray( data ) ) {
- queue = jQuery._data( elem, type, jQuery.makeArray( data ) );
- } else {
- queue.push( data );
- }
- }
- return queue || [];
- }
- },
-
- dequeue: function( elem, type ) {
- type = type || "fx";
-
- var queue = jQuery.queue( elem, type ),
- startLength = queue.length,
- fn = queue.shift(),
- hooks = jQuery._queueHooks( elem, type ),
- next = function() {
- jQuery.dequeue( elem, type );
- };
-
- // If the fx queue is dequeued, always remove the progress sentinel
- if ( fn === "inprogress" ) {
- fn = queue.shift();
- startLength--;
- }
-
- if ( fn ) {
-
- // Add a progress sentinel to prevent the fx queue from being
- // automatically dequeued
- if ( type === "fx" ) {
- queue.unshift( "inprogress" );
- }
-
- // clear up the last queue stop function
- delete hooks.stop;
- fn.call( elem, next, hooks );
- }
-
- if ( !startLength && hooks ) {
- hooks.empty.fire();
- }
- },
-
- // not intended for public consumption - generates a queueHooks object,
- // or returns the current one
- _queueHooks: function( elem, type ) {
- var key = type + "queueHooks";
- return jQuery._data( elem, key ) || jQuery._data( elem, key, {
- empty: jQuery.Callbacks( "once memory" ).add( function() {
- jQuery._removeData( elem, type + "queue" );
- jQuery._removeData( elem, key );
- } )
- } );
- }
-} );
-
-jQuery.fn.extend( {
- queue: function( type, data ) {
- var setter = 2;
-
- if ( typeof type !== "string" ) {
- data = type;
- type = "fx";
- setter--;
- }
-
- if ( arguments.length < setter ) {
- return jQuery.queue( this[ 0 ], type );
- }
-
- return data === undefined ?
- this :
- this.each( function() {
- var queue = jQuery.queue( this, type, data );
-
- // ensure a hooks for this queue
- jQuery._queueHooks( this, type );
-
- if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
- jQuery.dequeue( this, type );
- }
- } );
- },
- dequeue: function( type ) {
- return this.each( function() {
- jQuery.dequeue( this, type );
- } );
- },
- clearQueue: function( type ) {
- return this.queue( type || "fx", [] );
- },
-
- // Get a promise resolved when queues of a certain type
- // are emptied (fx is the type by default)
- promise: function( type, obj ) {
- var tmp,
- count = 1,
- defer = jQuery.Deferred(),
- elements = this,
- i = this.length,
- resolve = function() {
- if ( !( --count ) ) {
- defer.resolveWith( elements, [ elements ] );
- }
- };
-
- if ( typeof type !== "string" ) {
- obj = type;
- type = undefined;
- }
- type = type || "fx";
-
- while ( i-- ) {
- tmp = jQuery._data( elements[ i ], type + "queueHooks" );
- if ( tmp && tmp.empty ) {
- count++;
- tmp.empty.add( resolve );
- }
- }
- resolve();
- return defer.promise( obj );
- }
-} );
-
-
-( function() {
- var shrinkWrapBlocksVal;
-
- support.shrinkWrapBlocks = function() {
- if ( shrinkWrapBlocksVal != null ) {
- return shrinkWrapBlocksVal;
- }
-
- // Will be changed later if needed.
- shrinkWrapBlocksVal = false;
-
- // Minified: var b,c,d
- var div, body, container;
-
- body = document.getElementsByTagName( "body" )[ 0 ];
- if ( !body || !body.style ) {
-
- // Test fired too early or in an unsupported environment, exit.
- return;
- }
-
- // Setup
- div = document.createElement( "div" );
- container = document.createElement( "div" );
- container.style.cssText = "position:absolute;border:0;width:0;height:0;top:0;left:-9999px";
- body.appendChild( container ).appendChild( div );
-
- // Support: IE6
- // Check if elements with layout shrink-wrap their children
- if ( typeof div.style.zoom !== "undefined" ) {
-
- // Reset CSS: box-sizing; display; margin; border
- div.style.cssText =
-
- // Support: Firefox<29, Android 2.3
- // Vendor-prefix box-sizing
- "-webkit-box-sizing:content-box;-moz-box-sizing:content-box;" +
- "box-sizing:content-box;display:block;margin:0;border:0;" +
- "padding:1px;width:1px;zoom:1";
- div.appendChild( document.createElement( "div" ) ).style.width = "5px";
- shrinkWrapBlocksVal = div.offsetWidth !== 3;
- }
-
- body.removeChild( container );
-
- return shrinkWrapBlocksVal;
- };
-
-} )();
-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
-
-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
-
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-
- // isHidden might be called from jQuery#filter function;
- // in that case, element will be second argument
- elem = el || elem;
- return jQuery.css( elem, "display" ) === "none" ||
- !jQuery.contains( elem.ownerDocument, elem );
- };
-
-
-
-function adjustCSS( elem, prop, valueParts, tween ) {
- var adjusted,
- scale = 1,
- maxIterations = 20,
- currentValue = tween ?
- function() { return tween.cur(); } :
- function() { return jQuery.css( elem, prop, "" ); },
- initial = currentValue(),
- unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
- // Starting value computation is required for potential unit mismatches
- initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
- rcssNum.exec( jQuery.css( elem, prop ) );
-
- if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
-
- // Trust units reported by jQuery.css
- unit = unit || initialInUnit[ 3 ];
-
- // Make sure we update the tween properties later on
- valueParts = valueParts || [];
-
- // Iteratively approximate from a nonzero starting point
- initialInUnit = +initial || 1;
-
- do {
-
- // If previous iteration zeroed out, double until we get *something*.
- // Use string for doubling so we don't accidentally see scale as unchanged below
- scale = scale || ".5";
-
- // Adjust and apply
- initialInUnit = initialInUnit / scale;
- jQuery.style( elem, prop, initialInUnit + unit );
-
- // Update scale, tolerating zero or NaN from tween.cur()
- // Break the loop if scale is unchanged or perfect, or if we've just had enough.
- } while (
- scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
- );
- }
-
- if ( valueParts ) {
- initialInUnit = +initialInUnit || +initial || 0;
-
- // Apply relative offset (+=/-=) if specified
- adjusted = valueParts[ 1 ] ?
- initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
- +valueParts[ 2 ];
- if ( tween ) {
- tween.unit = unit;
- tween.start = initialInUnit;
- tween.end = adjusted;
- }
- }
- return adjusted;
-}
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
- var i = 0,
- length = elems.length,
- bulk = key == null;
-
- // Sets many values
- if ( jQuery.type( key ) === "object" ) {
- chainable = true;
- for ( i in key ) {
- access( elems, fn, i, key[ i ], true, emptyGet, raw );
- }
-
- // Sets one value
- } else if ( value !== undefined ) {
- chainable = true;
-
- if ( !jQuery.isFunction( value ) ) {
- raw = true;
- }
-
- if ( bulk ) {
-
- // Bulk operations run against the entire set
- if ( raw ) {
- fn.call( elems, value );
- fn = null;
-
- // ...except when executing function values
- } else {
- bulk = fn;
- fn = function( elem, key, value ) {
- return bulk.call( jQuery( elem ), value );
- };
- }
- }
-
- if ( fn ) {
- for ( ; i < length; i++ ) {
- fn(
- elems[ i ],
- key,
- raw ? value : value.call( elems[ i ], i, fn( elems[ i ], key ) )
- );
- }
- }
- }
-
- return chainable ?
- elems :
-
- // Gets
- bulk ?
- fn.call( elems ) :
- length ? fn( elems[ 0 ], key ) : emptyGet;
-};
-var rcheckableType = ( /^(?:checkbox|radio)$/i );
-
-var rtagName = ( /<([\w:-]+)/ );
-
-var rscriptType = ( /^$|\/(?:java|ecma)script/i );
-
-var rleadingWhitespace = ( /^\s+/ );
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|" +
- "details|dialog|figcaption|figure|footer|header|hgroup|main|" +
- "mark|meter|nav|output|picture|progress|section|summary|template|time|video";
-
-
-
-function createSafeFragment( document ) {
- var list = nodeNames.split( "|" ),
- safeFrag = document.createDocumentFragment();
-
- if ( safeFrag.createElement ) {
- while ( list.length ) {
- safeFrag.createElement(
- list.pop()
- );
- }
- }
- return safeFrag;
-}
-
-
-( function() {
- var div = document.createElement( "div" ),
- fragment = document.createDocumentFragment(),
- input = document.createElement( "input" );
-
- // Setup
- div.innerHTML = "
a";
-
- // IE strips leading whitespace when .innerHTML is used
- support.leadingWhitespace = div.firstChild.nodeType === 3;
-
- // Make sure that tbody elements aren't automatically inserted
- // IE will insert them into empty tables
- support.tbody = !div.getElementsByTagName( "tbody" ).length;
-
- // Make sure that link elements get serialized correctly by innerHTML
- // This requires a wrapper element in IE
- support.htmlSerialize = !!div.getElementsByTagName( "link" ).length;
-
- // Makes sure cloning an html5 element does not cause problems
- // Where outerHTML is undefined, this still works
- support.html5Clone =
- document.createElement( "nav" ).cloneNode( true ).outerHTML !== "<:nav>";
-
- // Check if a disconnected checkbox will retain its checked
- // value of true after appended to the DOM (IE6/7)
- input.type = "checkbox";
- input.checked = true;
- fragment.appendChild( input );
- support.appendChecked = input.checked;
-
- // Make sure textarea (and checkbox) defaultValue is properly cloned
- // Support: IE6-IE11+
- div.innerHTML = "";
- support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-
- // #11217 - WebKit loses check when the name is after the checked attribute
- fragment.appendChild( div );
-
- // Support: Windows Web Apps (WWA)
- // `name` and `type` must use .setAttribute for WWA (#14901)
- input = document.createElement( "input" );
- input.setAttribute( "type", "radio" );
- input.setAttribute( "checked", "checked" );
- input.setAttribute( "name", "t" );
-
- div.appendChild( input );
-
- // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3
- // old WebKit doesn't clone checked state correctly in fragments
- support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
- // Support: IE<9
- // Cloned elements keep attachEvent handlers, we use addEventListener on IE9+
- support.noCloneEvent = !!div.addEventListener;
-
- // Support: IE<9
- // Since attributes and properties are the same in IE,
- // cleanData must set properties to undefined rather than use removeAttribute
- div[ jQuery.expando ] = 1;
- support.attributes = !div.getAttribute( jQuery.expando );
-} )();
-
-
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
- option: [ 1, "" ],
- legend: [ 1, "" ],
- area: [ 1, "" ],
-
- // Support: IE8
- param: [ 1, "" ],
- thead: [ 1, "
", "
" ],
- tr: [ 2, "
", "
" ],
- col: [ 2, "
", "
" ],
- td: [ 3, "
", "
" ],
-
- // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
- // unless wrapped in a div with non-breaking characters in front of it.
- _default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
", "
" ]
-};
-
-// Support: IE8-IE9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-
-function getAll( context, tag ) {
- var elems, elem,
- i = 0,
- found = typeof context.getElementsByTagName !== "undefined" ?
- context.getElementsByTagName( tag || "*" ) :
- typeof context.querySelectorAll !== "undefined" ?
- context.querySelectorAll( tag || "*" ) :
- undefined;
-
- if ( !found ) {
- for ( found = [], elems = context.childNodes || context;
- ( elem = elems[ i ] ) != null;
- i++
- ) {
- if ( !tag || jQuery.nodeName( elem, tag ) ) {
- found.push( elem );
- } else {
- jQuery.merge( found, getAll( elem, tag ) );
- }
- }
- }
-
- return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
- jQuery.merge( [ context ], found ) :
- found;
-}
-
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
- var elem,
- i = 0;
- for ( ; ( elem = elems[ i ] ) != null; i++ ) {
- jQuery._data(
- elem,
- "globalEval",
- !refElements || jQuery._data( refElements[ i ], "globalEval" )
- );
- }
-}
-
-
-var rhtml = /<|&#?\w+;/,
- rtbody = / from table fragments
- if ( !support.tbody ) {
-
- // String was a
, *may* have spurious
- elem = tag === "table" && !rtbody.test( elem ) ?
- tmp.firstChild :
-
- // String was a bare or
- wrap[ 1 ] === "
" && !rtbody.test( elem ) ?
- tmp :
- 0;
-
- j = elem && elem.childNodes.length;
- while ( j-- ) {
- if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) &&
- !tbody.childNodes.length ) {
-
- elem.removeChild( tbody );
- }
- }
- }
-
- jQuery.merge( nodes, tmp.childNodes );
-
- // Fix #12392 for WebKit and IE > 9
- tmp.textContent = "";
-
- // Fix #12392 for oldIE
- while ( tmp.firstChild ) {
- tmp.removeChild( tmp.firstChild );
- }
-
- // Remember the top-level container for proper cleanup
- tmp = safe.lastChild;
- }
- }
- }
-
- // Fix #11356: Clear elements from fragment
- if ( tmp ) {
- safe.removeChild( tmp );
- }
-
- // Reset defaultChecked for any radios and checkboxes
- // about to be appended to the DOM in IE 6/7 (#8060)
- if ( !support.appendChecked ) {
- jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
- }
-
- i = 0;
- while ( ( elem = nodes[ i++ ] ) ) {
-
- // Skip elements already in the context collection (trac-4087)
- if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
- if ( ignored ) {
- ignored.push( elem );
- }
-
- continue;
- }
-
- contains = jQuery.contains( elem.ownerDocument, elem );
-
- // Append to fragment
- tmp = getAll( safe.appendChild( elem ), "script" );
-
- // Preserve script evaluation history
- if ( contains ) {
- setGlobalEval( tmp );
- }
-
- // Capture executables
- if ( scripts ) {
- j = 0;
- while ( ( elem = tmp[ j++ ] ) ) {
- if ( rscriptType.test( elem.type || "" ) ) {
- scripts.push( elem );
- }
- }
- }
- }
-
- tmp = null;
-
- return safe;
-}
-
-
-( function() {
- var i, eventName,
- div = document.createElement( "div" );
-
- // Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events)
- for ( i in { submit: true, change: true, focusin: true } ) {
- eventName = "on" + i;
-
- if ( !( support[ i ] = eventName in window ) ) {
-
- // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
- div.setAttribute( eventName, "t" );
- support[ i ] = div.attributes[ eventName ].expando === false;
- }
- }
-
- // Null elements to avoid leaks in IE.
- div = null;
-} )();
-
-
-var rformElems = /^(?:input|select|textarea)$/i,
- rkeyEvent = /^key/,
- rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
- rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
- rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
-
-function returnTrue() {
- return true;
-}
-
-function returnFalse() {
- return false;
-}
-
-// Support: IE9
-// See #13393 for more info
-function safeActiveElement() {
- try {
- return document.activeElement;
- } catch ( err ) { }
-}
-
-function on( elem, types, selector, data, fn, one ) {
- var origFn, type;
-
- // Types can be a map of types/handlers
- if ( typeof types === "object" ) {
-
- // ( types-Object, selector, data )
- if ( typeof selector !== "string" ) {
-
- // ( types-Object, data )
- data = data || selector;
- selector = undefined;
- }
- for ( type in types ) {
- on( elem, type, selector, data, types[ type ], one );
- }
- return elem;
- }
-
- if ( data == null && fn == null ) {
-
- // ( types, fn )
- fn = selector;
- data = selector = undefined;
- } else if ( fn == null ) {
- if ( typeof selector === "string" ) {
-
- // ( types, selector, fn )
- fn = data;
- data = undefined;
- } else {
-
- // ( types, data, fn )
- fn = data;
- data = selector;
- selector = undefined;
- }
- }
- if ( fn === false ) {
- fn = returnFalse;
- } else if ( !fn ) {
- return elem;
- }
-
- if ( one === 1 ) {
- origFn = fn;
- fn = function( event ) {
-
- // Can use an empty set, since event contains the info
- jQuery().off( event );
- return origFn.apply( this, arguments );
- };
-
- // Use same guid so caller can remove using origFn
- fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
- }
- return elem.each( function() {
- jQuery.event.add( this, types, fn, data, selector );
- } );
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
- global: {},
-
- add: function( elem, types, handler, data, selector ) {
- var tmp, events, t, handleObjIn,
- special, eventHandle, handleObj,
- handlers, type, namespaces, origType,
- elemData = jQuery._data( elem );
-
- // Don't attach events to noData or text/comment nodes (but allow plain objects)
- if ( !elemData ) {
- return;
- }
-
- // Caller can pass in an object of custom data in lieu of the handler
- if ( handler.handler ) {
- handleObjIn = handler;
- handler = handleObjIn.handler;
- selector = handleObjIn.selector;
- }
-
- // Make sure that the handler has a unique ID, used to find/remove it later
- if ( !handler.guid ) {
- handler.guid = jQuery.guid++;
- }
-
- // Init the element's event structure and main handler, if this is the first
- if ( !( events = elemData.events ) ) {
- events = elemData.events = {};
- }
- if ( !( eventHandle = elemData.handle ) ) {
- eventHandle = elemData.handle = function( e ) {
-
- // Discard the second event of a jQuery.event.trigger() and
- // when an event is called after a page has unloaded
- return typeof jQuery !== "undefined" &&
- ( !e || jQuery.event.triggered !== e.type ) ?
- jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
- undefined;
- };
-
- // Add elem as a property of the handle fn to prevent a memory leak
- // with IE non-native events
- eventHandle.elem = elem;
- }
-
- // Handle multiple events separated by a space
- types = ( types || "" ).match( rnotwhite ) || [ "" ];
- t = types.length;
- while ( t-- ) {
- tmp = rtypenamespace.exec( types[ t ] ) || [];
- type = origType = tmp[ 1 ];
- namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
- // There *must* be a type, no attaching namespace-only handlers
- if ( !type ) {
- continue;
- }
-
- // If event changes its type, use the special event handlers for the changed type
- special = jQuery.event.special[ type ] || {};
-
- // If selector defined, determine special event api type, otherwise given type
- type = ( selector ? special.delegateType : special.bindType ) || type;
-
- // Update special based on newly reset type
- special = jQuery.event.special[ type ] || {};
-
- // handleObj is passed to all event handlers
- handleObj = jQuery.extend( {
- type: type,
- origType: origType,
- data: data,
- handler: handler,
- guid: handler.guid,
- selector: selector,
- needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
- namespace: namespaces.join( "." )
- }, handleObjIn );
-
- // Init the event handler queue if we're the first
- if ( !( handlers = events[ type ] ) ) {
- handlers = events[ type ] = [];
- handlers.delegateCount = 0;
-
- // Only use addEventListener/attachEvent if the special events handler returns false
- if ( !special.setup ||
- special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-
- // Bind the global event handler to the element
- if ( elem.addEventListener ) {
- elem.addEventListener( type, eventHandle, false );
-
- } else if ( elem.attachEvent ) {
- elem.attachEvent( "on" + type, eventHandle );
- }
- }
- }
-
- if ( special.add ) {
- special.add.call( elem, handleObj );
-
- if ( !handleObj.handler.guid ) {
- handleObj.handler.guid = handler.guid;
- }
- }
-
- // Add to the element's handler list, delegates in front
- if ( selector ) {
- handlers.splice( handlers.delegateCount++, 0, handleObj );
- } else {
- handlers.push( handleObj );
- }
-
- // Keep track of which events have ever been used, for event optimization
- jQuery.event.global[ type ] = true;
- }
-
- // Nullify elem to prevent memory leaks in IE
- elem = null;
- },
-
- // Detach an event or set of events from an element
- remove: function( elem, types, handler, selector, mappedTypes ) {
- var j, handleObj, tmp,
- origCount, t, events,
- special, handlers, type,
- namespaces, origType,
- elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
- if ( !elemData || !( events = elemData.events ) ) {
- return;
- }
-
- // Once for each type.namespace in types; type may be omitted
- types = ( types || "" ).match( rnotwhite ) || [ "" ];
- t = types.length;
- while ( t-- ) {
- tmp = rtypenamespace.exec( types[ t ] ) || [];
- type = origType = tmp[ 1 ];
- namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
- // Unbind all events (on this namespace, if provided) for the element
- if ( !type ) {
- for ( type in events ) {
- jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
- }
- continue;
- }
-
- special = jQuery.event.special[ type ] || {};
- type = ( selector ? special.delegateType : special.bindType ) || type;
- handlers = events[ type ] || [];
- tmp = tmp[ 2 ] &&
- new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
-
- // Remove matching events
- origCount = j = handlers.length;
- while ( j-- ) {
- handleObj = handlers[ j ];
-
- if ( ( mappedTypes || origType === handleObj.origType ) &&
- ( !handler || handler.guid === handleObj.guid ) &&
- ( !tmp || tmp.test( handleObj.namespace ) ) &&
- ( !selector || selector === handleObj.selector ||
- selector === "**" && handleObj.selector ) ) {
- handlers.splice( j, 1 );
-
- if ( handleObj.selector ) {
- handlers.delegateCount--;
- }
- if ( special.remove ) {
- special.remove.call( elem, handleObj );
- }
- }
- }
-
- // Remove generic event handler if we removed something and no more handlers exist
- // (avoids potential for endless recursion during removal of special event handlers)
- if ( origCount && !handlers.length ) {
- if ( !special.teardown ||
- special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-
- jQuery.removeEvent( elem, type, elemData.handle );
- }
-
- delete events[ type ];
- }
- }
-
- // Remove the expando if it's no longer used
- if ( jQuery.isEmptyObject( events ) ) {
- delete elemData.handle;
-
- // removeData also checks for emptiness and clears the expando if empty
- // so use it instead of delete
- jQuery._removeData( elem, "events" );
- }
- },
-
- trigger: function( event, data, elem, onlyHandlers ) {
- var handle, ontype, cur,
- bubbleType, special, tmp, i,
- eventPath = [ elem || document ],
- type = hasOwn.call( event, "type" ) ? event.type : event,
- namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
-
- cur = tmp = elem = elem || document;
-
- // Don't do events on text and comment nodes
- if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
- return;
- }
-
- // focus/blur morphs to focusin/out; ensure we're not firing them right now
- if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
- return;
- }
-
- if ( type.indexOf( "." ) > -1 ) {
-
- // Namespaced trigger; create a regexp to match event type in handle()
- namespaces = type.split( "." );
- type = namespaces.shift();
- namespaces.sort();
- }
- ontype = type.indexOf( ":" ) < 0 && "on" + type;
-
- // Caller can pass in a jQuery.Event object, Object, or just an event type string
- event = event[ jQuery.expando ] ?
- event :
- new jQuery.Event( type, typeof event === "object" && event );
-
- // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
- event.isTrigger = onlyHandlers ? 2 : 3;
- event.namespace = namespaces.join( "." );
- event.rnamespace = event.namespace ?
- new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
- null;
-
- // Clean up the event in case it is being reused
- event.result = undefined;
- if ( !event.target ) {
- event.target = elem;
- }
-
- // Clone any incoming data and prepend the event, creating the handler arg list
- data = data == null ?
- [ event ] :
- jQuery.makeArray( data, [ event ] );
-
- // Allow special events to draw outside the lines
- special = jQuery.event.special[ type ] || {};
- if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
- return;
- }
-
- // Determine event propagation path in advance, per W3C events spec (#9951)
- // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
- if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
- bubbleType = special.delegateType || type;
- if ( !rfocusMorph.test( bubbleType + type ) ) {
- cur = cur.parentNode;
- }
- for ( ; cur; cur = cur.parentNode ) {
- eventPath.push( cur );
- tmp = cur;
- }
-
- // Only add window if we got to document (e.g., not plain obj or detached DOM)
- if ( tmp === ( elem.ownerDocument || document ) ) {
- eventPath.push( tmp.defaultView || tmp.parentWindow || window );
- }
- }
-
- // Fire handlers on the event path
- i = 0;
- while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
-
- event.type = i > 1 ?
- bubbleType :
- special.bindType || type;
-
- // jQuery handler
- handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] &&
- jQuery._data( cur, "handle" );
-
- if ( handle ) {
- handle.apply( cur, data );
- }
-
- // Native handler
- handle = ontype && cur[ ontype ];
- if ( handle && handle.apply && acceptData( cur ) ) {
- event.result = handle.apply( cur, data );
- if ( event.result === false ) {
- event.preventDefault();
- }
- }
- }
- event.type = type;
-
- // If nobody prevented the default action, do it now
- if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
- if (
- ( !special._default ||
- special._default.apply( eventPath.pop(), data ) === false
- ) && acceptData( elem )
- ) {
-
- // Call a native DOM method on the target with the same name name as the event.
- // Can't use an .isFunction() check here because IE6/7 fails that test.
- // Don't do default actions on window, that's where global variables be (#6170)
- if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
-
- // Don't re-trigger an onFOO event when we call its FOO() method
- tmp = elem[ ontype ];
-
- if ( tmp ) {
- elem[ ontype ] = null;
- }
-
- // Prevent re-triggering of the same event, since we already bubbled it above
- jQuery.event.triggered = type;
- try {
- elem[ type ]();
- } catch ( e ) {
-
- // IE<9 dies on focus/blur to hidden element (#1486,#12518)
- // only reproducible on winXP IE8 native, not IE9 in IE8 mode
- }
- jQuery.event.triggered = undefined;
-
- if ( tmp ) {
- elem[ ontype ] = tmp;
- }
- }
- }
- }
-
- return event.result;
- },
-
- dispatch: function( event ) {
-
- // Make a writable jQuery.Event from the native event object
- event = jQuery.event.fix( event );
-
- var i, j, ret, matched, handleObj,
- handlerQueue = [],
- args = slice.call( arguments ),
- handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
- special = jQuery.event.special[ event.type ] || {};
-
- // Use the fix-ed jQuery.Event rather than the (read-only) native event
- args[ 0 ] = event;
- event.delegateTarget = this;
-
- // Call the preDispatch hook for the mapped type, and let it bail if desired
- if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
- return;
- }
-
- // Determine handlers
- handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
- // Run delegates first; they may want to stop propagation beneath us
- i = 0;
- while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
- event.currentTarget = matched.elem;
-
- j = 0;
- while ( ( handleObj = matched.handlers[ j++ ] ) &&
- !event.isImmediatePropagationStopped() ) {
-
- // Triggered event must either 1) have no namespace, or 2) have namespace(s)
- // a subset or equal to those in the bound event (both can have no namespace).
- if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
-
- event.handleObj = handleObj;
- event.data = handleObj.data;
-
- ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
- handleObj.handler ).apply( matched.elem, args );
-
- if ( ret !== undefined ) {
- if ( ( event.result = ret ) === false ) {
- event.preventDefault();
- event.stopPropagation();
- }
- }
- }
- }
- }
-
- // Call the postDispatch hook for the mapped type
- if ( special.postDispatch ) {
- special.postDispatch.call( this, event );
- }
-
- return event.result;
- },
-
- handlers: function( event, handlers ) {
- var i, matches, sel, handleObj,
- handlerQueue = [],
- delegateCount = handlers.delegateCount,
- cur = event.target;
-
- // Support (at least): Chrome, IE9
- // Find delegate handlers
- // Black-hole SVG