diff --git a/app/code/core/Mage/Admin/Model/Resource/Block.php b/app/code/core/Mage/Admin/Model/Resource/Block.php
index 9d813502937..bec218c7fcf 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Block.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Block.php
@@ -70,7 +70,7 @@ protected function _generateCache()
Mage::app()->saveCache(
Mage::helper('core')->jsonEncode($data),
self::CACHE_ID,
- [Mage_Core_Model_App::CACHE_TAG]
+ [Mage_Core_Model_Resource_Db_Collection_Abstract::CACHE_TAG]
);
}
diff --git a/app/code/core/Mage/Admin/Model/Resource/Variable.php b/app/code/core/Mage/Admin/Model/Resource/Variable.php
index bef4a9d08cb..05264f8fee1 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Variable.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Variable.php
@@ -38,7 +38,7 @@ protected function _generateCache()
Mage::app()->saveCache(
Mage::helper('core')->jsonEncode($data),
self::CACHE_ID,
- [Mage_Core_Model_App::CACHE_TAG]
+ [Mage_Core_Model_Resource_Db_Collection_Abstract::CACHE_TAG]
);
}
diff --git a/app/code/core/Mage/Captcha/etc/config.xml b/app/code/core/Mage/Captcha/etc/config.xml
index 907a904455d..098aa7bd345 100644
--- a/app/code/core/Mage/Captcha/etc/config.xml
+++ b/app/code/core/Mage/Captcha/etc/config.xml
@@ -197,7 +197,7 @@
after_fail
backend_forgotpassword
3
- 1000
+ 10
7
4-5
ABCDEFGHJKMnpqrstuvwxyz23456789
diff --git a/app/code/core/Mage/Captcha/etc/system.xml b/app/code/core/Mage/Captcha/etc/system.xml
index b359e0275ef..38c1f167296 100644
--- a/app/code/core/Mage/Captcha/etc/system.xml
+++ b/app/code/core/Mage/Captcha/etc/system.xml
@@ -77,9 +77,22 @@
required-entry validate-digits
+
+
+ text
+ 6
+ 1
+ 0
+ 0
+
+ after_fail
+ 1
+
+ required-entry validate-digits
+
- 6
+ 7
1
0
0
@@ -89,7 +102,7 @@
Please specify 8 symbols at the most. Range allowed (e.g. 3-5)
- 7
+ 8
1
0
0
@@ -99,7 +112,7 @@
Similar looking characters (e.g. "i", "l", "1") decrease chance of correct recognition by customer.]]>
- 8
+ 9
1
0
0
@@ -110,7 +123,7 @@
select
adminhtml/system_config_source_yesno
- 9
+ 10
1
0
0
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index 63fcd034ea8..e6750cf4ace 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -36,12 +36,6 @@ class Mage_Core_Model_App
public const DISTRO_LOCALE_CODE = 'en_US';
- /**
- * Cache tag for all cache data exclude config cache
- *
- */
- public const CACHE_TAG = 'MAGE';
-
/**
* Default store Id (for install)
*/
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
index 3e2c236d69c..bc34eb5072f 100644
--- a/app/code/core/Mage/Core/Model/Cache.php
+++ b/app/code/core/Mage/Core/Model/Cache.php
@@ -381,12 +381,6 @@ public function save($data, $id, $tags = [], $lifeTime = null)
return true;
}
- /**
- * Add global magento cache tag to all cached data exclude config cache
- */
- if (!in_array(Mage_Core_Model_Config::CACHE_TAG, $tags)) {
- $tags[] = Mage_Core_Model_App::CACHE_TAG;
- }
return $this->getFrontend()->save((string)$data, $this->_id($id), $this->_tags($tags), $lifeTime);
}
@@ -427,8 +421,7 @@ public function clean($tags = [])
}
$res = $this->getFrontend()->clean($mode, $this->_tags($tags));
} else {
- $res = $this->getFrontend()->clean($mode, [Mage_Core_Model_App::CACHE_TAG]);
- $res = $res && $this->getFrontend()->clean($mode, [Mage_Core_Model_Config::CACHE_TAG]);
+ $this->flush();
}
return $res;
}
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 cce44677818..5da86165218 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
@@ -687,7 +687,6 @@ protected function _saveCache($data, $select)
protected function _getCacheTags()
{
$tags = parent::_getCacheTags();
- $tags[] = Mage_Core_Model_App::CACHE_TAG;
$tags[] = self::CACHE_TAG;
return $tags;
}
diff --git a/app/code/core/Mage/Log/Model/Visitor.php b/app/code/core/Mage/Log/Model/Visitor.php
index 96b8e29d344..751a504d5f7 100644
--- a/app/code/core/Mage/Log/Model/Visitor.php
+++ b/app/code/core/Mage/Log/Model/Visitor.php
@@ -101,17 +101,22 @@ public function __construct(array $data = [])
protected function _construct()
{
$this->_init('log/visitor');
- $userAgent = $this->_httpHelper->getHttpUserAgent();
+ if ($this->_logCondition->isLogDisabled()) {
+ $this->_skipRequestLogging = true;
+ return;
+ }
+
$ignoreAgents = $this->_config->getNode('global/ignore_user_agents');
if ($ignoreAgents) {
$ignoreAgents = $ignoreAgents->asArray();
- if (in_array($userAgent, $ignoreAgents)) {
- $this->_skipRequestLogging = true;
+ $userAgent = $this->_httpHelper->getHttpUserAgent();
+ foreach ($ignoreAgents as $ignoreAgent) {
+ if (stripos($userAgent, $ignoreAgent) !== false) {
+ $this->_skipRequestLogging = true;
+ break;
+ }
}
}
- if ($this->_logCondition->isLogDisabled()) {
- $this->_skipRequestLogging = true;
- }
}
/**
diff --git a/app/code/core/Mage/Log/etc/config.xml b/app/code/core/Mage/Log/etc/config.xml
index 41e8f048295..f7119dd1259 100644
--- a/app/code/core/Mage/Log/etc/config.xml
+++ b/app/code/core/Mage/Log/etc/config.xml
@@ -29,9 +29,28 @@
- Googlebot/1.0 (googlebot@googlebot.com http://googlebot.com/)
- Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)
- Googlebot/2.1 (+http://www.googlebot.com/bot.html)
+ AdsBot
+ AlphaBot
+ Amazonbot
+ bingbot
+ BLEXBot
+ DotBot
+ facebookexternalhit
+ Googlebot
+ Google-Site-Verification
+ AhrefsBot
+ istellabot
+ MauiBot
+ MJ12bot
+ mod_pagespeed
+ spbot
+ Pinterestbot
+ SemrushBot
+ SEOTesterBot
+ YandexBot
+ YandexImages
+ YandexMobileBot
+ ZoominfoBot
diff --git a/app/locale/en_US/Mage_Captcha.csv b/app/locale/en_US/Mage_Captcha.csv
index e5a7814ab67..42ea5178ea9 100644
--- a/app/locale/en_US/Mage_Captcha.csv
+++ b/app/locale/en_US/Mage_Captcha.csv
@@ -19,4 +19,5 @@
"Please type the letters from the image:","Please type the letters from the image:"
"Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer.","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.
Similar looking characters (e.g. ""i"", ""l"", ""1"") decrease chance of correct recognition by customer."
"Reload captcha","Reload captcha"
-"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA"
+"Symbols Used in CAPTCHA","Symbols Used in CAPTCHA",
+"Number of Unsuccessful Attempts to Login per IP Address","Number of Unsuccessful Attempts to Login per IP Address"