From 5d0cfbc7dc786d7977d8ece0995fa32512ca7d9c Mon Sep 17 00:00:00 2001 From: Kate Butler Date: Thu, 28 Nov 2019 15:27:27 +1300 Subject: Remove the SiteSpecificUserAgentExcludeEnabled setting (#15089) --- .../tests/UI/expected-screenshots/Dashboard_widget_move.png | 4 ++-- plugins/SitesManager/API.php | 13 +++---------- plugins/SitesManager/Controller.php | 3 --- plugins/SitesManager/SitesManager.php | 6 +----- .../angularjs/sites-manager/sites-manager.controller.js | 1 - plugins/SitesManager/lang/en.json | 2 -- plugins/SitesManager/templates/global-settings.html | 6 ------ plugins/SitesManager/templates/sites-list/site-fields.html | 2 +- .../expected-screenshots/SitesManager_global_settings.png | 4 ++-- 9 files changed, 9 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png index 4bf82eadc5..b0f3916a22 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_move.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:495f12fac4ec25587e2cfe72d95b28799c309486dd285c7e8e3fecb4e4c5a313 -size 28633 +oid sha256:7c518984529c9147f79c4f8718dbca079a58cc6bf94fd0c90ff2bb9a5540c025 +size 28151 diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 909d694f23..1066aaf258 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -60,7 +60,6 @@ class API extends \Piwik\Plugin\API const OPTION_SEARCH_KEYWORD_QUERY_PARAMETERS_GLOBAL = 'SitesManager_SearchKeywordParameters'; const OPTION_SEARCH_CATEGORY_QUERY_PARAMETERS_GLOBAL = 'SitesManager_SearchCategoryParameters'; const OPTION_EXCLUDED_USER_AGENTS_GLOBAL = 'SitesManager_ExcludedUserAgentsGlobal'; - const OPTION_SITE_SPECIFIC_USER_AGENT_EXCLUDE_ENABLE = 'SitesManager_EnableSiteSpecificUserAgentExclude'; const OPTION_KEEP_URL_FRAGMENTS_GLOBAL = 'SitesManager_KeepURLFragmentsGlobal'; /** @@ -1066,11 +1065,11 @@ class API extends \Piwik\Plugin\API * only the global user agent substrings (see @setGlobalExcludedUserAgents) will be used. * * @return bool + * @deprecated Will be removed in Matomo 4.0 */ public function isSiteSpecificUserAgentExcludeEnabled() { - Piwik::checkUserHasSomeAdminAccess(); - return (bool)Option::get(self::OPTION_SITE_SPECIFIC_USER_AGENT_EXCLUDE_ENABLE); + return true; } /** @@ -1078,16 +1077,10 @@ class API extends \Piwik\Plugin\API * websites. * * @param bool $enabled + * @deprecated Will be removed in Matomo 4.0 */ public function setSiteSpecificUserAgentExcludeEnabled($enabled) { - Piwik::checkUserHasSuperUserAccess(); - - // update option - Option::set(self::OPTION_SITE_SPECIFIC_USER_AGENT_EXCLUDE_ENABLE, $enabled); - - // make sure tracker cache will reflect change - Cache::deleteTrackerCache(); } /** diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 6d651e9324..459132fcd8 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -54,7 +54,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $globalSettings = array(); $globalSettings['keepURLFragmentsGlobal'] = API::getInstance()->getKeepURLFragmentsGlobal(); - $globalSettings['siteSpecificUserAgentExcludeEnabled'] = API::getInstance()->isSiteSpecificUserAgentExcludeEnabled(); $globalSettings['defaultCurrency'] = API::getInstance()->getDefaultCurrency(); $globalSettings['searchKeywordParametersGlobal'] = API::getInstance()->getSearchKeywordParametersGlobal(); $globalSettings['searchCategoryParametersGlobal'] = API::getInstance()->getSearchCategoryParametersGlobal(); @@ -82,7 +81,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $currency = Common::getRequestVar('currency', false); $searchKeywordParameters = Common::getRequestVar('searchKeywordParameters', $default = ""); $searchCategoryParameters = Common::getRequestVar('searchCategoryParameters', $default = ""); - $enableSiteUserAgentExclude = Common::getRequestVar('enableSiteUserAgentExclude', $default = 0); $keepURLFragments = Common::getRequestVar('keepURLFragments', $default = 0); $api = API::getInstance(); @@ -92,7 +90,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $api->setGlobalExcludedIps($excludedIps); $api->setGlobalExcludedUserAgents($excludedUserAgents); $api->setGlobalSearchParameters($searchKeywordParameters, $searchCategoryParameters); - $api->setSiteSpecificUserAgentExcludeEnabled($enableSiteUserAgentExclude == 1); $api->setKeepURLFragmentsGlobal($keepURLFragments); $toReturn = $response->getResponse(); diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index e6a62262b4..1320c0f6f2 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -288,9 +288,7 @@ class SitesManager extends \Piwik\Plugin private static function getExcludedUserAgents($website) { $excludedUserAgents = API::getInstance()->getExcludedUserAgentsGlobal(); - if (API::getInstance()->isSiteSpecificUserAgentExcludeEnabled()) { - $excludedUserAgents .= ',' . $website['excluded_user_agents']; - } + $excludedUserAgents .= ',' . $website['excluded_user_agents']; return self::filterBlankFromCommaSepList($excludedUserAgents); } @@ -403,8 +401,6 @@ class SitesManager extends \Piwik\Plugin $translationKeys[] = "SitesManager_GlobalListExcludedQueryParameters"; $translationKeys[] = "SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites"; $translationKeys[] = "SitesManager_GlobalListExcludedUserAgents"; - $translationKeys[] = "SitesManager_EnableSiteSpecificUserAgentExclude_Help"; - $translationKeys[] = "SitesManager_EnableSiteSpecificUserAgentExclude"; $translationKeys[] = "SitesManager_KeepURLFragments"; $translationKeys[] = "SitesManager_KeepURLFragmentsHelp"; $translationKeys[] = "SitesManager_KeepURLFragmentsHelp2"; diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js index 64b3bfb88d..ddf34ee2d9 100644 --- a/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js +++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js @@ -225,7 +225,6 @@ excludedQueryParameters: $scope.globalSettings.excludedQueryParametersGlobal.join(','), excludedUserAgents: $scope.globalSettings.excludedUserAgentsGlobal.join(','), keepURLFragments: $scope.globalSettings.keepURLFragmentsGlobal ? 1 : 0, - enableSiteUserAgentExclude: $scope.globalSettings.siteSpecificUserAgentExcludeEnabled ? 1 : 0, searchKeywordParameters: $scope.globalSettings.searchKeywordParametersGlobal.join(','), searchCategoryParameters: $scope.globalSettings.searchCategoryParametersGlobal.join(',') }, 'POST'); diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 53a13acb33..cbb36a04e5 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -15,8 +15,6 @@ "EcommerceHelp": "When enabled, the \"Goals\" report will have a new \"Ecommerce\" section.", "EnableEcommerce": "Ecommerce enabled", "EnableSiteSearch": "Site Search tracking enabled", - "EnableSiteSpecificUserAgentExclude": "Enable website specific user agent exclusion.", - "EnableSiteSpecificUserAgentExclude_Help": "If you need to exclude different user agents for different websites, check this box, click save and %1$sadd the user agents above%2$s.", "ExceptionDeleteSite": "It is not possible to delete this website as it is the only registered website. Add a new website first, then delete this one.", "ExceptionEmptyName": "The website name can't be empty.", "ExceptionInvalidCurrency": "The currency \"%1$s\" is not valid. Please enter a valid currency symbol (eg. %2$s)", diff --git a/plugins/SitesManager/templates/global-settings.html b/plugins/SitesManager/templates/global-settings.html index a3be2160f9..f95b079f85 100644 --- a/plugins/SitesManager/templates/global-settings.html +++ b/plugins/SitesManager/templates/global-settings.html @@ -48,12 +48,6 @@ inline-help="#excludedUserAgentsGlobalHelp"> -
-
-
{{ 'SitesManager_ExcludedParameters'|translate }}: {{ site.excluded_parameters.join(', ') }} -
  • +
  • {{ 'SitesManager_ExcludedUserAgents'|translate }}: {{ site.excluded_user_agents.join(', ') }}
    • diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png index 17c3bf4bef..296b54cdf3 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4fdfdf209a84d5656f3aec7d3293bc983172ab4748fd27a6d40533f2a6b8890 -size 271808 +oid sha256:8c2457a3a82f3adf16d377aefb3ae7cb96788720922f1ad08fa4d99053702339 +size 253810 -- cgit v1.2.3