Fix typos

.dotgitlab-ci.yml

@@ -32,6 +32,6 @@ script:
   - vendor/bin/behat
 
 after_failure:
-  - echo "Failures detected. Outputing additional logs:"
+  - echo "Failures detected. Outputting additional logs:"
   - sudo cat /var/log/apache2/error.log
   - sudo cat /var/log/mysql/error.log

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Please note that this project is released with a [Contributor Code of Conduct](h
 
 # Reporting an Issue
 
-You can report an issue here in the [Github issue tracker](https://github.com/phpList/phplist3/issues). 
+You can report an issue here in the [GitHub issue tracker](https://github.com/phpList/phplist3/issues). 
 
 Please follow the guidelines below when creating an issue so that your issue can be more promptly resolved:
 

PEOPLE

@@ -20,7 +20,7 @@ Other translations are managed and listed at
 https://github.com/phpList/phplist-lan-help/graphs/contributors
 and https://github.com/phpList/phplist-lan-info/graphs/contributors
 
-Frontend translations are on Github and the contributors are listed at 
+Frontend translations are on GitHub and the contributors are listed at 
 https://github.com/phpList/phplist-lan-texts/graphs/contributors
 although a history of contributions are also in the translation files themselves.
 

TESTING.md

@@ -11,7 +11,7 @@
 To develop acceptance tests locally, install Vagrant. This allows you to run tests against 
 different versions of PHP.
 Find the line "PHPVERSION=7.4" and change it to the version of PHP you want to use.
-Put @wip in the feature you are working on, so that it doesn't interfere with Github CI.
+Put @wip in the feature you are working on, so that it doesn't interfere with GitHub CI.
 
 Then run
 ```sh
@@ -77,7 +77,7 @@ Edit your phplist `config.php` [file](https://www.phplist.org/manual/ch028_insta
 
 ### First time
 
-Some tests can only be run once before they change the system state upon which they depend. These tests should only be run once, or only in automated testing environments like Github actions. Execute these and all other tests together by running the following command from within your phpList 3 code root directory:
+Some tests can only be run once before they change the system state upon which they depend. These tests should only be run once, or only in automated testing environments like GitHub actions. Execute these and all other tests together by running the following command from within your phpList 3 code root directory:
 
 ```sh
 $ vendor/bin/behat

TODO

@@ -41,7 +41,7 @@ plugin dependencies: Plugin A requires Plugin B (+version) so installing A also
 - system messages identifiable for bounces and process them
 DONE, NEEDS FEEDBACK direct delivery of subscription message to make sure it can arrive, and give error when it can't
 - move configurable stuff outside the webroot, to make upgrading easier
-- seperate message for signing up people from import
+- separate message for signing up people from import
 - statistics retrieval (#lists #users #messages)
 - use DKIM capabilities of phpMailer
 - integration with other OSS projects

bin/imgur-uploader.sh

@@ -7,7 +7,7 @@
 # The latest version can be found at https://github.com/tremby/imgur.sh
 
 # API Key provided by Bart;
-# replace with your own or specify yours as IMGUR_CLIENT_ID envionment variable
+# replace with your own or specify yours as IMGUR_CLIENT_ID environment variable
 # to avoid limits
 default_client_id=17385cf5260cef9
 client_id="${IMGUR_CLIENT_ID:=$default_client_id}"

doc/README.bounces

@@ -33,7 +33,7 @@ be unsubscribed immediately. Unsubscribed means that their email will be marked
 will cause the system to stop sending emails to this user.
 
 In the future it will become possible to "probe" the unconfirmed emails with a renewed request for
-confirmation, which will be dealt with seperately, most likely by simply deleting the user.
+confirmation, which will be dealt with separately, most likely by simply deleting the user.
 
 If a message to a user bounces, the threshold will be used to determine the previous number of
 message that have bounced. A user will only be marked unconfirmed once a row of consecutive messages

doc/README.usertables

@@ -3,7 +3,7 @@ Configuring the tables
 
 You can now specify a prefix for all tables. See the config.php file.
 
-You can also specify a seperate prefix for user tables. This can be useful
+You can also specify a separate prefix for user tables. This can be useful
 if you use your usertables for other purposes. You will need to have three
 tables for this:
 

public_html/lists/admin/actions/import1.php

@@ -160,7 +160,7 @@
             }
         }
 
-        //add this user to the lists identified, execpt when found in the blacklist
+        //add this user to the lists identified, except when found in the blacklist
         $addition = 0;
         $listoflists = '';
         $isBlackListed = isBlackListed($email);
@@ -224,7 +224,7 @@
     } // end if
 } // end while
 
