diff --git a/.dotgitlab-ci.yml b/.dotgitlab-ci.yml index 5ab2c1e19..05d10ee71 100644 --- a/.dotgitlab-ci.yml +++ b/.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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3362d2d27..358b99247 100755 --- a/CONTRIBUTING.md +++ b/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: diff --git a/PEOPLE b/PEOPLE index 604b67356..cd04fef5b 100644 --- a/PEOPLE +++ b/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. diff --git a/TESTING.md b/TESTING.md index a84126de2..7ae34de9d 100644 --- a/TESTING.md +++ b/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 diff --git a/TODO b/TODO index 00ae182b2..90a8c6171 100644 --- a/TODO +++ b/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 diff --git a/bin/imgur-uploader.sh b/bin/imgur-uploader.sh index 7773334d3..6232efa9d 100755 --- a/bin/imgur-uploader.sh +++ b/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}" diff --git a/doc/README.bounces b/doc/README.bounces index da4e74d5c..c90990bc7 100644 --- a/doc/README.bounces +++ b/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 diff --git a/doc/README.usertables b/doc/README.usertables index faf97d882..d29bba8a6 100644 --- a/doc/README.usertables +++ b/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: diff --git a/public_html/lists/admin/actions/import1.php b/public_html/lists/admin/actions/import1.php index e73631edc..e187ad475 100644 --- a/public_html/lists/admin/actions/import1.php +++ b/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 .= '
' . s('All the emails already exist in the database.'); } else { - $report .= "
$count_email_add $dispemail " . s('succesfully imported to the database and added to') . " $num_lists $displists.
$additional_emails $dispemail2 " . $GLOBALS['I18N']->get('subscribed to the') . " $displists"; + $report .= "
$count_email_add $dispemail " . s('successfully imported to the database and added to') . " $num_lists $displists.
$additional_emails $dispemail2 " . $GLOBALS['I18N']->get('subscribed to the') . " $displists"; } if ($foundBlacklisted) { $report .= '
' . s('%d emails were found on the do-not-send-list and have not been added to the lists', diff --git a/public_html/lists/admin/actions/import2.php b/public_html/lists/admin/actions/import2.php index aa8ea0704..83afd0b58 100644 --- a/public_html/lists/admin/actions/import2.php +++ b/public_html/lists/admin/actions/import2.php @@ -474,7 +474,7 @@ if (empty($some) && !$count['list_add']) { $report .= '
'.s('All the emails already exist in the database and are member of the lists'); } else { - $report .= '
'.s('%d emails succesfully imported to the database and added to %d lists.', + $report .= '
'.s('%d emails successfully imported to the database and added to %d lists.', $count['email_add'], $num_lists); $report .= '
'.s('%d emails subscribed to the lists', $count['list_add']); if ($count['exist']) { diff --git a/public_html/lists/admin/actions/msgstatus.php b/public_html/lists/admin/actions/msgstatus.php index 9f962126c..138d6506a 100644 --- a/public_html/lists/admin/actions/msgstatus.php +++ b/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.'
'; diff --git a/public_html/lists/admin/actions/processqueue.php b/public_html/lists/admin/actions/processqueue.php index 645dd0e8f..2be4e8e98 100644 --- a/public_html/lists/admin/actions/processqueue.php +++ b/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']; diff --git a/public_html/lists/admin/attributes.php b/public_html/lists/admin/attributes.php index 6344740e5..a142540c4 100644 --- a/public_html/lists/admin/attributes.php +++ b/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)); diff --git a/public_html/lists/admin/defaultconfig.php b/public_html/lists/admin/defaultconfig.php index 3a6244cdc..2ca0b572e 100644 --- a/public_html/lists/admin/defaultconfig.php +++ b/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", diff --git a/public_html/lists/admin/defaultplugin.php b/public_html/lists/admin/defaultplugin.php index 2995b150a..d8fdb9a59 100644 --- a/public_html/lists/admin/defaultplugin.php +++ b/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) { diff --git a/public_html/lists/admin/fckphplist.php b/public_html/lists/admin/fckphplist.php index 0be153394..f8a0e04c1 100644 --- a/public_html/lists/admin/fckphplist.php +++ b/public_html/lists/admin/fckphplist.php @@ -69,7 +69,7 @@ function doAttribute(combo) config.ImageBrowserWindowHeight = 480 ; config.ImageUpload = ; - // Page that effectivelly upload the image. + // Page that effectively upload the image. config.ImageUploadURL = config.BasePath + "../?page=fckphplist&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 ; diff --git a/public_html/lists/admin/htaccess b/public_html/lists/admin/htaccess index 38c89eab2..929fd7620 100644 --- a/public_html/lists/admin/htaccess +++ b/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/ diff --git a/public_html/lists/admin/import2.php b/public_html/lists/admin/import2.php index f5d5ccd21..4ae92b90e 100644 --- a/public_html/lists/admin/import2.php +++ b/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
"; + // print "COLUMN $column = $i
"; $_SESSION['systemindex'][$column] = $i; $_SESSION['import_attribute'][$column] = array( 'index' => $i, diff --git a/public_html/lists/admin/import3.php b/public_html/lists/admin/import3.php index 3efa873ba..8c2c39e23 100644 --- a/public_html/lists/admin/import3.php +++ b/public_html/lists/admin/import3.php @@ -514,7 +514,7 @@ function getBestVersion($emails) if (!$some && !$additional_emails) { echo '
'.$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.
$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.
$additional_emails $dispemail2 ".$GLOBALS['I18N']->get('subscribed to the')." $displists"; if ($count_exist) { echo "
$count_exist ".$GLOBALS['I18N']->get('emails already existed in the database'); } diff --git a/public_html/lists/admin/importadmin.php b/public_html/lists/admin/importadmin.php index 38613f328..c83fde24d 100644 --- a/public_html/lists/admin/importadmin.php +++ b/public_html/lists/admin/importadmin.php @@ -294,7 +294,7 @@ echo '
'.$GLOBALS['I18N']->get('All the administrators already exist in the database').'
'; echo $GLOBALS['I18N']->get('Information has been updated from the import').'
'; } else { - echo "$count_email_add $dispemail ".$GLOBALS['I18N']->get('succesfully imported to the database and added to the system.').'
'; + echo "$count_email_add $dispemail ".$GLOBALS['I18N']->get('successfully imported to the database and added to the system.').'
'; } } // end else echo PageLinkButton('importadmin', $GLOBALS['I18N']->get('Import some more administrators')); diff --git a/public_html/lists/admin/inc/interfacelib.php b/public_html/lists/admin/inc/interfacelib.php index 085708070..64193794a 100644 --- a/public_html/lists/admin/inc/interfacelib.php +++ b/public_html/lists/admin/inc/interfacelib.php @@ -696,7 +696,7 @@ public function listingEnd()
-

