Skip to content

Commit 366e5dd

Browse files
bramleysuelaP
authored andcommitted
Upgrade to PHPMailer 6.1.5
1 parent 4fd2863 commit 366e5dd

File tree

8 files changed

+164
-105
lines changed

8 files changed

+164
-105
lines changed

public_html/lists/admin/PHPMailer6/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ try {
102102
$mail->SMTPAuth = true; // Enable SMTP authentication
103103
$mail->Username = '[email protected]'; // SMTP username
104104
$mail->Password = 'secret'; // SMTP password
105-
$mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS; // Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` also accepted
106-
$mail->Port = 587; // TCP port to connect to
105+
$mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS; // Enable TLS encryption; `PHPMailer::ENCRYPTION_SMTPS` encouraged
106+
$mail->Port = 587; // TCP port to connect to, use 465 for `PHPMailer::ENCRYPTION_SMTPS` above
107107

108108
//Recipients
109109
$mail->setFrom('[email protected]', 'Mailer');
@@ -155,7 +155,7 @@ Note that in order to reduce PHPMailer's deployed code footprint, the examples a
155155

156156
Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/).
157157

158-
You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/phpmailerTest.php) a good source of how to do various operations such as encryption.
158+
You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good source of how to do various operations such as encryption.
159159

160160
If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
161161

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.1.1
1+
6.1.5

public_html/lists/admin/PHPMailer6/composer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@
2626
},
2727
"require-dev": {
2828
"friendsofphp/php-cs-fixer": "^2.2",
29-
"phpdocumentor/phpdocumentor": "2.*",
3029
"phpunit/phpunit": "^4.8 || ^5.7",
31-
"zendframework/zend-serializer": "2.7.*",
32-
"doctrine/annotations": "1.2.*",
33-
"zendframework/zend-eventmanager": "3.0.*",
34-
"zendframework/zend-i18n": "2.7.3"
30+
"doctrine/annotations": "^1.2"
3531
},
3632
"suggest": {
3733
"psr/log": "For optional PSR-3 debug logging",

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-da.php

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,27 @@
22
/**
33
* Danish PHPMailer language file: refer to English translation for definitive list
44
* @package PHPMailer
5-
* @author Mikael Stokkebro <[email protected]>
5+
* @author John Sebastian <[email protected]>
6+
* Rewrite and extension of the work by Mikael Stokkebro <[email protected]>
7+
*
68
*/
79

8-
$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Kunne ikke logge på.';
9-
$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.';
10-
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data kunne ikke accepteres.';
11-
//$PHPMAILER_LANG['empty_message'] = 'Message body empty';
10+
$PHPMAILER_LANG['authenticate'] = 'SMTP fejl: Login mislykkedes.';
11+
$PHPMAILER_LANG['connect_host'] = 'SMTP fejl: Forbindelse til SMTP serveren kunne ikke oprettes.';
12+
$PHPMAILER_LANG['data_not_accepted'] = 'SMTP fejl: Data blev ikke accepteret.';
13+
$PHPMAILER_LANG['empty_message'] = 'Meddelelsen er uden indhold';
1214
$PHPMAILER_LANG['encoding'] = 'Ukendt encode-format: ';
13-
$PHPMAILER_LANG['execute'] = 'Kunne ikke køre: ';
14-
$PHPMAILER_LANG['file_access'] = 'Ingen adgang til fil: ';
15+
$PHPMAILER_LANG['execute'] = 'Kunne ikke afvikle: ';
16+
$PHPMAILER_LANG['file_access'] = 'Kunne ikke tilgå filen: ';
1517
$PHPMAILER_LANG['file_open'] = 'Fil fejl: Kunne ikke åbne filen: ';
1618
$PHPMAILER_LANG['from_failed'] = 'Følgende afsenderadresse er forkert: ';
17-
$PHPMAILER_LANG['instantiate'] = 'Kunne ikke initialisere email funktionen.';
18-
//$PHPMAILER_LANG['invalid_address'] = 'Invalid address: ';
19+
$PHPMAILER_LANG['instantiate'] = 'Email funktionen kunne ikke initialiseres.';
20+
$PHPMAILER_LANG['invalid_address'] = 'Udgyldig adresse: ';
1921
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
20-
$PHPMAILER_LANG['provide_address'] = 'Du skal indtaste mindst en modtagers emailadresse.';
22+
$PHPMAILER_LANG['provide_address'] = 'Indtast mindst en modtagers email adresse.';
2123
$PHPMAILER_LANG['recipients_failed'] = 'SMTP fejl: Følgende modtagere er forkerte: ';
22-
//$PHPMAILER_LANG['signing'] = 'Signing Error: ';
23-
//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
24-
//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';
25-
//$PHPMAILER_LANG['variable_set'] = 'Cannot set or reset variable: ';
26-
//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: ';
24+
$PHPMAILER_LANG['signing'] = 'Signeringsfejl: ';
25+
$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() fejlede.';
26+
$PHPMAILER_LANG['smtp_error'] = 'SMTP server fejl: ';
27+
$PHPMAILER_LANG['variable_set'] = 'Kunne ikke definere eller nulstille variablen: ';
28+
$PHPMAILER_LANG['extension_missing'] = 'Udvidelse mangler: ';

public_html/lists/admin/PHPMailer6/language/phpmailer.lang-nl.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
$PHPMAILER_LANG['from_failed'] = 'Het volgende afzendersadres is mislukt: ';
1717
$PHPMAILER_LANG['instantiate'] = 'Kon mailfunctie niet initialiseren.';
1818
$PHPMAILER_LANG['invalid_address'] = 'Ongeldig adres: ';
19+
$PHPMAILER_LANG['invalid_hostentry'] = 'Ongeldige hostentry: ';
20+
$PHPMAILER_LANG['invalid_host'] = 'Ongeldige host: ';
1921
$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
2022
$PHPMAILER_LANG['provide_address'] = 'Er moet minstens één ontvanger worden opgegeven.';
2123
$PHPMAILER_LANG['recipients_failed'] = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';

0 commit comments

Comments
 (0)