diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-06-26 02:51:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 02:51:22 +0300 |
| commit | 714503751b76436daf6533331f24e3400eb06ad1 (patch) | |
| tree | d631f4b36e68416fab939182d675a25bc8d1cee6 | |
| parent | 0b0321b7330d13c77aab51a6c3b424ae7d3a1cfc (diff) | |
Rename referrer spam list (#16105)
* Rename referrer spam list
* Rename referrer spam list
* Update VisitExcluded.php
* Update VisitExcluded.php
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | core/Tracker/VisitExcluded.php | 4 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/Tasks.php | 8 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/tests/Integration/TasksTest.php | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a71e0d68c8..2cc9595b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -718,7 +718,7 @@ The folder containing expected screenshots was renamed from `expected-ui-screens ### Internal changes -* The referrer spam filter has moved from the `referrer_urls_spam` INI option (in `global.ini.php`) to a separate package (see [https://github.com/matomo-org/referrer-spam-blacklist](https://github.com/matomo-org/referrer-spam-blacklist)). +* The referrer spam filter has moved from the `referrer_urls_spam` INI option (in `global.ini.php`) to a separate package (see [https://github.com/matomo-org/referrer-spam-list](https://github.com/matomo-org/referrer-spam-list)). ## Piwik 2.12.0 diff --git a/core/Tracker/VisitExcluded.php b/core/Tracker/VisitExcluded.php index 401e3f04db..265f8f12e8 100644 --- a/core/Tracker/VisitExcluded.php +++ b/core/Tracker/VisitExcluded.php @@ -131,11 +131,11 @@ class VisitExcluded if (!$excluded) { $excluded = $this->isReferrerSpamExcluded(); if ($excluded) { - Common::printDebug("Referrer URL is blacklisted as spam."); + Common::printDebug("Referrer URL is listed as spam."); } } } else { - Common::printDebug("Spam blacklist is disabled."); + Common::printDebug("Spam list is disabled."); } // Check if request URL is excluded diff --git a/plugins/CoreAdminHome/Tasks.php b/plugins/CoreAdminHome/Tasks.php index aa026de425..21008b78a3 100644 --- a/plugins/CoreAdminHome/Tasks.php +++ b/plugins/CoreAdminHome/Tasks.php @@ -86,7 +86,7 @@ class Tasks extends \Piwik\Plugin\Tasks $generalConfig = Config::getInstance()->Tracker; if((SettingsPiwik::isInternetEnabled() === true) && $generalConfig['enable_spam_filter']){ - $this->weekly('updateSpammerBlacklist'); + $this->weekly('updateSpammerList'); } $this->scheduleTrackingCodeReminderChecks(); @@ -303,11 +303,11 @@ class Tasks extends \Piwik\Plugin\Tasks /** * Update the referrer spam blacklist * - * @see https://github.com/matomo-org/referrer-spam-blacklist + * @see https://github.com/matomo-org/referrer-spam-list */ - public function updateSpammerBlacklist() + public function updateSpammerList() { - $url = 'https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt'; + $url = 'https://raw.githubusercontent.com/matomo-org/referrer-spam-list/master/spammers.txt'; $list = Http::sendHttpRequest($url, 30); $list = preg_split("/\r\n|\n|\r/", $list); if (count($list) < 10) { diff --git a/plugins/CoreAdminHome/tests/Integration/TasksTest.php b/plugins/CoreAdminHome/tests/Integration/TasksTest.php index e3611596f0..c0df9eb7e8 100644 --- a/plugins/CoreAdminHome/tests/Integration/TasksTest.php +++ b/plugins/CoreAdminHome/tests/Integration/TasksTest.php @@ -140,7 +140,7 @@ class TasksTest extends IntegrationTestCase 'optimizeArchiveTable.', 'cleanupTrackingFailures.', 'notifyTrackingFailures.', - 'updateSpammerBlacklist.', + 'updateSpammerList.', 'checkSiteHasTrackedVisits.2', 'checkSiteHasTrackedVisits.3', 'checkSiteHasTrackedVisits.4', |