diff --git a/CHANGELOG b/CHANGELOG index 55bdadcc8f..ee423ed44c 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] @@ -1485,7 +1485,7 @@ Version 3.6 (2018-03-23) Fixed a bug in URL completion for feed fragments [annando] Fixed a bug in the notification system about new registrations [annando] Fixed the display of dislikes [annando] - Fixed the display of orphans childs in threads [MrPetovan] + Fixed the display of orphan children in threads [MrPetovan] Fixed some SQL problems [annando] Fixed the CLI config script [tobiasd] Fixed the forum selection on the network display [annando] @@ -1734,7 +1734,7 @@ Version 3.5.1 (2017-03-12) Improvements to the documentation [Hypolite, tobiasd, rabuzarus, beardyunixer, eelcomaljaars] Improvements to the BBCode / Markdown conversation [Hypolite] Improvements to the OStatus protocol implementation [annando] - Improvements to the installation wizzard [tobiasd] + Improvements to the installation wizard [tobiasd] Improvements to the Diaspora connectivity [annando, Hypolite] Work on PHP7 compatibility [ddorian1] Code cleanup [Hypolite, Quix0r] @@ -1800,7 +1800,7 @@ Version 3.5 (2016-09-13) Improvements to the background process (poller, worker) [annando] Improvements to the admin panel [tobiasd, annando, fabrixxm] Improvements to the performance [annando] - Improvements to the installation wizzard (language selection, RINO version, check required PHP modules, default theme is now vier) [tobiasd] + Improvements to the installation wizard (language selection, RINO version, check required PHP modules, default theme is now vier) [tobiasd] Improvements to the relocation of nodes and accounts [annando] Improvements to the DDoS detection [annando] Improvements to the calendar/events module [annando, rabuzarus] @@ -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) @@ -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) diff --git a/database.sql b/database.sql index c6761c7ef2..eefd389840 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`), @@ -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/API-Friendica.md b/doc/API-Friendica.md index b51be65b16..197a5033e5 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 diff --git a/doc/Addons.md b/doc/Addons.md index df18ea62f2..5a80a95585 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 @@ -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' => [ @@ -402,7 +402,7 @@ Called prior to output of personal XRD file. ### home_content Called prior to output home page content, shown to unlogged users. -`$b` is the HTML sring of section region. +`$b` is the HTML string of section region. ### contact_edit Called when editing contact details on an individual from the Contacts page. diff --git a/doc/Developer-Domain-Driven-Design.md b/doc/Developer-Domain-Driven-Design.md index a4af436884..3052074443 100644 --- a/doc/Developer-Domain-Driven-Design.md +++ b/doc/Developer-Domain-Driven-Design.md @@ -47,7 +47,7 @@ function doSomething(\Friendica\Contact\Introductions\Collection\Introductions $ } /** @var $intros \Friendica\Contact\Introductions\Collection\Introductions */ -$intros = \Friendica\DI::intro()->selecForUser(Session::getLocalUser()); +$intros = \Friendica\DI::intro()->selectForUser(Session::getLocalUser()); doSomething($intros); ``` diff --git a/doc/Home.md b/doc/Home.md index 137a4a82ee..d343c41ccf 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 diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 298627ce9b..aadf24796f 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. diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md index 020214457a..ab87470b68 100644 --- a/doc/Tags-and-Mentions.md +++ b/doc/Tags-and-Mentions.md @@ -52,5 +52,5 @@ The same rules apply as with names that spaces within tags are represented by th It is therefore not possible to create a tag whose target contains an underscore. Topical tags are also not linked if they are purely numeric, e.g. #1. -If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections. +If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections. diff --git a/doc/database/db_diaspora-contact.md b/doc/database/db_diaspora-contact.md index 4beaeb019f..5bbc9ab221 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/doc/database/db_mail.md b/doc/database/db_mail.md index 2b588b4d74..834b556f6f 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/src/App/Page.php b/src/App/Page.php index 549ff3f0fa..6849656f40 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -253,9 +253,9 @@ class Page implements ArrayAccess '$touch_icon' => $touch_icon, '$block_public' => intval($config->get('system', 'block_public')), '$stylesheets' => $this->stylesheets, - '$likeError' => $l10n->t('Like not successfull'), - '$dislikeError' => $l10n->t('Dislike not successfull'), - '$announceError' => $l10n->t('Sharing not successfull'), + '$likeError' => $l10n->t('Like not successful'), + '$dislikeError' => $l10n->t('Dislike not successful'), + '$announceError' => $l10n->t('Sharing not successful'), '$attendError' => $l10n->t('Attendance unsuccessful'), '$srvError' => $l10n->t('Backend error'), '$netError' => $l10n->t('Network error'), diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php index 1ce516e25f..33b6f8303f 100644 --- a/src/Console/AutomaticInstallation.php +++ b/src/Console/AutomaticInstallation.php @@ -95,7 +95,7 @@ Examples bin/console autoinstall --savedb Installs Friendica with environment variables and saves them to the 'config/local.config.php' file - bin/console autoinstall -H localhost -p 3365 -u user -P passwort1234 -d friendica -U https://friendica.fqdn + bin/console autoinstall -H localhost -p 3365 -u user -P password1234 -d friendica -U https://friendica.fqdn Installs Friendica with a local mysql database with credentials HELP; } diff --git a/src/Console/User.php b/src/Console/User.php index 93b24cbc6a..eb061ede31 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 * diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 4304bc91a0..c113110662 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -447,7 +447,7 @@ class OEmbed * Generates an XPath query to select elements whose provided attribute contains * the provided value in a space-separated list. * - * @param string $attr Name of the attribute to seach + * @param string $attr Name of the attribute to search * @param string $value Value to search in a space-separated list * @return string */ diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index d6650f6aa0..93dbb11760 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -548,7 +548,7 @@ class BBCode /* * The previously spacefied [noparse][ i ]italic[ /i ][/noparse], - * now turns back and the [noparse] tags are trimed + * now turns back and the [noparse] tags are trimmed * returning [i]italic[/i] * * @param array $match diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php index 89a680501f..3f9ef7c3b4 100644 --- a/src/Content/Text/HTML.php +++ b/src/Content/Text/HTML.php @@ -842,7 +842,7 @@ class HTML * * @param string $s Search query. * @param string $id HTML id - * @param bool $aside Display the search widgit aside. + * @param bool $aside Display the search widget aside. * * @return string Formatted HTML. * @throws \Exception diff --git a/src/Core/Installer.php b/src/Core/Installer.php index 265dac905e..583ad5fe28 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -98,17 +98,17 @@ class Installer * Checks the current installation environment. There are optional and mandatory checks. * * @param string $baseurl The baseurl of Friendica - * @param string $phpath Optional path to the PHP binary + * @param string $phppath Optional path to the PHP binary * * @return bool if the check succeed * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function checkEnvironment($baseurl, $phpath = null) + public function checkEnvironment($baseurl, $phppath = null) { $returnVal = true; - if (isset($phpath)) { - if (!$this->checkPHP($phpath)) { + if (isset($phppath)) { + if (!$this->checkPHP($phppath)) { $returnVal = false; } } @@ -165,7 +165,7 @@ class Installer '$dbpass' => $configCache->get('database', 'password'), '$dbdata' => $configCache->get('database', 'database'), - '$phpath' => $configCache->get('config', 'php_path'), + '$phppath' => $configCache->get('config', 'php_path'), '$adminmail' => $configCache->get('config', 'admin_email'), '$system_url' => $configCache->get('system', 'url'), diff --git a/src/Core/Logger.php b/src/Core/Logger.php index 5c31eedc9b..db809904bc 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; /** diff --git a/src/Database/Database.php b/src/Database/Database.php index 4ee0fc31d7..b1ea6c1e4f 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -102,7 +102,7 @@ class Database * * @return void * - * @todo Make this method obsolet - use a clean pattern instead ... + * @todo Make this method obsolete - use a clean pattern instead ... */ public function setDependency(IManageConfigValues $config, Profiler $profiler, LoggerInterface $logger) { diff --git a/src/Model/GServer.php b/src/Model/GServer.php index b034ded754..11d3227e8a 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -675,7 +675,7 @@ class GServer } // All following checks are done for systems that always have got a "host-meta" endpoint. - // With this check we don't have to waste time and ressources for dead systems. + // With this check we don't have to waste time and resources for dead systems. // Also this hopefully prevents us from receiving abuse messages. if (($serverdata['network'] == Protocol::PHANTOM) || in_array($serverdata['detection-method'], self::DETECT_UNSPECIFIC)) { $validHostMeta = self::validHostMeta($url); diff --git a/src/Model/Log/ParsedLogIterator.php b/src/Model/Log/ParsedLogIterator.php index a45b671769..d238920e4d 100644 --- a/src/Model/Log/ParsedLogIterator.php +++ b/src/Model/Log/ParsedLogIterator.php @@ -25,7 +25,7 @@ use Friendica\Util\ReversedFileReader; use Friendica\Object\Log\ParsedLogLine; /** - * An iterator which returns `\Friendica\Objec\Log\ParsedLogLine` instances + * An iterator which returns `\Friendica\Object\Log\ParsedLogLine` instances * * Uses `\Friendica\Util\ReversedFileReader` to fetch log lines * from newest to oldest. diff --git a/src/Model/OpenWebAuthToken.php b/src/Model/OpenWebAuthToken.php index e99d40f12f..4186467c15 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) diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 2d80df15ba..29ae473abc 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -881,14 +881,14 @@ class Photo * Then set the permissions to public. */ - self::setPermissionForRessource($image_rid, $uid, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); + self::setPermissionForResource($image_rid, $uid, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); } return true; } /** - * Add permissions to photo ressource + * Add permissions to photo resource * @todo mix with previous photo permissions * * @param string $image_rid @@ -899,7 +899,7 @@ class Photo * @param string $str_group_deny * @return void */ - public static function setPermissionForRessource(string $image_rid, int $uid, string $str_contact_allow, string $str_group_allow, string $str_contact_deny, string $str_group_deny) + public static function setPermissionForResource(string $image_rid, int $uid, string $str_contact_allow, string $str_group_allow, string $str_contact_deny, string $str_group_deny) { $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny, diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 0a9557bc64..012ec6b621 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -455,7 +455,7 @@ class Media } /** - * Tests for path patterns that are usef for picture links in Friendica + * Tests for path patterns that are used for picture links in Friendica * * @param string $page Link to the image page * @param string $preview Preview picture @@ -467,7 +467,7 @@ class Media } /** - * Tests for path patterns that are usef for picture links in Friendica + * Tests for path patterns that are used for picture links in Friendica * * @param string $page Link to the image page * @param string $preview Preview picture diff --git a/src/Model/User.php b/src/Model/User.php index 5b749ec1dc..66b4cf1ff6 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -816,14 +816,14 @@ class User * Empties the password reset token field just in case. * * @param int $uid - * @param string $pasword_hashed + * @param string $password_hashed * @return bool * @throws Exception */ - private static function updatePasswordHashed(int $uid, string $pasword_hashed): bool + private static function updatePasswordHashed(int $uid, string $password_hashed): bool { $fields = [ - 'password' => $pasword_hashed, + 'password' => $password_hashed, 'pwdreset' => null, 'pwdreset_time' => null, 'legacy_password' => false diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php index c6bcadfa41..0eec5a3444 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/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php index 185756cdf8..f8f46a8956 100644 --- a/src/Module/Api/Mastodon/Statuses.php +++ b/src/Module/Api/Mastodon/Statuses.php @@ -391,9 +391,8 @@ class Statuses extends BaseApi continue; } - Photo::setPermissionForRessource($media[0]['resource-id'], $item['uid'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']); + Photo::setPermissionForResource($media[0]['resource-id'], $item['uid'], $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']); - $ressources[] = $media[0]['resource-id']; $phototypes = Images::supportedTypes(); $ext = $phototypes[$media[0]['type']]; diff --git a/src/Module/Api/Twitter/Statuses/Update.php b/src/Module/Api/Twitter/Statuses/Update.php index 702cc169e2..df51ff8a84 100644 --- a/src/Module/Api/Twitter/Statuses/Update.php +++ b/src/Module/Api/Twitter/Statuses/Update.php @@ -153,11 +153,10 @@ class Update extends BaseApi continue; } - Photo::setPermissionForRessource($media[0]['resource-id'], $uid, $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']); + Photo::setPermissionForResource($media[0]['resource-id'], $uid, $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']); - $ressources[] = $media[0]['resource-id']; - $phototypes = Images::supportedTypes(); - $ext = $phototypes[$media[0]['type']]; + $phototypes = Images::supportedTypes(); + $ext = $phototypes[$media[0]['type']]; $attachment = [ 'type' => Post\Media::IMAGE, diff --git a/src/Module/Contact/Redir.php b/src/Module/Contact/Redir.php index 6780197555..e1a7b21448 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/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 5f8f925a36..5653b128a9 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 private 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'])) { diff --git a/src/Module/Owa.php b/src/Module/Owa.php index a3ff8d9838..69abd8e871 100644 --- a/src/Module/Owa.php +++ b/src/Module/Owa.php @@ -80,12 +80,12 @@ 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 = ''; - // Encrypt the token with the public contacts publik key. + // Encrypt the token with the public contacts public key. // Only the specific public contact will be able to encrypt it. // At a later time, we will compare weather the token we're getting // is really the same token we have stored in the database. diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php index caa1146421..49aab14713 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(); diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php index 11835ec351..22d1b08a4e 100644 --- a/src/Module/WellKnown/XSocialRelay.php +++ b/src/Module/WellKnown/XSocialRelay.php @@ -28,7 +28,7 @@ use Friendica\Model\Search; use Friendica\Protocol\Relay; /** - * Node subscription preferences for social realy systems + * Node subscription preferences for social relay systems * @see https://git.feneas.org/jaywink/social-relay/blob/master/docs/relays.md */ class XSocialRelay extends BaseModule diff --git a/src/Object/Image.php b/src/Object/Image.php index 49196a0c44..5e915d84f5 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 */ diff --git a/src/Profile/ProfileField/Repository/ProfileField.php b/src/Profile/ProfileField/Repository/ProfileField.php index e20ed8a192..d297ca2377 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/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index a18a109284..468af6c72f 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]; @@ -1370,7 +1370,7 @@ class Receiver } /** - * Fetches the object data from external ressources if needed + * Fetches the object data from external resources if needed * * @param string $object_id Object ID of the provided object * @param array $object The provided object array diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index e3f7da107e..a4e1157ca2 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 diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 63d5195088..b29a3676ad 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -608,7 +608,7 @@ class DFRN /// @Todo /// - Check real image type and image size - /// - Check which of these boths elements we should use + /// - Check which of these elements we should use $attributes = [ 'rel' => 'photo', 'type' => 'image/jpeg', @@ -878,7 +878,7 @@ class DFRN XML::addElement($doc, $entry, 'dfrn:diaspora_guid', $item['guid']); - // The signed text contains the content in Markdown, the sender handle and the signatur for the content + // The signed text contains the content in Markdown, the sender handle and the signature for the content // It is needed for relayed comments to Diaspora. if ($item['signed_text']) { $sign = base64_encode(json_encode(['signed_text' => $item['signed_text'],'signature' => '','signer' => ''])); diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index ddefb1eb4d..35f5fdfdd4 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -51,12 +51,12 @@ class Email $errors = imap_errors(); if (!empty($errors)) { - Logger::notice('IMAP Errors occured', ['errors' => $errors]); + Logger::notice('IMAP Errors occurred', ['errors' => $errors]); } $alerts = imap_alerts(); if (!empty($alerts)) { - Logger::notice('IMAP Alerts occured: ', ['alerts' => $alerts]); + Logger::notice('IMAP Alerts occurred: ', ['alerts' => $alerts]); } return $mbox; diff --git a/src/Security/BasicAuth.php b/src/Security/BasicAuth.php index 0c5e91034b..25da9b8318 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 1e6f28b7f9..cc1f03f8cc 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]); diff --git a/src/Util/FileSystem.php b/src/Util/FileSystem.php index e86d6b595a..a21e7fb606 100644 --- a/src/Util/FileSystem.php +++ b/src/Util/FileSystem.php @@ -73,7 +73,7 @@ class FileSystem * * @param string $url The file/url * - * @return resource the open stream rssource + * @return resource the open stream resource * * @throws \UnexpectedValueException */ diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 1d57f5ea80..ae7e0fe375 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 diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php index 83913348ef..aa0f66bbff 100644 --- a/src/Util/Proxy.php +++ b/src/Util/Proxy.php @@ -77,7 +77,7 @@ class Proxy * * @param string $url The URL to proxify * @param string $size One of the Proxy::SIZE_* constants - * @return string The proxyfied URL or relative path + * @return string The proxified URL or relative path * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function proxifyUrl(string $url, string $size = ''): string diff --git a/src/Util/ReversedFileReader.php b/src/Util/ReversedFileReader.php index fbd32d51fd..fdd15bec90 100644 --- a/src/Util/ReversedFileReader.php +++ b/src/Util/ReversedFileReader.php @@ -158,7 +158,7 @@ class ReversedFileReader implements \Iterator } /** - * Checks if current iterator value is valid, that is, we readed all lines in files + * Checks if current iterator value is valid, that is, we read all lines in files * * @see Iterator::valid() * @return bool diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index a232834bcd..8c9ea58a10 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; } } diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php index 87669a2d12..2ca9e4f4e8 100644 --- a/src/Worker/ExpirePosts.php +++ b/src/Worker/ExpirePosts.php @@ -52,7 +52,7 @@ class ExpirePosts self::addMissingEntries(); } - // Set the expiry for origin posta + // Set the expiry for origin posts Worker::add(Worker::PRIORITY_LOW, 'Expire'); // update nodeinfo data after everything is cleaned up diff --git a/src/Worker/UpdateAllSuggestions.php b/src/Worker/UpdateAllSuggestions.php index 69c48aacbf..285cfe5bbb 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 { diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 62ac04f1cf..9acfbfcf98 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"], ], @@ -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"], diff --git a/static/defaults.config.php b/static/defaults.config.php index 467e415758..3c4fdd762b 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 diff --git a/tests/Util/VFSTrait.php b/tests/Util/VFSTrait.php index a98b7925de..86b7c167ce 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 diff --git a/tests/datasets/config/transformer/resource.node.config.php b/tests/datasets/config/transformer/resource.node.config.php new file mode 100644 index 0000000000..f7f0f6b1a3 --- /dev/null +++ b/tests/datasets/config/transformer/resource.node.config.php @@ -0,0 +1,7 @@ + [ + 'resources_not_allowed' => new \GuzzleHttp\Psr7\AppendStream(), + ], +]; diff --git a/tests/datasets/config/transformer/ressource.node.config.php b/tests/datasets/config/transformer/ressource.node.config.php deleted file mode 100644 index b83a139e34..0000000000 --- a/tests/datasets/config/transformer/ressource.node.config.php +++ /dev/null @@ -1,7 +0,0 @@ - [ - 'ressources_not_allowed' => new \GuzzleHttp\Psr7\AppendStream(), - ], -]; diff --git a/tests/src/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php index cde18e72c4..b4ad96dcaf 100644 --- a/tests/src/Console/AutomaticInstallationConsoleTest.php +++ b/tests/src/Console/AutomaticInstallationConsoleTest.php @@ -673,7 +673,7 @@ Examples bin/console autoinstall --savedb Installs Friendica with environment variables and saves them to the 'config/local.config.php' file - bin/console autoinstall -h localhost -p 3365 -U user -P passwort1234 -d friendica + bin/console autoinstall -h localhost -p 3365 -U user -P password1234 -d friendica Installs Friendica with a local mysql database with credentials HELP; diff --git a/tests/src/Model/UserTest.php b/tests/src/Model/UserTest.php index f1785f99d7..eb0cb9f32f 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/tests/src/Util/ImagesTest.php b/tests/src/Util/ImagesTest.php index 384e909364..b9caf4ccaf 100644 --- a/tests/src/Util/ImagesTest.php +++ b/tests/src/Util/ImagesTest.php @@ -88,7 +88,7 @@ class ImagesTest extends MockedTest * * @dataProvider dataImages */ - public function testGetInfoFromRemotURL(string $url, array $headers, string $data, array $assertion) + public function testGetInfoFromRemoteURL(string $url, array $headers, string $data, array $assertion) { $this->httpRequestHandler->setHandler(new MockHandler([ new Response(200, $headers, $data), diff --git a/view/fonts/README.md b/view/fonts/README.md index ca35ddadbf..f8e7d632e8 100644 --- a/view/fonts/README.md +++ b/view/fonts/README.md @@ -11,7 +11,7 @@ The iconset started from the new default user avatar (letter "p") Andi made for License ------- -The iconset is published unter the [CC-BY-SA 4.0][cc] license. +The iconset is published under the [CC-BY-SA 4.0][cc] license. Preview ------- diff --git a/view/js/linkPreview.js b/view/js/linkPreview.js index 29b818badb..28c8df9b67 100644 --- a/view/js/linkPreview.js +++ b/view/js/linkPreview.js @@ -31,7 +31,7 @@ \
\
\ - \
\ diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index ad7013564a..e7434b0aee 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -674,15 +674,15 @@ msgid "" msgstr "" #: src/App/Page.php:256 -msgid "Like not successfull" +msgid "Like not successful" msgstr "" #: src/App/Page.php:257 -msgid "Dislike not successfull" +msgid "Dislike not successful" msgstr "" #: src/App/Page.php:258 -msgid "Sharing not successfull" +msgid "Sharing not successful" msgstr "" #: src/App/Page.php:259 diff --git a/view/php/none.php b/view/php/none.php index a72311bd19..bf8041e8e2 100644 --- a/view/php/none.php +++ b/view/php/none.php @@ -19,7 +19,7 @@ * * The site template for pure content (e.g. (modals) * - * This themplate is used e.g for bs modals. So outputs + * This template is used e.g for bs modals. So outputs * only the pure content */ diff --git a/view/templates/install/01_checks.tpl b/view/templates/install/01_checks.tpl index 26f47daad5..186582aa7f 100644 --- a/view/templates/install/01_checks.tpl +++ b/view/templates/install/01_checks.tpl @@ -27,7 +27,7 @@ {{/foreach}} -{{if $phpath}} +{{if $phppath}} {{/if}} diff --git a/view/templates/install/local.config.tpl b/view/templates/install/local.config.tpl index 753698a3f2..24f5fe6b84 100644 --- a/view/templates/install/local.config.tpl +++ b/view/templates/install/local.config.tpl @@ -21,7 +21,7 @@ return [ // **************************************************************** 'config' => [ - 'php_path' => '{{$phpath|escape:'quotes' nofilter}}', + 'php_path' => '{{$phppath|escape:'quotes' nofilter}}', 'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}', 'sitename' => 'Friendica Social Network', 'register_policy' => \Friendica\Module\Register::OPEN, diff --git a/view/templates/settings/pagetypes.tpl b/view/templates/settings/pagetypes.tpl index 93732960b1..8b285aea87 100644 --- a/view/templates/settings/pagetypes.tpl +++ b/view/templates/settings/pagetypes.tpl @@ -24,11 +24,11 @@ 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); - // 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(){ diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 24e3c44dce..0758988fcd 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2180,7 +2180,7 @@ wall-item-comment-wrapper.well hr { nav .acpopup { margin-left: -23px; } -/** @todo: we schould consider the possibility to overwrite bootstrap dropdowns +/** @todo: we should consider the possibility to overwrite bootstrap dropdowns at the beginning of this file to get rid of the !important */ .textcomplete-item > a { color: $font_color_darker !important; diff --git a/view/theme/frio/scheme/dark.css b/view/theme/frio/scheme/dark.css index 5f7690d9c9..add36fff10 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; } diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index 7b9c0c937f..c59b30cf71 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -162,7 +162,7 @@ {{* The jot modal - We use a own modal for the jot and not the standard modal from the page template. This is because the special structure of the jot -(e.g.jot navigation tabs in the modal titel area). +(e.g.jot navigation tabs in the modal title area). Then in the frio theme the jot will loaded regularly and is hidden by default.) The js function jotShow() loads the jot into the modal. With this structure we can load different content into the jot modal (e.g. the item edit jot) diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 8ce5429714..ad577cefbb 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}} @@ -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}}