This is a text description of this list decribing it in as much detail as required by the administartor that creates the list

+

This is a text description of this list describing it in as much detail as required by the administrator that creates the list

*/ diff --git a/public_html/lists/admin/inc/php_compat.php b/public_html/lists/admin/inc/php_compat.php index 9f25c7642..2bb057701 100644 --- a/public_html/lists/admin/inc/php_compat.php +++ b/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,7 +31,7 @@ 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 { @@ -39,7 +39,7 @@ function hash_equals($known_string, $user_string) $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; diff --git a/public_html/lists/admin/inc/unregister_globals.php b/public_html/lists/admin/inc/unregister_globals.php index f2f40a1b0..d19669a24 100644 --- a/public_html/lists/admin/inc/unregister_globals.php +++ b/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 */ diff --git a/public_html/lists/admin/init.php b/public_html/lists/admin/init.php index 21263da4b..fd01253c9 100644 --- a/public_html/lists/admin/init.php +++ b/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; diff --git a/public_html/lists/admin/languages.php b/public_html/lists/admin/languages.php index 6782a5f21..2bd4d41bb 100644 --- a/public_html/lists/admin/languages.php +++ b/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) { diff --git a/public_html/lists/admin/lib.php b/public_html/lists/admin/lib.php index b4236ef0c..56de1c5e2 100644 --- a/public_html/lists/admin/lib.php +++ b/public_html/lists/admin/lib.php @@ -2,7 +2,7 @@ require_once dirname(__FILE__).'/accesscheck.php'; // library used for plugging into the webbler, instead of "connect" -// depricated and should be removed +// deprecated and should be removed include_once dirname(__FILE__).'/class.phplistmailer.php'; $domain = getConfig('domain'); @@ -280,7 +280,7 @@ function loadMessageData($msgid) } } - // Load lists that were targetted with message... + // Load lists that were targeted with message... $result = Sql_Query(sprintf('select list.name,list.id from ' .$GLOBALS['tables']['listmessage'].' listmessage,'.$GLOBALS['tables']['list'].' list where listmessage.messageid = %d and listmessage.listid = list.id', $msgid)); @@ -775,7 +775,7 @@ function previewTemplate($id, $adminid = 0, $text = '', $footer = '') $template = str_ireplace('[SUBJECT]', s('This is the Newsletter Subject'), $template); $template = str_ireplace('[UNSUBSCRIBE]', sprintf('%s', getConfig('unsubscribeurl'), $GLOBALS['strThisLink']), $template); - //0013076: Blacklisting posibility for unknown users + //0013076: Blacklisting possibility for unknown users $template = str_ireplace('[BLACKLIST]', sprintf('%s', getConfig('blacklisturl'), $GLOBALS['strThisLink']), $template); $template = str_ireplace('[PREFERENCES]', @@ -1971,7 +1971,7 @@ function shortenText($text, $max = 30) /* * shortenTextDisplay * - * mostly used for columns in listings to retrict the width, particularly on mobile devices + * mostly used for columns in listings to restrict the width, particularly on mobile devices * it will show the full text as the title tip but restrict the size of the output * */ diff --git a/public_html/lists/admin/list.php b/public_html/lists/admin/list.php index 1523a3b9d..905d3e972 100644 --- a/public_html/lists/admin/list.php +++ b/public_html/lists/admin/list.php @@ -217,7 +217,7 @@ function listMemberCounts($listId) $ls->addRow($element, '', ''.PageLinkButton('send&new=1&list=all', - s('send'), '', '', s('start a new campaign targetting all lists')).''. + s('send'), '', '', s('start a new campaign targeting all lists')).''. ''.PageLink2('import', s('Add Members')).'', '', '', 'actions nodrag'); $some = 1; } @@ -278,7 +278,7 @@ function listMemberCounts($listId) $ls->addRow($element, '', ''.''.PageLinkButton('send&new=1&list='.$row['id'], s('send'), '', '', - s('start a new campaign targetting this list')).''. + s('start a new campaign targeting this list')).''. ''.PageLinkDialogOnly('importsimple&list='.$row['id'], s('Add Members')).''. ''.$deletebutton->show().'', '', '', 'actions nodrag'); diff --git a/public_html/lists/admin/login.php b/public_html/lists/admin/login.php index 6affa9e85..9132172d4 100644 --- a/public_html/lists/admin/login.php +++ b/public_html/lists/admin/login.php @@ -73,7 +73,7 @@ function deleteOldTokens() $GLOBALS['tables']['admin'], encryptPass($p1), $admin); //# print $SQLquery; $query = Sql_Query($SQLquery); - echo $GLOBALS['I18N']->get('Your password was changed succesfully').'
'; + echo $GLOBALS['I18N']->get('Your password was changed successfully').'
'; echo '

'.$GLOBALS['I18N']->get('Continue').'

'; //Token deletion. $SQLquery = sprintf('delete from %s where admin = %d;', $GLOBALS['tables']['admin_password_request'], $adminId); diff --git a/public_html/lists/admin/messages.php b/public_html/lists/admin/messages.php index 4ffb2262f..3f90402f8 100644 --- a/public_html/lists/admin/messages.php +++ b/public_html/lists/admin/messages.php @@ -546,7 +546,7 @@ //$colspan-1,$GLOBALS['I18N']->get("Bounced"),$msg["bouncecount"]); //} - // Calculcate sent statistics for printing + // Calculate sent statistics for printing $sentStats = array( 'grandTotal' => $msg['astext'] + $msg['ashtml'] + $msg['astextandhtml'] + $msg['aspdf'] + $msg['astextandpdf'] , 'text' => $msg['astext'] diff --git a/public_html/lists/admin/onyxrss/TODO b/public_html/lists/admin/onyxrss/TODO index f60024538..1c989e16d 100644 --- a/public_html/lists/admin/onyxrss/TODO +++ b/public_html/lists/admin/onyxrss/TODO @@ -5,6 +5,6 @@ 2.) Make a general set function for variables that can replace the four set functions. This function should take an array - or the variables seperately. + or the variables separately. 3.) Feed validation option prior to parsing. \ No newline at end of file diff --git a/public_html/lists/admin/plugins.php b/public_html/lists/admin/plugins.php index 10a83cf71..7aa873090 100644 --- a/public_html/lists/admin/plugins.php +++ b/public_html/lists/admin/plugins.php @@ -66,7 +66,7 @@ $zip = new ZipArchive(); if (!empty($filename) && $zip->open($GLOBALS['tmpdir'].'/phpListPlugin-'.$filename) === true) { - /* the zip may have a variety of directory structures, as Github seems to add at least one for the "branch" of + /* the zip may have a variety of directory structures, as GitHub seems to add at least one for the "branch" of * the project and then the developer has some more. * We look for a directory called "plugins" and place it's contents in the plugins folder. */ diff --git a/public_html/lists/admin/readtestmail.php b/public_html/lists/admin/readtestmail.php index a0ca03ed3..f9b484c04 100644 --- a/public_html/lists/admin/readtestmail.php +++ b/public_html/lists/admin/readtestmail.php @@ -3,7 +3,7 @@ require_once dirname(__FILE__).'/accesscheck.php'; //####################################################################### -// Reads mail from a test account that will recieve all sent mail. +// Reads mail from a test account that will receive all sent mail. // Use developer_email to send all mail to one account. // Use test_email settings to pop this box. // This file shows the links from the first email foun d for a selected user. diff --git a/public_html/lists/admin/send_core.php b/public_html/lists/admin/send_core.php index 012fa2cd7..3adf705c1 100644 --- a/public_html/lists/admin/send_core.php +++ b/public_html/lists/admin/send_core.php @@ -10,7 +10,7 @@ $forwardsubject = $forwardmessage = $forwardfooter = ''; $placeinqueue = ''; $sendtestresult = ''; -$duplicate_atribute = 0; // not actually used it seems @@@ check +$duplicate_attribute = 0; // not actually used it seems @@@ check $embargo = new date('embargo'); $embargo->useTime = true; $repeatuntil = new date('repeatuntil'); @@ -234,7 +234,7 @@ ) ); - //# do this seperately, so that the above query doesn't fail when the DB hasn't been upgraded + //# do this separately, so that the above query doesn't fail when the DB hasn't been upgraded $result = Sql_Query( sprintf('update %s set requeueinterval = "%s", requeueuntil = "%s" where id = %d', $tables['message'], $messagedata['requeueinterval'], sprintf('%04d-%02d-%02d %02d:%02d', @@ -318,7 +318,7 @@ // do a final check if (filesize($GLOBALS['attachment_repository'].'/'.$newfile)) { - echo Info(s('Attachment %d succesfully added', $att_cnt)); + echo Info(s('Attachment %d successfully added', $att_cnt)); } else { echo Info(s('Adding attachment %d failed', $att_cnt)); } @@ -360,7 +360,7 @@ // If we're sending the message, just return now to the calling script // we only need to check that everything is there, once we actually want to send - if ($send && !empty($messagedata['subject']) && !empty($messagedata['fromfield']) && !empty($messagedata['message']) && empty($duplicate_atribute) && count($messagedata['targetlist'])) { + if ($send && !empty($messagedata['subject']) && !empty($messagedata['fromfield']) && !empty($messagedata['message']) && empty($duplicate_attribute) && count($messagedata['targetlist'])) { if ($messagedata['status'] == 'submitted') { //#16615, check that "send until" is in after the embargo and warn if it isn't @@ -1121,7 +1121,7 @@ } $send_content .= ''; - //# the button to actually send the campagin + //# the button to actually send the campaign $send_content .= $placeinqueue; echo '
'; diff --git a/public_html/lists/admin/sendemaillib.php b/public_html/lists/admin/sendemaillib.php index 587570aaf..d9584696e 100644 --- a/public_html/lists/admin/sendemaillib.php +++ b/public_html/lists/admin/sendemaillib.php @@ -175,7 +175,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array() $text['unsubscribeurl'] = sprintf('%s%suid=%s', $url, $sep, $hash); $text['jumpoffurl'] = sprintf('%s%suid=%s&jo=1', $url, $sep, $hash); - //0013076: Blacklisting posibility for unknown users + //0013076: Blacklisting possibility for unknown users $url = getConfig('blacklisturl'); $sep = strpos($url, '?') === false ? '?' : '&'; $html['blacklist'] = sprintf('%s', $url, htmlspecialchars($sep), $email, @@ -401,7 +401,7 @@ function sendEmail($messageid, $email, $hash, $htmlpref = 0, $rssitems = array() } } - //# the text message has to be parsed seperately, because the line might wrap if the text for the link is long, so the match text is different + //# the text message has to be parsed separately, because the line might wrap if the text for the link is long, so the match text is different while (preg_match('/\[FORWARD:([^\]]+)\]/Uxm', $textmessage, $regs)) { $newforward = $regs[1]; $matchtext = $regs[0]; diff --git a/public_html/lists/admin/ui/default/css/style.css b/public_html/lists/admin/ui/default/css/style.css index f8db55c35..a5871746e 100644 --- a/public_html/lists/admin/ui/default/css/style.css +++ b/public_html/lists/admin/ui/default/css/style.css @@ -537,7 +537,7 @@ table.messagesendstats { float:right; margin-right:10px} body.message table.messageView td img { max-width:100% !important;height:auto !important} /* HIDE TABLES IN DESIGN EMAILS WHEN WIDTH EXCEED VIEW CAMPAIGN TABLE WIDTH */ body.message div.panel .content{ overflow:hidden} -/* REMOVE BACKGROUND COLOR ON TABLES inside MAILINGS DESING */ +/* REMOVE BACKGROUND COLOR ON TABLES inside MAILINGS DESIGN */ body.message div.panel table.messageView table{ background-color:transparent} /* user page */ diff --git a/public_html/lists/admin/ui/default/images/16x16/attibutes.png b/public_html/lists/admin/ui/default/images/16x16/attributes.png similarity index 100% rename from public_html/lists/admin/ui/default/images/16x16/attibutes.png rename to public_html/lists/admin/ui/default/images/16x16/attributes.png diff --git a/public_html/lists/admin/ui/default/images/32x32/attibutes.png b/public_html/lists/admin/ui/default/images/32x32/attributes.png similarity index 100% rename from public_html/lists/admin/ui/default/images/32x32/attibutes.png rename to public_html/lists/admin/ui/default/images/32x32/attributes.png diff --git a/public_html/lists/admin/ui/default/js/jquery.tablednd.js b/public_html/lists/admin/ui/default/js/jquery.tablednd.js index 8eb2cf0ac..51fc23f36 100644 --- a/public_html/lists/admin/ui/default/js/jquery.tablednd.js +++ b/public_html/lists/admin/ui/default/js/jquery.tablednd.js @@ -62,7 +62,7 @@ * called from anywhere and isn't dependent on the currentTable being set up correctly before calling * * Known problems: - * - Auto-scoll has some problems with IE7 (it scrolls even when it shouldn't), work-around: set scrollAmount to 0 + * - Auto-scroll has some problems with IE7 (it scrolls even when it shouldn't), work-around: set scrollAmount to 0 * * Version 0.2: 2008-02-20 First public version * Version 0.3: 2008-02-07 Added onDragStart option @@ -363,7 +363,7 @@ window.jQuery.tableDnD = { && window.scrollBy(0, config.scrollAmount); }, - moveVerticle: function (moving, currentRow) { + moveVertical: function (moving, currentRow) { if (0 != moving.vertical // If we're over a row then move the dragged row to there so that the user sees the @@ -435,7 +435,7 @@ window.jQuery.tableDnD = { currentRow = $.tableDnD.findDropTargetRow(dragObj, y); moving = $.tableDnD.findDragDirection(x, y); - $.tableDnD.moveVerticle(moving, currentRow); + $.tableDnD.moveVertical(moving, currentRow); $.tableDnD.moveHorizontal(moving, currentRow); return false; diff --git a/public_html/lists/admin/ui/default/js/phplist.js b/public_html/lists/admin/ui/default/js/phplist.js index b2663f7b4..b08081f65 100644 --- a/public_html/lists/admin/ui/default/js/phplist.js +++ b/public_html/lists/admin/ui/default/js/phplist.js @@ -132,7 +132,7 @@ $(document).ready(function() { var rows = table.tBodies[0].rows; var id = $(row).attr("data-row-position"); // current row - // rebuid ids + // rebuild ids $( "tr.rows" ).each(function( index ) { var newIndex = index + 0; $(this).attr('data-row-position',newIndex); diff --git a/public_html/lists/admin/ui/default/pages/design.php b/public_html/lists/admin/ui/default/pages/design.php index f0b0ca4c8..f592bc013 100644 --- a/public_html/lists/admin/ui/default/pages/design.php +++ b/public_html/lists/admin/ui/default/pages/design.php @@ -127,7 +127,7 @@
The footer of the panel

-

You can add inside the .content div of the panel all kind of information elemnts, like tables, forms, tabs, accordions, etc.

+

You can add inside the .content div of the panel all kind of information elements, like tables, forms, tabs, accordions, etc.



@@ -139,7 +139,7 @@ BACK TO TOP

Show & Hide

-

Thare are 3 items in this list below. You can modify your browser window size to see the effect.

+

There are 3 items in this list below. You can modify your browser window size to see the effect.