diff options
31 files changed, 56 insertions, 56 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e8042bf6c..ea3c38e1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,7 +100,7 @@ * Fix bug in French and German translations of new/old tags [#3703](https://github.com/FreshRSS/FreshRSS/pull/3703), [#3668](https://github.com/FreshRSS/FreshRSS/pull/3668) * Fix name of keyboard shortcut to open in new tab [#3899](https://github.com/FreshRSS/FreshRSS/pull/3899) * Add Japanese [#3828](https://github.com/FreshRSS/FreshRSS/pull/3828), [#3834](https://github.com/FreshRSS/FreshRSS/pull/3834) - * Improve Chineese [#3926](https://github.com/FreshRSS/FreshRSS/pull/3926), [#3947](https://github.com/FreshRSS/FreshRSS/pull/3947), [#3963](https://github.com/FreshRSS/FreshRSS/pull/3963), [#4084](https://github.com/FreshRSS/FreshRSS/pull/4084) + * Improve Chinese [#3926](https://github.com/FreshRSS/FreshRSS/pull/3926), [#3947](https://github.com/FreshRSS/FreshRSS/pull/3947), [#3963](https://github.com/FreshRSS/FreshRSS/pull/3963), [#4084](https://github.com/FreshRSS/FreshRSS/pull/4084) * Improve Dutch [#3844](https://github.com/FreshRSS/FreshRSS/pull/3844), [#3928](https://github.com/FreshRSS/FreshRSS/pull/3928) * Improve German [#3720](https://github.com/FreshRSS/FreshRSS/pull/3720), [#3846](https://github.com/FreshRSS/FreshRSS/pull/3846), [#3913](https://github.com/FreshRSS/FreshRSS/pull/3913), [#4008](https://github.com/FreshRSS/FreshRSS/pull/4008) * Improve Italian [#3939](https://github.com/FreshRSS/FreshRSS/pull/3939) diff --git a/Docker/hooks/build b/Docker/hooks/build index 84e759a80..427151e6f 100755 --- a/Docker/hooks/build +++ b/Docker/hooks/build @@ -5,14 +5,14 @@ FRESHRSS_VERSION=$(grep "'FRESHRSS_VERSION'" constants.php | cut -d "'" -f4) echo "$FRESHRSS_VERSION" if [[ $DOCKERFILE_PATH == *-ARM ]]; then - #TODO: Add --squash --platform arm options when Docker Hub deamon supports them + #TODO: Add --squash --platform arm options when Docker Hub daemon supports them docker build \ --build-arg FRESHRSS_VERSION="$FRESHRSS_VERSION" \ --build-arg SOURCE_BRANCH="$SOURCE_BRANCH" \ --build-arg SOURCE_COMMIT="$SOURCE_COMMIT" \ -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" . else - #TODO: Add --squash option when Docker Hub deamon supports it + #TODO: Add --squash option when Docker Hub daemon supports it docker build \ --build-arg FRESHRSS_VERSION="$FRESHRSS_VERSION" \ --build-arg SOURCE_BRANCH="$SOURCE_BRANCH" \ diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php index fedabea8e..c4258b8df 100644 --- a/app/Controllers/authController.php +++ b/app/Controllers/authController.php @@ -149,7 +149,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController { ]); FreshRSS_Auth::giveAccess(); - // Set cookie parameter if nedded. + // Set cookie parameter if needed. if (Minz_Request::param('keep_logged_in')) { FreshRSS_FormAuth::makeCookie($username, FreshRSS_Context::$user_conf->passwordHash); } else { diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index 5afd24a91..29b87b927 100755 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -152,7 +152,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController { /** * This action optimizes database to reduce its size. * - * This action shouldbe reached by a POST request. + * This action should be reached by a POST request. * * @todo move this action in configure controller. * @todo call this action through web-cron when available diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index efb2684fe..d384afddb 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -255,7 +255,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { * * @param string $article_file the JSON file content. * @param boolean $starred true if articles from the file must be starred. - * @return boolean false if an error occured, true otherwise. + * @return boolean false if an error occurred, true otherwise. */ private function importJson($article_file, $starred = false) { $article_object = json_decode($article_file, true); diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index c6200f868..d9a59c5e3 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -9,10 +9,10 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { * This action only redirect on the default view mode (normal or global) */ public function indexAction() { - $prefered_output = FreshRSS_Context::$user_conf->view_mode; + $preferred_output = FreshRSS_Context::$user_conf->view_mode; Minz_Request::forward(array( 'c' => 'index', - 'a' => $prefered_output + 'a' => $preferred_output )); } diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 7545035cc..eb0d86c3b 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -72,7 +72,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController { * * It displays the feed configuration page. * If this action is reached through a POST request, it stores all new - * configuraiton values then sends a notification to the user. + * configuration values then sends a notification to the user. * * The options available on the page are: * - name diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 4b781d5db..6814c8521 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -542,7 +542,7 @@ SQL; /** * Mark all the articles in a tag as read. - * @param integer $id tag ID, or empty for targetting any tag + * @param integer $id tag ID, or empty for targeting any tag * @param integer $idMax max article ID * @return integer|false affected rows */ diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php index 649536bdf..51bf9635f 100644 --- a/app/Models/EntryDAOSQLite.php +++ b/app/Models/EntryDAOSQLite.php @@ -242,7 +242,7 @@ DROP TABLE IF EXISTS `tmp`; /** * Mark all the articles in a tag as read. - * @param integer $id tag ID, or empty for targetting any tag + * @param integer $id tag ID, or empty for targeting any tag * @param integer $idMax max article ID * @return integer|false affected rows */ diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 4cc38c15c..f995a3dd7 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -26,7 +26,7 @@ class FreshRSS_Import_Service { * This method parses and imports an OPML file. * * @param string $opml_file the OPML file content. - * @return boolean false if an error occured, true otherwise. + * @return boolean false if an error occurred, true otherwise. */ public function importOpml($opml_file) { $opml_array = array(); @@ -51,7 +51,7 @@ class FreshRSS_Import_Service { * * @param array $opml_elements an OPML element (body or outline). * @param string $parent_cat the name of the parent category. - * @return boolean false if an error occured, true otherwise. + * @return boolean false if an error occurred, true otherwise. */ private function addOpmlElements($opml_elements, $parent_cat = null) { $isOkStatus = true; @@ -108,7 +108,7 @@ class FreshRSS_Import_Service { * * @param array $feed_elt an OPML element (must be a feed element). * @param string $parent_cat the name of the parent category. - * @return boolean false if an error occured, true otherwise. + * @return boolean false if an error occurred, true otherwise. */ private function addFeedOpml($feed_elt, $parent_cat) { if ($parent_cat == null) { @@ -185,7 +185,7 @@ class FreshRSS_Import_Service { * @param string $parent_cat the name of the parent category. * @param boolean $cat_limit_reached indicates if category limit has been reached. * if yes, category is not added (but we try for feeds!) - * @return boolean false if an error occured, true otherwise. + * @return boolean false if an error occurred, true otherwise. */ private function addCategoryOpml($cat_elt, $parent_cat, $cat_limit_reached) { // Create a new Category object diff --git a/config.default.php b/config.default.php index bad2737c9..910370a3e 100644 --- a/config.default.php +++ b/config.default.php @@ -50,7 +50,7 @@ return array( # Login method: # `none` is without password and shows only the default user; # `form` is a conventional Web login form; - # `http_auth` is an access controled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache) + # `http_auth` is an access controlled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache) # if you use `http_auth`, remember to protect only `/FreshRSS/p/i/`, # and in particular not protect `/FreshRSS/p/api/` if you would like to use the API (different login system). 'auth_type' => 'form', diff --git a/docs/en/admins/06_LinuxInstall.md b/docs/en/admins/06_LinuxInstall.md index fa980a647..ab42fb992 100644 --- a/docs/en/admins/06_LinuxInstall.md +++ b/docs/en/admins/06_LinuxInstall.md @@ -105,7 +105,7 @@ ln -s /usr/share/FreshRSS/p /var/www/html/ ## Part 3: Creating a Database for FreshRSS -Start a MySQL session. running this command will ask you for the MySQL password you set earler, and then put you into a prompt that should look like `MariaDB [(none)]>` +Start a MySQL session. running this command will ask you for the MySQL password you set earlier, and then put you into a prompt that should look like `MariaDB [(none)]>` ```sh mysql -u root -p diff --git a/docs/en/admins/12_User_management.md b/docs/en/admins/12_User_management.md index e2c19b467..6e0492a91 100644 --- a/docs/en/admins/12_User_management.md +++ b/docs/en/admins/12_User_management.md @@ -2,13 +2,13 @@ ## User list -Settings page: `Administation` -> `Manage Users`. +Settings page: `Administration` -> `Manage Users`. The [default user](13_Default_user.md) is marked with italic letters. ## Create new user -Settings page: `Administation` → `Manage Users`. +Settings page: `Administration` → `Manage Users`. For a new user the following information is necessary: * language @@ -24,7 +24,7 @@ New users could use the self registration form in the frontend. The user registration form is available via the login form, when the maximum number of accounts is smaller than the number of created accounts (Set up in `Administration` → `System configuration`). If the maximum number of accounts is 0, than there is no limit on the number of user accounts. -If in the `System configuration` the `Force email addres validation` is enabled, than the email address input is shown and mandatory. +If in the `System configuration` the `Force email address validation` is enabled, than the email address input is shown and mandatory. It is optional to have a `Terms of Service` (`ToS`). If ToS is enabled, then it is mandatory to check it for registration. diff --git a/docs/en/developers/03_Backend/05_Extensions.md b/docs/en/developers/03_Backend/05_Extensions.md index 1104b30f5..90fe6f699 100644 --- a/docs/en/developers/03_Backend/05_Extensions.md +++ b/docs/en/developers/03_Backend/05_Extensions.md @@ -39,7 +39,7 @@ Minz relies on and imposes an MVC architecture on projects using it. This archit ### Routing In order to link a URL to a controller, first you have to go through a "routing" phase. In FreshRSS, this is particularly simple because it suffices to specify the name of the controller to load into the URL using a `c` parameter. -For example, the address <http://exemple.com?c=hello> will execute the code contained in the `hello` controller. +For example, the address <http://example.com?c=hello> will execute the code contained in the `hello` controller. One concept that has not yet been discussed is the "actions" system. An action is executed *on* a controller. Concretely, a controller is represented by a class and its actions by methods. To execute an action, it is necessary to specify an `a` parameter in the URL. @@ -61,10 +61,10 @@ class FreshRSS_hello_Controller extends FreshRSS_ActionController { ?> ``` -When loading the address <http://exemple.com?c=hello&a=world>, the `world` action is executed on the `hello` controller. +When loading the address <http://example.com?c=hello&a=world>, the `world` action is executed on the `hello` controller. Note: if `c` or `a` is not specified, the default value for each of these variables is `index`. -So the address <http://exemple.com?c=hello> will execute the `index` action of the `hello` controller. +So the address <http://example.com?c=hello> will execute the `index` action of the `hello` controller. From now on, the `hello/world` naming convention will be used to refer to a controller/action pair. @@ -125,7 +125,7 @@ To take full advantage of the Minz routing system, it is strongly discouraged to </p> ``` -If one day it was decided to use a "url rewriting" system to have addresses in a <http://exemple.com/controller/action> format, all previous addresses would become ineffective! +If one day it was decided to use a "url rewriting" system to have addresses in a <http://example.com/controller/action> format, all previous addresses would become ineffective! So use the `Minz_Url` class and its `display()` method instead. `Minz_Url::display()` takes an array of the following form as its argument: diff --git a/docs/en/users/03_Main_view.md b/docs/en/users/03_Main_view.md index 8e7563200..11fd20d65 100644 --- a/docs/en/users/03_Main_view.md +++ b/docs/en/users/03_Main_view.md @@ -271,4 +271,4 @@ Display the user queries drop-down by clicking the button next to the state butt Then click on the bookmarked query, the previously stored query will be applied. > Note that only the query is stored, not the articles. -> The results you are seing now could be different from the results on the day you've created the query. +> The results you are seeing now could be different from the results on the day you've created the query. diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php index bef273bda..fc8e0f807 100644 --- a/lib/Minz/Error.php +++ b/lib/Minz/Error.php @@ -33,7 +33,7 @@ class Minz_Error { 'c' => 'error' ), $redirect); } else { - echo '<h1>An error occured</h1>' . "\n"; + echo '<h1>An error occurred</h1>' . "\n"; if (!empty ($logs)) { echo '<ul>' . "\n"; diff --git a/lib/Minz/ExtensionException.php b/lib/Minz/ExtensionException.php index ab4c5c419..b86a97798 100644 --- a/lib/Minz/ExtensionException.php +++ b/lib/Minz/ExtensionException.php @@ -3,9 +3,9 @@ class Minz_ExtensionException extends Minz_Exception { public function __construct ($message, $extension_name = false, $code = self::ERROR) { if ($extension_name) { - $message = 'An error occured in `' . $extension_name . '` extension with the message: ' . $message; + $message = 'An error occurred in `' . $extension_name . '` extension with the message: ' . $message; } else { - $message = 'An error occured in an unnamed extension with the message: ' . $message; + $message = 'An error occurred in an unnamed extension with the message: ' . $message; } parent::__construct($message, $code); diff --git a/lib/Minz/Migrator.php b/lib/Minz/Migrator.php index 71abbff3e..7afc5240e 100644 --- a/lib/Minz/Migrator.php +++ b/lib/Minz/Migrator.php @@ -45,7 +45,7 @@ class Minz_Migrator return basename($filename, '.php'); }, $migration_files); - // We apply a "low-cost" comparaison to avoid to include the migration + // We apply a "low-cost" comparison to avoid to include the migration // files at each run. It is equivalent to the upToDate method. if (count($applied_migrations) === count($migration_versions) && empty(array_diff($applied_migrations, $migration_versions))) { @@ -239,7 +239,7 @@ class Minz_Migrator * Migrate the system to the latest version. * * It only executes migrations AFTER the current version. If a migration - * returns false or fails, it immediatly stops the process. + * returns false or fails, it immediately stops the process. * * If the migration doesn't return false nor raise an exception, it is * considered as successful. It is considered as good practice to return diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index e74f4f908..ee3962615 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -313,7 +313,7 @@ class Minz_Request { Minz_Session::lock(); $requests = Minz_Session::param('requests'); if ($requests) { - //Delete abandonned notifications + //Delete abandoned notifications $requests = array_filter($requests, function ($r) { return isset($r['time']) && $r['time'] > time() - 3600; }); $requestId = self::requestId(); diff --git a/lib/PHPMailer/PHPMailer/SMTP.php b/lib/PHPMailer/PHPMailer/SMTP.php index 0cea1e864..565441e6b 100644 --- a/lib/PHPMailer/PHPMailer/SMTP.php +++ b/lib/PHPMailer/PHPMailer/SMTP.php @@ -696,7 +696,7 @@ class SMTP /** * Send an SMTP DATA command. * Issues a data command and sends the msg_data to the server, - * finializing the mail transaction. $msg_data is the message + * finalizing the mail transaction. $msg_data is the message * that is to be send with the headers. Each header needs to be * on a single line followed by a <CRLF> with the message headers * and the message body being separated by an additional <CRLF>. diff --git a/lib/SimplePie/SimplePie/Enclosure.php b/lib/SimplePie/SimplePie/Enclosure.php index 8a4cffa30..cc0d038b5 100644 --- a/lib/SimplePie/SimplePie/Enclosure.php +++ b/lib/SimplePie/SimplePie/Enclosure.php @@ -843,7 +843,7 @@ class SimplePie_Enclosure * * @deprecated Use the second parameter to {@see embed} instead * - * @param array|string $options See first paramter to {@see embed} + * @param array|string $options See first parameter to {@see embed} * @return string HTML string to output */ public function native_embed($options='') diff --git a/lib/SimplePie/SimplePie/Misc.php b/lib/SimplePie/SimplePie/Misc.php index 9317e71a4..11d6efbdc 100644 --- a/lib/SimplePie/SimplePie/Misc.php +++ b/lib/SimplePie/SimplePie/Misc.php @@ -42,7 +42,7 @@ */ /** - * Miscellanous utilities + * Miscellaneous utilities * * @package SimplePie */ diff --git a/lib/http-conditional.php b/lib/http-conditional.php index ad920455d..853fdf983 100644 --- a/lib/http-conditional.php +++ b/lib/http-conditional.php @@ -16,9 +16,9 @@ [Implied] $cacheSeconds=0: Lifetime in seconds of the document. If $cacheSeconds<0, cache is disabled. If $cacheSeconds==0, the document will be revalidated each time it is accessed. If $cacheSeconds>0, the document will be cashed and not revalidated against the server for this delay. [Implied] $cachePrivacy=0: 0=private, 1=normal (public), 2=forced public. When public, it allows a cashed document ($cacheSeconds>0) to be shared by several users. [Implied] $feedMode=false: Special RSS/ATOM feeds. When true, it sets $cachePrivacy to 0 (private), does not use the modification time of the script itself, and puts the date of the client's cache (or a old date from 1980) in the global variable $clientCacheDate. - [implied] $compression=false: Enable the compression and allows persistant connections (automatic detection of the capacities of the client). + [implied] $compression=false: Enable the compression and allows persistent connections (automatic detection of the capacities of the client). [implied] $session=false: To be turned on when sessions are used. Checks if the data contained in $_SESSION has been modified during the last generation the document. - Returns: True if the connection can be closed (e.g.: the client has already the lastest version), false if the new content has to be send to the client. + Returns: True if the connection can be closed (e.g.: the client has already the latest version), false if the new content has to be send to the client. Typical use: <?php @@ -189,7 +189,7 @@ function _httpConditionalCallBack($buffer,$mode=5) if (strlen($buffer2)>1) //When ob_gzhandler succeeded $buffer=$buffer2; } - header('Content-Length: '.strlen($buffer)); //Allows persistant connections //rfc2616-sec14.html#sec14.13 + header('Content-Length: '.strlen($buffer)); //Allows persistent connections //rfc2616-sec14.html#sec14.13 return $buffer; } diff --git a/lib/lib_install.php b/lib/lib_install.php index 886fff54c..494ddc6dd 100644 --- a/lib/lib_install.php +++ b/lib/lib_install.php @@ -106,7 +106,7 @@ function initDb() { $db['base'] = $dbBase; $conf->db = $db; if ($databaseDAO != null) { - //Perfom database auto-creation + //Perform database auto-creation $databaseDAO->create(); } } diff --git a/lib/lib_phpQuery.php b/lib/lib_phpQuery.php index f47133235..411aa120c 100644 --- a/lib/lib_phpQuery.php +++ b/lib/lib_phpQuery.php @@ -336,7 +336,7 @@ class DOMDocumentWrapper { phpQuery::debug('Full markup load (XML): '.substr($markup, 0, 250)); $this->loadMarkupReset(); $this->isXML = true; - // check agains XHTML in contentType or markup + // check against XHTML in contentType or markup $isContentTypeXHTML = $this->isXHTML(); $isMarkupXHTML = $this->isXHTML($markup); if ($isContentTypeXHTML || $isMarkupXHTML) { @@ -1184,7 +1184,7 @@ class phpQueryObject /** * Indicated if doument is just a fragment (no <html> tag). * - * Every document is realy a full document, so even documentFragments can + * Every document is really a full document, so even documentFragments can * be queried against <html>, but getDocument(id)->htmlOuter() will return * only contents of <body>. * @@ -1195,7 +1195,7 @@ class phpQueryObject * Iterator interface helper * @access private */ - protected $elementsInterator = array(); + protected $elementsIterator = array(); /** * Iterator interface helper * @var bool @@ -1340,7 +1340,7 @@ class phpQueryObject /** * Unloads whole document from memory. * CAUTION! None further operations will be possible on this document. - * All objects refering to it will be useless. + * All objects referring to it will be useless. * * @return phpQueryObject|QueryTemplatesSource|QueryTemplatesParse|QueryTemplatesSourceQuery */ @@ -1883,7 +1883,7 @@ class phpQueryObject // strip side brackets $attr = trim($s, ']['); $execute = false; - // attr with specifed value + // attr with specified value if (mb_strpos($s, '=')) { $value = null; list($attr, $value) = explode('=', $attr); @@ -4076,7 +4076,7 @@ class phpQueryObject $this->debug('iterating foreach'); // phpQuery::selectDocument($this->getDocumentID()); $this->elementsBackup = $this->elements; - $this->elementsInterator = $this->elements; + $this->elementsIterator = $this->elements; $this->valid = isset( $this->elements[0] ) ? 1 : 0; // $this->elements = $this->valid @@ -4090,7 +4090,7 @@ class phpQueryObject */ #[\ReturnTypeWillChange] public function current() { - return $this->elementsInterator[ $this->current ]; + return $this->elementsIterator[ $this->current ]; } /** * @return mixed @@ -4115,11 +4115,11 @@ class phpQueryObject public function next($cssSelector = null){ // if ($cssSelector || $this->valid) // return $this->_next($cssSelector); - $this->valid = isset( $this->elementsInterator[ $this->current+1 ] ) + $this->valid = isset( $this->elementsIterator[ $this->current+1 ] ) ? true : false; - if (! $this->valid && $this->elementsInterator) { - $this->elementsInterator = null; + if (! $this->valid && $this->elementsIterator) { + $this->elementsIterator = null; } else if ($this->valid) { $this->current++; } else { @@ -4918,7 +4918,7 @@ abstract class phpQuery { * @param string $file Filename to include. Defaults to "{$class}.php". */ public static function plugin($class, $file = null) { - // TODO $class checked agains phpQuery_$class + // TODO $class checked against phpQuery_$class // if (strpos($class, 'phpQuery') === 0) // $class = substr($class, 8); if (in_array($class, self::$pluginsLoaded)) diff --git a/lib/lib_rss.php b/lib/lib_rss.php index a43bc475f..cc375f9ed 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -561,7 +561,7 @@ function recursive_unlink($dir) { * Remove queries where $get is appearing. * @param string $get the get attribute which should be removed. * @param array<int,array<string,string>> $queries an array of queries. - * @return array<int,array<string,string>> whithout queries where $get is appearing. + * @return array<int,array<string,string>> without queries where $get is appearing. */ function remove_query_by_get($get, $queries) { $final_queries = array(); diff --git a/p/api/pshb.php b/p/api/pshb.php index c2436d0ff..9170c1025 100644 --- a/p/api/pshb.php +++ b/p/api/pshb.php @@ -74,7 +74,7 @@ if (!empty($_REQUEST['hub_mode']) && $_REQUEST['hub_mode'] === 'subscribe') { } $hubJson['lease_start'] = time(); if (!isset($hubJson['error'])) { - $hubJson['error'] = true; //Do not assume that WebSub works until the first successul push + $hubJson['error'] = true; //Do not assume that WebSub works until the first successful push } file_put_contents('./!hub.json', json_encode($hubJson)); header('Connection: close'); diff --git a/p/scripts/main.js b/p/scripts/main.js index 21420872f..ca3bb2b9d 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -1005,7 +1005,7 @@ function init_stream(stream) { } el = ev.target.closest('.item.title > a'); - if (el) { // Allow default control-click behaviour such as open in backround-tab + if (el) { // Allow default control-click behaviour such as open in background-tab return ev.ctrlKey; } diff --git a/p/scripts/statsWithChartjs.js b/p/scripts/statsWithChartjs.js index 2f5c39ce8..82887226f 100644 --- a/p/scripts/statsWithChartjs.js +++ b/p/scripts/statsWithChartjs.js @@ -27,7 +27,7 @@ function initCharts() { chartConfig = jsonChartDoughnut(jsonDataParsed.labels, jsonDataParsed.data); break; case 'barWithAverage': - chartConfig = jsonChartBarWithAvarage(jsonDataParsed.labelBarChart, jsonDataParsed.dataBarChart, + chartConfig = jsonChartBarWithAverage(jsonDataParsed.labelBarChart, jsonDataParsed.dataBarChart, jsonDataParsed.labelAverage, jsonDataParsed.dataAverage, jsonDataParsed.xAxisLabels); } @@ -114,7 +114,7 @@ function jsonChartDoughnut(labels, data) { }; } -function jsonChartBarWithAvarage(labelBarChart, dataBarChart, labelAverage, dataAverage, xAxisLabels = '') { +function jsonChartBarWithAverage(labelBarChart, dataBarChart, labelAverage, dataAverage, xAxisLabels = '') { return { type: 'bar', data: { diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php index 2efdffda9..bef548b02 100644 --- a/tests/app/Models/SearchTest.php +++ b/tests/app/Models/SearchTest.php @@ -39,7 +39,7 @@ class SearchTest extends PHPUnit\Framework\TestCase { * @param string $intitle_value * @param string|null $search_value */ - public function test__construct_whenInputContainsIntitle_setsIntitlePropery($input, $intitle_value, $search_value) { + public function test__construct_whenInputContainsIntitle_setsIntitleProperty($input, $intitle_value, $search_value) { $search = new FreshRSS_Search($input); $this->assertEquals($intitle_value, $search->getIntitle()); $this->assertEquals($search_value, $search->getSearch()); diff --git a/tests/lib/Minz/MigratorTest.php b/tests/lib/Minz/MigratorTest.php index dec1d0176..6cc4b4a94 100644 --- a/tests/lib/Minz/MigratorTest.php +++ b/tests/lib/Minz/MigratorTest.php @@ -291,7 +291,7 @@ class MigratorTest extends TestCase $this->assertTrue($result); $versions = file_get_contents($applied_migrations_path); - // if the order changes, it probably means the first versions comparaison + // if the order changes, it probably means the first versions comparison // test doesn't work anymore $this->assertSame("2019_12_23_Baz\n2019_12_22_FooBar", $versions); } |