-// lets be gramatically correct :-)
+// lets be grammatically correct :-)
 $displists = ($num_lists == 1) ? $GLOBALS['I18N']->get('list') : $GLOBALS['I18N']->get('lists');
 $dispemail = ($count_email_add == 1) ? $GLOBALS['I18N']->get('new email was') : $GLOBALS['I18N']->get('new emails were');
 $dispemail2 = ($additional_emails == 1) ? $GLOBALS['I18N']->get('email was') : $GLOBALS['I18N']->get('emails were');
@@ -238,7 +238,7 @@
 if (!$some && !$additional_emails) {
     $report .= '<br/>' . s('All the emails already exist in the database.');
 } else {
-    $report .= "<br/>$count_email_add $dispemail " . s('succesfully imported to the database and added to') . " $num_lists $displists.<br/>$additional_emails $dispemail2 " . $GLOBALS['I18N']->get('subscribed to the') . " $displists";
+    $report .= "<br/>$count_email_add $dispemail " . s('successfully imported to the database and added to') . " $num_lists $displists.<br/>$additional_emails $dispemail2 " . $GLOBALS['I18N']->get('subscribed to the') . " $displists";
 }
 if ($foundBlacklisted) {
     $report .= '<br/>' . s('%d emails were found on the do-not-send-list and have not been added to the lists',

public_html/lists/admin/actions/import2.php

@@ -474,7 +474,7 @@
     if (empty($some) && !$count['list_add']) {
         $report .= '<br/>'.s('All the emails already exist in the database and are member of the lists');
     } else {
-        $report .= '<br/>'.s('%d emails succesfully imported to the database and added to %d lists.',
+        $report .= '<br/>'.s('%d emails successfully imported to the database and added to %d lists.',
                 $count['email_add'], $num_lists);
         $report .= '<br/>'.s('%d emails subscribed to the lists', $count['list_add']);
         if ($count['exist']) {

public_html/lists/admin/actions/msgstatus.php

@@ -92,7 +92,7 @@
     }
 
     //# if the plugins don't return anything do the speed calculation
-    //# otherwise just what the plugins retunr
+    //# otherwise just what the plugins return
     if (empty($pluginhtml)) {
         //# not sure this calculation is accurate
         //  $html .= $GLOBALS['I18N']->get('sent').': '.$totalsent.'<br/>';

public_html/lists/admin/actions/processqueue.php

@@ -382,7 +382,7 @@ function finish($flag, $message, $script_stage)
 
         // If plugins have not sent the report, send it the default way
         if (!$reportSent) {
-            $messageWithIntro = s('The following events occured while processing the message queue:')."\n".$message;
+            $messageWithIntro = s('The following events occurred while processing the message queue:')."\n".$message;
             $messageWithIntroAndFooter = $messageWithIntro."\n\n".s('To stop receiving these reports read:').' https://resources.phplist.com/system/config/send_queue_processing_report'."\n\n";
             sendReport($subject, $messageWithIntroAndFooter);
         }
@@ -1169,7 +1169,7 @@ function sendEmailTest($messageid, $email)
                     }
 
                     //############################
-                    // tried to send email , process succes / failure
+                    // tried to send email , process success / failure
                     if ($success) {
                         if (USE_DOMAIN_THROTTLE) {
                             ++$domainthrottle[$throttleDomain]['sent'];

public_html/lists/admin/attributes.php

@@ -162,7 +162,7 @@
                     $tables['attribute'], sql_escape(strip_tags($_POST['name'][$id])), sql_escape($_POST['type'][$id]),
                     $_POST['listorder'][$id], sql_escape($_POST['default'][$id]), $nRequired, $id);
                 Sql_Query($query);
-                // save keywordlib seperately in case the DB hasn't been upgraded
+                // save keywordlib separately in case the DB hasn't been upgraded
                 if ((defined('IN_WEBBLER') && IN_WEBBLER) || (defined('WEBBLER') && WEBBLER)) {
                     Sql_Query(sprintf('update ignore %s set keywordlib = %d where id = %d',
                         $GLOBALS['tables']['attribute'], $_POST['keywordlib'][$id], $id));

public_html/lists/admin/defaultconfig.php

@@ -321,7 +321,7 @@
         'category'    => 'subscription',
     ),
 
-    //0013076: Blacklisting posibility for unknown users
+    //0013076: Blacklisting possibility for unknown users
     // the location of your blacklist script:
     'blacklisturl' => array(
         'value'       => $GLOBALS['public_scheme']."://[WEBSITE]$pageroot/?p=donotsend",

public_html/lists/admin/defaultplugin.php

@@ -699,7 +699,7 @@ public function mimeWrap($messageid, $body, $header, $contenttype, $destination)
      *   messageid: message being sent
      *   uservalues: array of "attributename" => "attributevalue" of all user attributes
      *   email: email that this message is current set to go out to
-     * @returN email that it should go out to
+     * @return email that it should go out to
      */
     public function setFinalDestinationEmail($messageid, $uservalues, $email)
     {
@@ -743,7 +743,7 @@ public function parseFinalMessage($sendformat, $htmlmessage, $textmessage, &$mai
      *
      * @deprecated, no longer used since 3.2.4
      */
-    public function processSuccesFailure($messageid, $sendformat, $userdata, $success = true)
+    public function processSuccessFailure($messageid, $sendformat, $userdata, $success = true)
     {
     }
 
@@ -1123,7 +1123,7 @@ public function linkClick($msgtype, $fwdid, $messageid, $userid, $url)
     // Static functions to manage the collection of plugins
 
     /**
-     * see if a plugin is enabled, static method so it can be called even if existance of plugin is unknown.
+     * see if a plugin is enabled, static method so it can be called even if existence of plugin is unknown.
      */
     public static function isEnabled($pluginName)
     {

public_html/lists/admin/fckphplist.php

@@ -69,7 +69,7 @@ function doAttribute(combo)
     config.ImageBrowserWindowHeight = 480 ;
 
     config.ImageUpload = <?php echo $enable_image_upload ?> ;
-    // Page that effectivelly upload the image.
+    // Page that effectively upload the image.
     config.ImageUploadURL = config.BasePath + "../?page=fckphplist&amp;action=uploadimage" ;
     config.ImageUploadWindowWidth  = 600 ;
     config.ImageUploadWindowHeight  = 480 ;
@@ -687,7 +687,7 @@ function ok()
     FCKConfig.FlashDlgHideAdvanced = false ;
 
     // The following value defines which File Browser connector and Quick Upload
-    // "uploader" to use. It is valid for the default implementaion and it is here
+    // "uploader" to use. It is valid for the default implementation and it is here
     // just to make this configuration file cleaner.
     // It is not possible to change this value using an external file or even
     // inline when creating the editor instance. In that cases you must set the
@@ -1069,7 +1069,7 @@ function ok()
                 FCKConfig.JustifyClasses = [] ;
 
                 // The following value defines which File Browser connector and Quick Upload
-                // "uploader" to use. It is valid for the default implementaion and it is here
+                // "uploader" to use. It is valid for the default implementation and it is here
                 // just to make this configuration file cleaner.
                 // It is not possible to change this value using an external file or even
                 // inline when creating the editor instance. In that cases you must set the
@@ -1137,7 +1137,7 @@ function ok()
 
                 FCKConfig.SmileyPath = FCKConfig.BasePath + 'images/smiley/msn/' ;
                 FCKConfig.SmileyImages =
-                ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif']
+                ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tongue_smile.gif','embarrassed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif']
                 ;
                 FCKConfig.SmileyColumns = 8 ;
                 FCKConfig.SmileyWindowWidth = 320 ;

public_html/lists/admin/htaccess

@@ -1,5 +1,5 @@
 
-# if you want to use this, copy the followin
+# if you want to use this, copy the following
 # content to the file called .htaccess that already exists
 # in this directory and change the path. 
 # for more information: http://httpd.apache.org/docs/

public_html/lists/admin/import2.php

@@ -108,7 +108,7 @@
       }
     */
 
-    //# set notify to always "no". Confirmation should run through the first campaing
+    //# set notify to always "no". Confirmation should run through the first campaign
     $_POST['notify'] = 'no';
     if (!$_POST['notify'] && !$test_import) {
         Fatal_Error($GLOBALS['I18N']->get('Please choose whether to sign up immediately or to send a notification'));
@@ -285,7 +285,7 @@
                         );
                         array_push($used_systemattr, strtolower('grouptype_'.$type));
                     } else {
-                        //  print "COLUMMN $column = $i<br/>";
+                        //  print "COLUMN $column = $i<br/>";
                         $_SESSION['systemindex'][$column] = $i;
                         $_SESSION['import_attribute'][$column] = array(
                             'index'  => $i,

public_html/lists/admin/import3.php

@@ -514,7 +514,7 @@ function getBestVersion($emails)
         if (!$some && !$additional_emails) {
             echo '<br/>'.$GLOBALS['I18N']->get('All the emails already exist in the database and are members of the')." $displists.";
         } else {
-            echo "$count_email_add $dispemail ".$GLOBALS['I18N']->get('succesfully imported to the database and added to')." $num_lists $displists.<br/>$additional_emails $dispemail2 ".$GLOBALS['I18N']->get('subscribed to the')." $displists";
+            echo "$count_email_add $dispemail ".$GLOBALS['I18N']->get('successfully imported to the database and added to')." $num_lists $displists.<br/>$additional_emails $dispemail2 ".$GLOBALS['I18N']->get('subscribed to the')." $displists";
             if ($count_exist) {
                 echo "<br/>$count_exist ".$GLOBALS['I18N']->get('emails already existed in the database');
             }

public_html/lists/admin/importadmin.php

@@ -294,7 +294,7 @@
             echo '<br/>'.$GLOBALS['I18N']->get('All the administrators already exist in the database').'<br/>';
             echo $GLOBALS['I18N']->get('Information has been updated from the import').'<br/>';
         } else {
-            echo "$count_email_add $dispemail ".$GLOBALS['I18N']->get('succesfully imported to the database and added to the system.').'<br/>';
+            echo "$count_email_add $dispemail ".$GLOBALS['I18N']->get('successfully imported to the database and added to the system.').'<br/>';
         }
     } // end else
     echo PageLinkButton('importadmin', $GLOBALS['I18N']->get('Import some more administrators'));

public_html/lists/admin/inc/interfacelib.php

@@ -696,7 +696,7 @@ public function listingEnd()
     </div>
 </div><!--ENDOF .settings -->
 <div class="content">
-<p>This is a text description of this list decribing it in as much detail as required by the administartor that creates the list</p>
+<p>This is a text description of this list describing it in as much detail as required by the administrator that creates the list</p>
 </div><!--ENDOF .content -->
 
 */

public_html/lists/admin/inc/php_compat.php

@@ -17,7 +17,7 @@
     function hash_equals($known_string, $user_string)
     {
         if (func_num_args() !== 2) {
-            // handle wrong parameter count as the native implentation
+            // handle wrong parameter count as the native implementation
             trigger_error('hash_equals() expects exactly 2 parameters, '.func_num_args().' given', E_USER_WARNING);
 
             return null;
@@ -31,15 +31,15 @@ function hash_equals($known_string, $user_string)
         $user_string_type_error = 'hash_equals(): Expected user_string to be a string, '.gettype($user_string).' given'; // prepare wrong type error message now to reduce the impact of string concatenation and the gettype call
         if (is_string($user_string) !== true) {
             trigger_error($user_string_type_error, E_USER_WARNING);
-            // prevention of timing attacks might be still possible if we handle $user_string as a string of diffent length (the trigger_error() call increases the execution time a bit)
+            // prevention of timing attacks might be still possible if we handle $user_string as a string of different length (the trigger_error() call increases the execution time a bit)
             $user_string_len = strlen($user_string);
             $user_string_len = $known_string_len + 1;
         } else {
             $user_string_len = $known_string_len + 1;
             $user_string_len = strlen($user_string);
         }
         if ($known_string_len !== $user_string_len) {
-            $res = $known_string ^ $known_string; // use $known_string instead of $user_string to handle strings of diffrent length.
+            $res = $known_string ^ $known_string; // use $known_string instead of $user_string to handle strings of different length.
             $ret = 1; // set $ret to 1 to make sure false is returned
         } else {
             $res = $known_string ^ $user_string;

public_html/lists/admin/inc/unregister_globals.php

@@ -2,7 +2,7 @@
 
 /**
  * Turn register globals off, even if it's on
- * taken from Wordpress.
+ * taken from WordPress.
  *
  * @since 2.2.10
  */

public_html/lists/admin/init.php

@@ -207,8 +207,8 @@
     $bounce_unsubscribe_threshold = 3;
 }
 //# spelling mistake in earlier version, make sure to set it correctly
-if (!isset($bounce_unsubscribe_threshold) && isset($bounce_unsubscribe_treshold)) {
-    $bounce_unsubscribe_threshold = $bounce_unsubscribe_treshold;
+if (!isset($bounce_unsubscribe_threshold) && isset($bounce_unsubscribe_threshold)) {
+    $bounce_unsubscribe_threshold = $bounce_unsubscribe_threshold;
 }
 if (!isset($bounce_mailbox_purge)) {
     $bounce_mailbox_purge = true;

public_html/lists/admin/languages.php

@@ -524,7 +524,7 @@ public function get($text)
 
         // spelling mistake, retry with old spelling
         if ($text == 'over threshold, user marked unconfirmed' && empty($translation)) {
-            return $this->get('over treshold, user marked unconfirmed');
+            return $this->get('over threshold, user marked unconfirmed');
         }
         $translation = $this->getTranslation($text);
 
@@ -567,7 +567,7 @@ function getTranslationUpdates()
 
 function s($text)
 {
-    //# allow overloading with sprintf paramaters
+    //# allow overloading with sprintf parameters
     $translation = $GLOBALS['I18N']->get($text);
 
     if (func_num_args() > 1) {