Replace remaining instances with "allowlist", "denylist" and "blocklist"

diff --git a/CHANGELOG b/CHANGELOG
index 197b2bca052d5ee3c5bd8c8cb3675c5ea5904fbf..89f200df9b29cba6ad4035f6d8701fc12a5a8989 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,7 +61,7 @@ Version 2020.03 "Red Hot Poker"  (2020-03-30)
     Update to the translations (CS, DE, FR, PL, RU, ZH-CN) [translation teams]
     General code refactoring and enhancements [AndyHee, annando, MrPetovan, nupplaphil]
     blockbot:
-      Ensure that good agents are whitelisted [valvin1]
+      Ensure that good agents are allowlisted [valvin1]
     markdown:
       Addon to use Markdown while composing a posting was added [annando]
     showmore:
@@ -911,7 +911,7 @@ Version 3.5.3 (2017-10-05)
     Updates to the documentation [tobiasd]
     Code revision and refactoring [Hypolite]
     pumpio, twitter bridges adopted to new background mechanism [annando]
-    Leistungsschutzrecht has a new source list, and a whitelist [annando]
+    Leistungsschutzrecht has a new source list, and an allowlist [annando]
     retriever marked unsupported due to unwanted side-effects [annando]
     Unicode emoji added [annando]
     Enhancement to the general content filter [annando]
@@ -1373,7 +1373,7 @@ Version 3.3.1 (2014-11-06)
        Set default location to empty for new users. Suppress warning on user creation (issue #1193) (fabrixxm)
        Correctly build urls with queries (issue #1190) (fabrixxm)
        Optionally use keywords in feed as post tags with "remote self" (annando)
-       A blacklist of keywords to not use can be defined (annando)
+       A denylist of keywords to not use can be defined (annando)
        "remote self" works also with Friendica and Diaspora contacts (annando)
        Show exact post time after 12 hours (FX7)
        Optionally redirect from non-SSL to SSL (annando)

diff --git a/doc/Install.md b/doc/Install.md
index f37521d759c540cc5671975bf6fae70c6a181671..d0daa5f115c3b4b5850df4d46a7bed5552b5f326 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -435,7 +435,7 @@ provided by one of our members.
 > 
 > This is obvious as soon as you notice that the friendica-cron uses `proc_open`
 > to execute PHP scripts that also use `proc_open`, but it took me quite some time to find that out.
-> I hope this saves some time for other people using suhosin with function blacklists.
+> I hope this saves some time for other people using suhosin with function blocklists.
 
 ### Unable to create all mysql tables on MySQL 5.7.17 or newer
 

diff --git a/include/items.php b/include/items.php
index 38f4a58fba4bfb3b1e157c78fa9b5e0fb66baea1..a81a3bdb202e83aa1151bcd24af3c5caf77f63cd 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -111,7 +111,7 @@ function add_page_info_data(array $data, $no_photos = false)
        return "\n".$text.$hashtags;
 }
 
-function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+function query_page_info($url, $photo = "", $keywords = false, $keyword_denylist = "")
 {
        $data = ParseUrl::getSiteinfoCached($url, true);
 
@@ -125,8 +125,8 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
                unset($data["keywords"]);
        }
 
-       if (($keyword_blacklist != "") && isset($data["keywords"])) {
-               $list = explode(", ", $keyword_blacklist);
+       if (($keyword_denylist != "") && isset($data["keywords"])) {
+               $list = explode(", ", $keyword_denylist);
 
                foreach ($list as $keyword) {
                        $keyword = trim($keyword);
@@ -141,9 +141,9 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
        return $data;
 }
 
-function get_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+function get_page_keywords($url, $photo = "", $keywords = false, $keyword_denylist = "")
 {
-       $data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
+       $data = query_page_info($url, $photo, $keywords, $keyword_denylist);
        if (empty($data["keywords"]) || !is_array($data["keywords"])) {
                return [];
        }
@@ -159,9 +159,9 @@ function get_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
        return $taglist;
 }
 
-function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "")
+function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_denylist = "")
 {
-       $data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
+       $data = query_page_info($url, $photo, $keywords, $keyword_denylist);
 
        $text = '';
 

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index fa2e3db9237db57dc2e688f2a62c7c853ec17a68..50536dc1a5af3778e0e92ff928f4406b1bccf569 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1859,7 +1859,7 @@ class BBCode
                $text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
                                         '<$1$2=""$4 data-original-src="$3" class="invalid-src" title="' . DI::l10n()->t('Invalid source protocol') . '">', $text);
 
-               // sanitize href attributes (only whitelisted protocols URLs)
+               // sanitize href attributes (only allowlisted protocols URLs)
                // default value for backward compatibility
                $allowed_link_protocols = DI::config()->get('system', 'allowed_link_protocols', []);
 

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 57c671895caa0397733c11a10251dc2d7ce2807a..806b2b86bbd73a48c3f4858fcb327544d742641e 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -349,7 +349,7 @@ class Database
        }
 
        /**
-        * Removes every not whitelisted character from the identifier string
+        * Removes every not allowlisted character from the identifier string
         *
         * @param string $identifier
         *

diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php
index d0c632b0bf5bd6afc6c044e56e776d373457c89f..4f19ca361d11a9f1c9d835710d7889430c29b4ed 100644 (file)
--- a/src/Module/Admin/Blocklist/Server.php
+++ b/src/Module/Admin/Blocklist/Server.php
@@ -88,7 +88,7 @@ class Server extends BaseAdmin
                return Renderer::replaceMacros($t, [
                        '$title' => DI::l10n()->t('Administration'),
                        '$page' => DI::l10n()->t('Server Domain Pattern Blocklist'),
-                       '$intro' => DI::l10n()->t('This page can be used to define a blacklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'),
+                       '$intro' => DI::l10n()->t('This page can be used to define a blocklist of server domain patterns from the federated network that are not allowed to interact with your node. For each domain pattern you should also provide the reason why you block it.'),
                        '$public' => DI::l10n()->t('The list of blocked server domain patterns will be made publically available on the <a href="/friendica">/friendica</a> page so that your users and people investigating communication problems can find the reason easily.'),
                        '$syntax' => DI::l10n()->t('<p>The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:</p>
 <ul>