From 2280f22088e7aa2b1cb50a3f82445e0af99963ff Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:49:39 -0400 Subject: [PATCH 01/61] spelling: active Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Worker/UpdateAllSuggestions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Worker/UpdateAllSuggestions.php b/src/Worker/UpdateAllSuggestions.php index 69c48aacb..285cfe5bb 100644 --- a/src/Worker/UpdateAllSuggestions.php +++ b/src/Worker/UpdateAllSuggestions.php @@ -26,7 +26,7 @@ use Friendica\Model\Contact; use Friendica\Util\DateTimeFormat; /** - * Update contact suggestions for all aktive users + * Update contact suggestions for all active users */ class UpdateAllSuggestions { From 14f9e63233240df424b3f1db878fcefcc4b4ad39 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:52:57 -0400 Subject: [PATCH 02/61] spelling: and Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/Addons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Addons.md b/doc/Addons.md index df18ea62f..0121f76d8 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -44,7 +44,7 @@ Uninstalling an addon automatically unregisters any hook it registered, but if y The install and uninstall functions will be called (i.e. re-installed) if the addon changes after installation. Therefore your uninstall should not destroy data and install should consider that data may already exist. -Future extensions may provide for "setup" amd "remove". +Future extensions may provide for "setup" and "remove". ## PHP addon hooks From e115a54bf1822b6e8ed73318413a7afcacceff96 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:54:16 -0400 Subject: [PATCH 03/61] spelling: announce Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Protocol/ActivityPub/Transmitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index e3f7da107..a4e1157ca 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -1838,7 +1838,7 @@ class Transmitter } /** - * Return announce related data if the item is an annunce + * Return announce related data if the item is an announce * * @param array $item * @return array Announcement array From 9c86578755e62f16b972debf07a83c424b626446 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:55:00 -0400 Subject: [PATCH 04/61] spelling: associative Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Util/HTTPSignature.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 1d57f5ea8..ae7e0fe37 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -451,7 +451,7 @@ class HTTPSignature * @param string $request request url * @param integer $uid User id of the requester * @param boolean $binary TRUE if asked to return binary results (file download) (default is "false") - * @param array $opts (optional parameters) assoziative array with: + * @param array $opts (optional parameters) associative array with: * 'accept_content' => supply Accept: header with 'accept_content' as the value * 'timeout' => int Timeout in seconds, default system config value or 60 seconds * 'nobody' => only return the header From 4fc503d352da9d2ca4adddb0a8db75ce6727bbcc Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:56:14 -0400 Subject: [PATCH 05/61] spelling: authentication Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- CHANGELOG | 2 +- src/Module/Contact/Redir.php | 2 +- src/Protocol/ActivityPub/Receiver.php | 2 +- src/Security/BasicAuth.php | 2 +- src/Security/ExAuth.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 55bdadcc8..d65b526e0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1378,7 +1378,7 @@ Version 2018.05 (2018-06-01) Fixed a bug that made edited mentions and hashtags plaintext [annando] Fixed a bug that caused the /display page to receive constandly new updates [annando] Fixed wrong version of a dependency preventing the usage of PHP 5.6 [MrPetovan] - Fixed a bug in OpenID authentification [Quix0r] + Fixed a bug in OpenID authentication [Quix0r] Fixed a bug in the item deletion [annando] Fixed a bug that prevented public comments from being distributed [annando] Fixed a bug that caused empty profile pictures for public contacts [annando] diff --git a/src/Module/Contact/Redir.php b/src/Module/Contact/Redir.php index 678019755..e1a7b2144 100644 --- a/src/Module/Contact/Redir.php +++ b/src/Module/Contact/Redir.php @@ -171,7 +171,7 @@ class Redir extends \Friendica\BaseModule // On a local instance we have to check if the local user has already authenticated // with the local contact. Otherwise, the local user would ask the local contact - // for authentification everytime he/she is visiting a profile page of the local + // for authentication everytime he/she is visiting a profile page of the local // contact. if (($host == $remotehost) && ($this->session->getRemoteContactID($this->session->get('visitor_visiting')) == $this->session->get('visitor_id'))) { // Remote user is already authenticated. diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index a18a10928..26d5d0d1c 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -1181,7 +1181,7 @@ class Receiver self::switchContacts($receivers, $actor); // "birdsitelive" is a service that mirrors tweets into the fediverse - // These posts can be fetched without authentification, but are not marked as public + // These posts can be fetched without authentication, but are not marked as public // We treat them as unlisted posts to be able to handle them. if (empty($receivers) && $fetch_unlisted && Contact::isPlatform($actor, 'birdsitelive')) { $receivers[0] = ['uid' => 0, 'type' => self::TARGET_GLOBAL]; diff --git a/src/Security/BasicAuth.php b/src/Security/BasicAuth.php index 0c5e91034..25da9b831 100644 --- a/src/Security/BasicAuth.php +++ b/src/Security/BasicAuth.php @@ -31,7 +31,7 @@ use Friendica\Network\HTTPException\UnauthorizedException; use Friendica\Util\DateTimeFormat; /** - * Authentification via the basic auth method + * Authentication via the basic auth method */ class BasicAuth { diff --git a/src/Security/ExAuth.php b/src/Security/ExAuth.php index 1e6f28b7f..cc1f03f8c 100644 --- a/src/Security/ExAuth.php +++ b/src/Security/ExAuth.php @@ -303,7 +303,7 @@ class ExAuth // If the hostnames doesn't match or there is some failure, we try to check remotely if ($Error && !$this->checkCredentials($aCommand[2], $aCommand[1], $aCommand[3], true)) { - $this->writeLog(LOG_WARNING, 'authentification failed for user ' . $sUser . '@' . $aCommand[2]); + $this->writeLog(LOG_WARNING, 'authentication failed for user ' . $sUser . '@' . $aCommand[2]); fwrite(STDOUT, pack('nn', 2, 0)); } else { $this->writeLog(LOG_NOTICE, 'authenticated user ' . $sUser . '@' . $aCommand[2]); From 6ff7423ec53231c0ee682a348341371cd3e7a27d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:00:52 -0400 Subject: [PATCH 06/61] spelling: bridged Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/Home.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Home.md b/doc/Home.md index 137a4a82e..d343c41cc 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -69,7 +69,7 @@ Friendica Documentation and Resources * Ways to get Support * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers) * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe`` - * Community chat rooms (the IRC, Matrix and XMPP rooms are bridget) these public chats are logged [from IRC](https://gnusociarg.nsupdate.info/2021/%23friendica/) and [Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/) + * Community chat rooms (the IRC, Matrix and XMPP rooms are bridged) these public chats are logged [from IRC](https://gnusociarg.nsupdate.info/2021/%23friendica/) and [Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/) * XMPP/Jabber MUC: support(at)forum.friendi.ca * IRC: #friendica at [libera.chat](https://web.libera.chat/?channels=#friendica) * Matrix: [#friendi.ca](https://matrix.to/#/#friendi.ca:matrix.org) or [#friendica-en](https://matrix.to/#/#friendica-en:matrix.org) at matrix.org From 29fd7b9f68dd8eb9c056eaed87807ef2c5bbc727 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:03:04 -0400 Subject: [PATCH 07/61] spelling: canvas Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Object/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Object/Image.php b/src/Object/Image.php index 49196a0c4..5e915d84f 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -600,7 +600,7 @@ class Image do { $this->image->cropImage($w, $h, $x, $y); /* - * We need to remove the canva, + * We need to remove the canvas, * or the image is not resized to the crop: * http://php.net/manual/en/imagick.cropimage.php#97232 */ From 4c41f5a2f3d416cc5277519df1d402c794679071 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:03:50 -0400 Subject: [PATCH 08/61] spelling: catavatar Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/Addons.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Addons.md b/doc/Addons.md index 0121f76d8..9a65dc2d6 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -264,7 +264,7 @@ $data = [ ##### With multiple submit buttons ```php $data = [ - 'addon' => 'catavar', + 'addon' => 'catavatar', 'title' => DI::l10n()->t('Cat Avatar Settings'), 'html' => $html, 'submit' => [ From 9fc26de628c609ea247011435e0f9673cf4d0011 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:04:43 -0400 Subject: [PATCH 09/61] spelling: children Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- tests/src/Model/UserTest.php | 2 +- view/theme/frio/templates/wall_thread.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/Model/UserTest.php b/tests/src/Model/UserTest.php index f1785f99d..eb0cb9f32 100644 --- a/tests/src/Model/UserTest.php +++ b/tests/src/Model/UserTest.php @@ -133,7 +133,7 @@ class UserTest extends MockedTest $this->dbMock->shouldReceive('isResult')->with('objectReturn')->andReturn(true)->once(); $this->dbMock->shouldReceive('toArray')->with('objectReturn', true, 0)->andReturn([$this->parent])->once(); - // Select the childs (user & manage) + // Select the children (user & manage) $this->dbMock->shouldReceive('select')->with('user', ['uid', 'username', 'nickname'], [ diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 8ce542971..face2436b 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -22,7 +22,7 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.thread_level==2 && $top_child_nr==1}}
{{/if}} -{{* end of hacky part to count childrens *}} +{{* end of hacky part to count children *}} {{if $mode == display}} From e0dcf163ec874bc22d92424bde4e7f9e94530154 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:07:08 -0400 Subject: [PATCH 10/61] spelling: database Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Module/Api/Friendica/Photo/Update.php | 2 +- src/Module/Owa.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php index c6bcadfa4..0eec5a344 100644 --- a/src/Module/Api/Friendica/Photo/Update.php +++ b/src/Module/Api/Friendica/Photo/Update.php @@ -70,7 +70,7 @@ class Update extends BaseApi throw new HTTPException\BadRequestException('no albumname specified'); } - // check if photo is existing in databasei + // check if photo is existing in database if (!Photo::exists(['resource-id' => $photo_id, 'uid' => $uid, 'album' => $album])) { throw new HTTPException\BadRequestException('photo not available'); } diff --git a/src/Module/Owa.php b/src/Module/Owa.php index a3ff8d983..8bbc9a916 100644 --- a/src/Module/Owa.php +++ b/src/Module/Owa.php @@ -80,7 +80,7 @@ class Owa extends BaseModule $ret['success'] = true; $token = Strings::getRandomHex(32); - // Store the generated token in the databe. + // Store the generated token in the database. OpenWebAuthToken::create('owt', 0, $token, $contact['addr']); $result = ''; From a95d46f783fe305a2a85b430e478d2836c66673f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:12:32 -0400 Subject: [PATCH 11/61] spelling: ddos Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d65b526e0..b8d4c1a6a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2020,7 +2020,7 @@ Version 3.4 (2015-04-05) Optionally, "like" and "dislike" activities don't update thread timestamp (annando) Updated markdown libraries (annando) Updated jQuery (StefOfficiel) - Cache zrl verification requests to prevent DSoS (issue #1453) (annando) + Cache zrl verification requests to prevent DDoS (issue #1453) (annando) "Verify SSL" options affects also VERIFYHOST (annando) Better handling of hashtags (annando) Updated translations (translation teams, tobias) From ab59732c09034b2e90823e7ee69050abc261e3b7 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:08:34 -0400 Subject: [PATCH 12/61] spelling: deactivate Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- view/js/linkPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/linkPreview.js b/view/js/linkPreview.js index 29b818bad..28c8df9b6 100644 --- a/view/js/linkPreview.js +++ b/view/js/linkPreview.js @@ -31,7 +31,7 @@
\
\
\ - \
\ From 672686faa525eadea37af610f81a3361a7349a74 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:09:03 -0400 Subject: [PATCH 13/61] spelling: deletes Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Profile/ProfileField/Repository/ProfileField.php | 2 +- tests/Util/VFSTrait.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Profile/ProfileField/Repository/ProfileField.php b/src/Profile/ProfileField/Repository/ProfileField.php index e20ed8a19..d297ca237 100644 --- a/src/Profile/ProfileField/Repository/ProfileField.php +++ b/src/Profile/ProfileField/Repository/ProfileField.php @@ -192,7 +192,7 @@ class ProfileField extends BaseRepository } /** - * Delets a whole collection of ProfileFields + * Deletes a whole collection of ProfileFields * * @param Collection\ProfileFields $profileFields * diff --git a/tests/Util/VFSTrait.php b/tests/Util/VFSTrait.php index a98b7925d..86b7c167c 100644 --- a/tests/Util/VFSTrait.php +++ b/tests/Util/VFSTrait.php @@ -85,7 +85,7 @@ trait VFSTrait } /** - * Delets a config file from the Virtual File System + * Deletes a config file from the Virtual File System * * @param string $filename The filename of the config file * @param bool $static True, if the folder `static` instead of `config` should be used From 1c223319b79d0e7ed7feaa1da068e20e095986ec Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:09:15 -0400 Subject: [PATCH 14/61] spelling: denies Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Console/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/User.php b/src/Console/User.php index 93b24cbc6..eb061ede3 100644 --- a/src/Console/User.php +++ b/src/Console/User.php @@ -270,7 +270,7 @@ HELP; } /** - * Allows or denys a user based on it's nickname + * Allows or denies a user based on it's nickname * * @param bool $allow True, if the pending user is allowed, false if denies * From 2613c3411b81ee51af7dc88f097080706a2cb085 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 19:00:19 -0400 Subject: [PATCH 15/61] spelling: dfrn Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- static/defaults.config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/defaults.config.php b/static/defaults.config.php index 467e41575..3c4fdd762 100644 --- a/static/defaults.config.php +++ b/static/defaults.config.php @@ -520,7 +520,7 @@ return [ 'profiler' => false, // pushpoll_frequency (Integer) - // Frequency of contact poll for subhub contact using the DFRM or OStatus network. + // Frequency of contact poll for subhub contact using the DFRN or OStatus network. // Available values: // - 5 = every month // - 4 = every week From 964b7c4bd22db82867b4a41e90d6df2d25865a81 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:11:35 -0400 Subject: [PATCH 16/61] spelling: disallowed Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Module/RobotsTxt.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php index caa114642..49aab1471 100644 --- a/src/Module/RobotsTxt.php +++ b/src/Module/RobotsTxt.php @@ -31,7 +31,7 @@ class RobotsTxt extends BaseModule { protected function rawContent(array $request = []) { - $allDisalloweds = [ + $allDisallowed = [ '/settings/', '/admin/', '/message/', @@ -42,7 +42,7 @@ class RobotsTxt extends BaseModule header('Content-Type: text/plain'); echo 'User-agent: *' . PHP_EOL; - foreach ($allDisalloweds as $disallowed) { + foreach ($allDisallowed as $disallowed) { echo 'Disallow: ' . $disallowed . PHP_EOL; } System::exit(); From 6be7473369c3a6a976ca8941ec151c6bff16080d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:13:22 -0400 Subject: [PATCH 17/61] spelling: each other Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/API-Friendica.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/API-Friendica.md b/doc/API-Friendica.md index b51be65b1..197a5033e 100644 --- a/doc/API-Friendica.md +++ b/doc/API-Friendica.md @@ -163,7 +163,7 @@ Add or remove an activity from an item. * `attendmaybe` To remove an activity, prepend the verb with "un", eg. "unlike" or "undislike" -Attend verbs disable eachother: that means that if "attendyes" was added to an item, adding "attendno" remove previous "attendyes". +Attend verbs disable each other: that means that if "attendyes" was added to an item, adding "attendno" remove previous "attendyes". Attend verbs should be used only with event-related items (there is no check at the moment). #### Parameters From a4a95d0b414f51bb8db16ac27d8bd836be8caf21 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 17:53:40 -0400 Subject: [PATCH 18/61] spelling: enabled Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Core/Logger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Logger.php b/src/Core/Logger.php index 5c31eedc9..db809904b 100644 --- a/src/Core/Logger.php +++ b/src/Core/Logger.php @@ -36,7 +36,7 @@ class Logger */ const TYPE_LOGGER = LoggerInterface::class; /** - * @var WorkerLogger A specific worker logger type, which can be anabled + * @var WorkerLogger A specific worker logger type, which can be enabled */ const TYPE_WORKER = WorkerLogger::class; /** From fb4c76a2b6e6037df47eda2252e9d4c2e24ea025 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:15:44 -0400 Subject: [PATCH 19/61] spelling: entry Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Model/OpenWebAuthToken.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model/OpenWebAuthToken.php b/src/Model/OpenWebAuthToken.php index e99d40f12..4186467c1 100644 --- a/src/Model/OpenWebAuthToken.php +++ b/src/Model/OpenWebAuthToken.php @@ -58,7 +58,7 @@ class OpenWebAuthToken * @param int $uid The user ID. * @param string $token * - * @return string|boolean The meta enry or false if not found. + * @return string|boolean The meta entry or false if not found. * @throws \Exception */ public static function getMeta(string $type, int $uid, string $token) From 414a4348c435ba9ff0e1a293f327615538d0ec26 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:17:55 -0400 Subject: [PATCH 20/61] spelling: except Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- view/templates/settings/pagetypes.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/settings/pagetypes.tpl b/view/templates/settings/pagetypes.tpl index 93732960b..f9f0dc7ca 100644 --- a/view/templates/settings/pagetypes.tpl +++ b/view/templates/settings/pagetypes.tpl @@ -24,7 +24,7 @@ var accountType = {{$account_type}}; $(document).ready(function(){ - // Hide all DIV for page-flags expet the one which belongs to the present + // Hide all DIV for page-flags except the one which belongs to the present // account-type showPageFlags(accountType); From 8b901ddf6eb22612fe2c7dbc0e4340f2702aba56 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:20:00 -0400 Subject: [PATCH 21/61] spelling: fediverse Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/Making-Friends.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 298627ce9..aadf24796 100644 --- a/doc/Making-Friends.md +++ b/doc/Making-Friends.md @@ -50,8 +50,8 @@ This will take you through a similar process. Connect to users of alternate networks --- -### Across the Federation and Fedivese -You can also use your Identity Address or other people's Identity Addresses to become friends across the so-called Federation/Fedivese of open source social media. +### Across the Federation and Fediverse +You can also use your Identity Address or other people's Identity Addresses to become friends across the so-called Federation/Fediverse of open source social media. Currently, Friendica supports connections with people on diaspora*, Red, Hubzilla, GNU Social, StatusNet, Mastodon, Pleroma, socialhome, and ganggo platforms. If you know (for instance) "alice" on gnusocial.net (a GNU Social site) you could put alice@gnusocial.net into your Contact page and become friends across networks. From 76a81425b7919756132f3277e555f91170c8489c Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:23:25 -0400 Subject: [PATCH 22/61] spelling: fieldset Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- view/theme/frio/scheme/dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/scheme/dark.css b/view/theme/frio/scheme/dark.css index 5f7690d9c..add36fff1 100644 --- a/view/theme/frio/scheme/dark.css +++ b/view/theme/frio/scheme/dark.css @@ -81,7 +81,7 @@ input[type="range"] { .form-control[disabled], .form-control[readonly], -.ieldset[disabled] .form-control { +.fieldset[disabled] .form-control { background-color: $background_color; color: $font_color_darker; } From c17e0ba9a834afe421d0c10a1b027614aa735c87 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:20:43 -0400 Subject: [PATCH 23/61] spelling: flags Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- view/templates/settings/pagetypes.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/settings/pagetypes.tpl b/view/templates/settings/pagetypes.tpl index f9f0dc7ca..8b285aea8 100644 --- a/view/templates/settings/pagetypes.tpl +++ b/view/templates/settings/pagetypes.tpl @@ -28,7 +28,7 @@ // account-type showPageFlags(accountType); - // Save the ID of the active page-flage + // Save the ID of the active page-flags var activeFlag = $('[id^=id_page-flags_]:checked'); $("[id^=id_account-type_]").change(function(){ From 8165fb80910560cef86f78ae7a52c7131f5ad3f5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 20:00:30 -0400 Subject: [PATCH 24/61] spelling: group Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Module/Conversation/Network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 5f8f925a3..7c4c8a396 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -120,7 +120,7 @@ class Network extends BaseModule $content = ''; if (self::$forumContactId) { - // If self::$forumContactId belongs to a community forum or a privat goup,.add a mention to the status editor + // If self::$forumContactId belongs to a community forum or a privat group, add a mention to the status editor $condition = ["`id` = ? AND `contact-type` = ?", self::$forumContactId, Contact::TYPE_COMMUNITY]; $contact = DBA::selectFirst('contact', ['addr'], $condition); if (!empty($contact['addr'])) { From 1a74355e399b05c15217f787d611e9b31613e7b4 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:26:19 -0400 Subject: [PATCH 25/61] spelling: instead Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b8d4c1a6a..edf156526 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2058,7 +2058,7 @@ Version 3.3.3 (2015-02-24) Share-it button support (annando) More reliable reshare from Diaspora (annando) Load more images via proxy (annando) - util/typo.php uses "php -l" insead of "eval()" to validate code (fabrixxm) + util/typo.php uses "php -l" instead of "eval()" to validate code (fabrixxm) Use $_SERVER array in cli script instead of $argv/$argc (issue #1218) (annando) Updated vagrant setup script (silke) API: support to star/unstar items (fabrixxm) From a5eb8bb206e2d687a76caabcff4704c1cc3b5073 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:26:35 -0400 Subject: [PATCH 26/61] spelling: interacts Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- database.sql | 2 +- doc/database/db_diaspora-contact.md | 2 +- static/dbstructure.config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index c6761c7ef..e1b099a20 100644 --- a/database.sql +++ b/database.sql @@ -608,7 +608,7 @@ CREATE TABLE IF NOT EXISTS `diaspora-contact` ( `gsid` int unsigned COMMENT 'Global Server ID', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', - `interacting_count` int unsigned DEFAULT 0 COMMENT 'Number of contacts this contact interactes with', + `interacting_count` int unsigned DEFAULT 0 COMMENT 'Number of contacts this contact interacts with', `interacted_count` int unsigned DEFAULT 0 COMMENT 'Number of contacts that interacted with this contact', `post_count` int unsigned DEFAULT 0 COMMENT 'Number of posts and comments', PRIMARY KEY(`uri-id`), diff --git a/doc/database/db_diaspora-contact.md b/doc/database/db_diaspora-contact.md index 4beaeb019..5bbc9ab22 100644 --- a/doc/database/db_diaspora-contact.md +++ b/doc/database/db_diaspora-contact.md @@ -27,7 +27,7 @@ Fields | gsid | Global Server ID | int unsigned | YES | | NULL | | | created | | datetime | NO | | 0001-01-01 00:00:00 | | | updated | | datetime | NO | | 0001-01-01 00:00:00 | | -| interacting_count | Number of contacts this contact interactes with | int unsigned | YES | | 0 | | +| interacting_count | Number of contacts this contact interacts with | int unsigned | YES | | 0 | | | interacted_count | Number of contacts that interacted with this contact | int unsigned | YES | | 0 | | | post_count | Number of posts and comments | int unsigned | YES | | 0 | | diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 62ac04f1c..2c6b448ac 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -662,7 +662,7 @@ return [ "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], - "interacting_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts this contact interactes with"], + "interacting_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts this contact interacts with"], "interacted_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts that interacted with this contact"], "post_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of posts and comments"], ], From 7032b679cce438e6bb40150acf1a169533d29ceb Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:26:50 -0400 Subject: [PATCH 27/61] spelling: interval Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/Worker/Cron.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index a232834bc..8c9ea58a1 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -44,7 +44,7 @@ class Cron if ($last) { $next = $last + ($poll_interval * 60); if ($next > time()) { - Logger::notice('cron intervall not reached'); + Logger::notice('cron interval not reached'); return; } } From d18505395325a3bf2fd4760a58014eb70694a7c7 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:28:05 -0400 Subject: [PATCH 28/61] spelling: items Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- view/theme/vier/wide.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/vier/wide.css b/view/theme/vier/wide.css index dc0fda50a..66aaf9221 100644 --- a/view/theme/vier/wide.css +++ b/view/theme/vier/wide.css @@ -27,7 +27,7 @@ right_aside #right_services img { } right_aside #lastusers-wrapper, -right_aside div.itens-wrapper, +right_aside div.items-wrapper, right_aside #right_services_icons { margin-left: 10px; margin-top: 5px; From 55dafd4023839c502646feb9dbf73af0345f0a72 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:29:58 -0400 Subject: [PATCH 29/61] spelling: link Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- database.sql | 2 +- doc/database/db_mail.md | 2 +- static/dbstructure.config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database.sql b/database.sql index e1b099a20..eefd38984 100644 --- a/database.sql +++ b/database.sql @@ -880,7 +880,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this private message', `from-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'name of the sender', `from-photo` varbinary(383) NOT NULL DEFAULT '' COMMENT 'contact photo link of the sender', - `from-url` varbinary(383) NOT NULL DEFAULT '' COMMENT 'profile linke of the sender', + `from-url` varbinary(383) NOT NULL DEFAULT '' COMMENT 'profile link of the sender', `contact-id` varbinary(255) COMMENT 'contact.id', `author-id` int unsigned COMMENT 'Link to the contact table with uid=0 of the author of the mail', `convid` int unsigned COMMENT 'conv.id', diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md index 2b588b4d7..834b556f6 100644 --- a/doc/database/db_mail.md +++ b/doc/database/db_mail.md @@ -13,7 +13,7 @@ Fields | guid | A unique identifier for this private message | varbinary(255) | NO | | | | | from-name | name of the sender | varchar(255) | NO | | | | | from-photo | contact photo link of the sender | varbinary(383) | NO | | | | -| from-url | profile linke of the sender | varbinary(383) | NO | | | | +| from-url | profile link of the sender | varbinary(383) | NO | | | | | contact-id | contact.id | varbinary(255) | YES | | NULL | | | author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | YES | | NULL | | | convid | conv.id | int unsigned | YES | | NULL | | diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 2c6b448ac..9acfbfcf9 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -926,7 +926,7 @@ return [ "guid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this private message"], "from-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "name of the sender"], "from-photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "contact photo link of the sender"], - "from-url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "profile linke of the sender"], + "from-url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "profile link of the sender"], "contact-id" => ["type" => "varbinary(255)", "relation" => ["contact" => "id"], "comment" => "contact.id"], "author-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of the mail"], "convid" => ["type" => "int unsigned", "relation" => ["conv" => "id"], "comment" => "conv.id"], From 25ed92fc97a48cfb6fef61d22310db897e8c7eb8 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:30:29 -0400 Subject: [PATCH 30/61] spelling: little Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- view/theme/frio/templates/wall_thread.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index face2436b..ad577cefb 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -91,7 +91,7 @@ as the value of $top_child_total (this is done at the end of this file)
- {{* The litle overlay avatar picture if someone is posting directly to a wall or a forum *}} + {{* The little overlay avatar picture if someone is posting directly to a wall or a forum *}} {{if $item.owner_url}}