Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNina Pypchenko <22447785+nina-py@users.noreply.github.com>2021-01-01 08:13:19 +0300
committerGitHub <noreply@github.com>2021-01-01 08:13:19 +0300
commitdf68fbce2397570df2d5fee6c1b56db57241a10b (patch)
tree3951c42445243381d95452a7f1fd0b1aa194d52d /plugins/WebsiteMeasurable
parent8886c9065cf11d5ac0628a300d9c55fb1e154853 (diff)
Add regular expression support to list of user agents to exclude (#16766)
* Add regular expression support to list of user agents to exclude - Added regex support to Administration -> Websites -> Settings -> Global list of user agents to exclude - Made sure old tests that use stripos() pass - Added new tests - Added a sentence to the inline help area about regex support - Fixed a typo elsewhere as specified in the original issue. Closes #14186. Updated method and tests following code review Update plugins/WebsiteMeasurable/MeasurableSettings.php Co-authored-by: Stefan Giehl <stefan@matomo.org> Update system tests * Update screenshots for UI tests affected by the copy changes
Diffstat (limited to 'plugins/WebsiteMeasurable')
-rw-r--r--plugins/WebsiteMeasurable/MeasurableSettings.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php
index c4e384aa3c..749a32e8a3 100644
--- a/plugins/WebsiteMeasurable/MeasurableSettings.php
+++ b/plugins/WebsiteMeasurable/MeasurableSettings.php
@@ -235,7 +235,9 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings
. '<br /><br />'
. Piwik::translate('SitesManager_GlobalListExcludedUserAgents_Desc')
. '<br />'
- . Piwik::translate('SitesManager_GlobalExcludedUserAgentHelp2');
+ . Piwik::translate('SitesManager_GlobalExcludedUserAgentHelp2') . " "
+ . Piwik::translate('SitesManager_GlobalExcludedUserAgentHelp3', "/bot|spider|crawl|scanner/i")
+ ;
$field->uiControl = FieldConfig::UI_CONTROL_TEXTAREA;
$field->uiControlAttributes = array('cols' => '20', 'rows' => '4');
$field->transform = function ($value) use ($self) {