0
0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 01:52:15 +02:00
Commit Graph

168 Commits

Author SHA1 Message Date
Marcus Bointon
8414097b86
Use constants more consistently 2019-09-24 12:38:51 +02:00
Marcus Bointon
12c4f0a85a
Add more error checking to mailing list example 2019-07-30 18:26:19 +02:00
Oliver Smith
06a74eeea9 corrected 'imap_getmailboxes' comment to include third parameter (#1663) 2019-02-15 09:11:12 +01:00
Zdeněk Večeřa
3c90248c01 Update DKIM_sign.phps (#1521) 2018-10-30 08:40:02 +01:00
Marco Muths
5c9d3c5484 Add flag for using copiedHeaderFields and config for using extra headers in DKIM signature (#1468)
* Changed in DKIM signature

- Add flag for using copiedHeaderFields
- config for using extra headers in DKIM signature

* Cleanups after Review

- Don't use masked ampersands in url
- Remove test related artifacts after run

* Complete docs
2018-06-26 17:04:38 +02:00
Marcus Bointon
4fd6207768
Fix for #1361 2018-03-21 14:39:59 +01:00
dknacht
2a1dc5ce2e Update README.md (#1292)
* Update README.md

Added links to the recommended optional libraries.
Changed order of "Upgrading from 5.2" and "Legacy versions", i think this way is more logical to read.
Updated language quantity in the "Localization" section.

* Update README.md

Corrected review

* Update README.md

* Update phpmailer.lang-es.php

Added missing point to make grammatically correct and consistent with the other translations.
2018-01-15 11:42:49 +01:00
Marcus Bointon
95a68b6ca7
Remove duplicate require in SMTP example 2017-11-06 12:53:20 +01:00
Marcus Bointon
cff938462d
Can use __DIR__ now 2017-09-29 16:07:42 +02:00
Marcus Bointon
2c06e68d22
Can use __DIR__ now 2017-09-29 16:04:52 +02:00
Marcus Bointon
31493b6732
Big cleanup for Symfony coding style and php-cs-fixer, see #1148 2017-09-07 18:21:09 +02:00
Marcus Bointon
de3db41419
Casts & PHPDoc boolean -> bool, see http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration 2017-09-07 11:17:37 +02:00
Marcus Bointon
7a037c1eaa
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	README.md
#	examples/gmail.phps
#	src/SMTP.php
2017-08-28 12:15:27 +02:00
Niklas
ccdeae108a IMAP section in the Gmail example (#1117)
Add IMAP example into gmail example
2017-08-02 16:20:32 +02:00
Marcus Bointon
dbbc1397c4
Fix XSS vuln in example code: CVE-2017-11503 2017-07-26 20:02:31 +02:00
Marcus Bointon
c899ba203f
Remove code generator example - too messy! 2017-07-26 19:54:31 +02:00
Marcus Bointon
589b09fce5 Remove trailing commas 2017-06-29 21:54:09 +02:00
Marcus Bointon
1f9a66492a
Replace all uses of MD5 and SHA1 with SHA256
Use more secure method of generating IDs
2017-05-11 18:41:34 +02:00
Marcus Bointon
c33a3a7824
Merge remote-tracking branch 'remotes/origin/master' into 6.0
# Conflicts:
#	examples/gmail_xoauth.phps
#	src/PHPMailer.php
2017-04-13 12:31:40 +02:00
Haci Murat Yaman
1f974d0ab3 updated misleading comment on sample for smtp/google via xoauth2 #890 (#1019)
* updated misleading comment on sample code for smtp.google.com via xoauth2

* undo change on gitignore
2017-04-03 19:25:48 +02:00
Marcus Bointon
b18cb98131
Merge remote-tracking branch 'origin/master' 2017-01-09 10:33:47 +01:00
Marcus Bointon
8914ec7a4b
Merge branch 'master' into 6.0
# Conflicts:
#	VERSION
#	examples/contentsutf8.html
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
#	test/bootstrap.php
2017-01-06 23:34:57 +01:00
Marcus Bointon
6349f4cf06
Emoji in test content 2017-01-05 17:53:20 +01:00
Marcus Bointon
a39c742bd7
Example cleanup 2017-01-05 13:06:20 +01:00
Marcus Bointon
c6713cdbe2
Add simple contact form example 2017-01-05 13:05:53 +01:00
ka7
fa04e02c9a spelling fixes (#949) 2017-01-03 12:10:00 +01:00
corentinheadoo
66cf4fbaff Cleaning js (#858)
* Clean some js file

* Cleaning code
2016-10-17 18:17:18 +02:00
Marcus Bointon
1e53c07286 Minor fixes, code style 2016-08-31 10:26:06 +02:00
Marcus Bointon
593a0c586a Remove unneeded PHPDoc tags: @static, @access, @return void, @private
@link -> @see (PSR-5)
Always use `boolean`
2016-08-29 10:21:39 +02:00
Marcus Bointon
d188cdc2e3 Merge branch 'master' into 6.0 2016-07-06 09:31:40 +02:00
Bruno Ribeiro
39a2e3a620 fix warning (#761)
fix message <b>Warning</b>:  array_key_exists() expects parameter 2 to be array when is bad auth
2016-07-06 09:29:37 +02:00
Marcus Bointon
2acd2eff9c Update examples, add contact form example 2016-06-29 18:26:55 +02:00
Marcus Bointon
f5cea12dbd Improve DKIM examples 2016-06-06 14:33:29 +02:00
Marcus Bointon
78ef24e9f6 Merge branch 'master' into 6.0
# Conflicts:
#	.gitignore
#	VERSION
#	src/PHPMailer.php
#	src/POP3.php
#	src/SMTP.php
2016-06-06 14:23:33 +02:00
Marcus Bointon
1361047a5d Add DKIM example 2016-06-06 10:54:56 +02:00
Marcus Bointon
ec4c2ee867 Standardise on CRLF line breaks
Better auth mechanism selection
2016-05-23 10:30:31 +02:00
Marcus Bointon
384609cc83 Coding standards 2016-05-03 10:06:48 +02:00
Marcus Bointon
c2816d47cb Add DNS entry generator, fixes #644 2016-05-03 10:06:15 +02:00
Marcus Bointon
f7033d68b6 Remove obsolete QP-encode function
Improve & fix data URL handling
Remove old class loader from phpunit bootstrap
Improve test coverage
Remove some unnecessary trailing line breaks from attachment MIME structure
2016-05-02 18:27:44 +02:00
Marcus Bointon
da739aa763 Fix callback example 2016-05-01 17:06:51 +02:00
Marcus Bointon
d3eabffd0c Fix callback example 2016-05-01 17:06:20 +02:00
Marcus Bointon
efbcfa97c0 Callback cleanup, examples 2016-05-01 17:00:48 +02:00
Marcus Bointon
558bcdc269 DKIM cleanup, examples 2016-05-01 13:09:24 +02:00
Marcus Bointon
25ed54e97e Clean up documentation and examples 2016-04-26 22:22:52 +02:00
Marcus Bointon
84d6af5b95 Clean up documentation and examples 2016-04-26 22:16:17 +02:00
Marcus
f0ed47850c Sort out namespaces and imports in examples 2016-04-22 19:13:15 +02:00
Marcus
9741c04ed8 Improve gmail xoauth example 2016-04-19 17:12:33 +02:00
Marcus
78467895e5 Rely on default debug output setting 2016-04-19 17:08:56 +02:00
Marcus
fcecb5872b Add emoji to UTF-8 content 2016-04-19 17:05:58 +02:00
Marcus
86ea82969e Merge branch '5.4' into xoauth
# Conflicts:
#	get_oauth_token.php
#	src/OAuthProvider/Google.php
#	src/PHPMailerOAuth.php
2016-04-07 10:58:14 +02:00
Marcus
33f82ab517 Merge branch 'master' into 5.4
Bump version to 5.5
Clean up code generator
# Conflicts:
#	README.md
#	examples/send_file_upload.phps
#	src/SMTP.php
#	test/phpmailerTest.php
2016-04-07 10:52:37 +02:00
Marcus
27501ac7b9 Merge branch 'master' into 5.4
Bump version to 5.5
Clean up code generator
# Conflicts:
#	README.md
#	examples/send_file_upload.phps
#	src/SMTP.php
#	test/phpmailerTest.php
2016-04-07 10:51:05 +02:00
Marcus
177839e22f Fix fetching error messages, fixes #679 2016-04-07 09:24:49 +02:00
Marcus
05e43f3666 Don't use dynamic classnames in aliased namespaces, see #675
Increase PHP version req to 5.5 in composer.json
2016-04-06 20:18:34 +02:00
Marcus
739127f8e9 Code cleanup, see #675 2016-04-05 13:09:53 +02:00
Marcus
3a41f91fe2 Rearrangements for new XOAUTH approach, see #675 2016-04-05 12:13:39 +02:00
Sherryl George
94c7cf4d9e Xoauth
* Cleaner XOAUTH2 Implementation

* Update gmail_xoauth.phps
2016-04-05 11:53:49 +02:00
Marcus
0e992c63ff Improve SMTP check example 2016-03-29 10:28:12 +02:00
Marcus
f0a6839a05 Improve send file examples 2016-03-29 10:05:36 +02:00
Rishi Jash
0f53c79239 Add example of sending multiple files upload
Simple example for sending multiple files using PHPMailer
2016-03-29 13:09:24 +05:30
Synchro
8cf057efb7 More cleanup 2016-01-28 13:47:36 +01:00
Synchro
7bb65f288b Merge branch 'master' into xoauth 2016-01-07 20:38:58 +01:00
Synchro
feea6358c6 Merge branch '5.4' into xoauth
# Conflicts:
#	get_oauth_token.php
2015-11-10 13:48:39 +01:00
Synchro
14e8ef03eb Short array syntax 2015-11-10 13:45:13 +01:00
Synchro
466264810a Merge remote-tracking branch 'remotes/upstream/5.4' into xoauth
# Conflicts:
#	composer.json
#	composer.lock
#	examples/gmail_xoauth.phps
#	get_oauth_token.php
#	src/OAuthProvider/Google.php
#	src/PHPMailerOAuth.php
2015-11-10 10:25:37 +01:00
Synchro
9b3e13dc14 First draft of 5.4 2015-11-09 19:09:13 +01:00
Synchro
19fcea0556 Cleanup 2015-10-20 13:52:29 +02:00
Synchro
65244ee9dc Merge remote-tracking branch 'upstream/master' into xoauth
# Conflicts:
#	class.phpmaileroauth.php
#	class.phpmaileroauthgoogle.php
#	class.smtp.php
#	examples/gmail_xoauth.phps
#	get_oauth_token.php
2015-10-15 09:29:01 +02:00
François B
4532cec50d Improve some comments and minor improvements
- Define an $error_message and reuse it, instead of recreating the
error message 3 times
- Use in_array() check instead of a regex
2015-10-13 22:38:15 +02:00
François B
b87462979b Change line endings from CRLF to LF
All files in PHPMailer have LF line endings, except those two.
Harmonize line endings to LF for consistency.
2015-10-02 18:52:29 +02:00
Ravishanker Kusuma
c71721636e XOAuth Providers support Google,Yahoo,Microsoft
Added token expiry check
2015-09-24 15:22:48 +08:00
Synchro
b6f421c5ff Clean up 2015-09-22 08:16:40 +02:00
Nibbels
6672f36063 Update signed-mail.phps 2015-09-22 01:57:45 +02:00
Nibbels
b58021454c Update signed-mail.phps 2015-09-22 01:53:29 +02:00
François B
e1964ddce4 Make sure PHP default character encoding is UTF-8
Needed for htmlentities() call on line 173
2015-09-18 00:09:40 +02:00
François B
20112cc8fe Prefer setFrom() over separate From and FromName 2015-09-18 00:06:58 +02:00
Synchro
57d3d1fee6 Merge remote-tracking branch 'remotes/upstream/master' into xoauth 2015-08-25 17:12:33 +02:00
Wolfgang Jentner
b8fdec8fd5 Added an example file explaining how to send signed emails 2015-08-22 22:59:51 +02:00
Greg Rundlett
c1c20f203b Update gmail.phps
The internet is littered with people trying to figure out why PHPMailer doesn't work for them with GMail.  ISPs like Digital Ocean do not support SMTP traffic over IPv6, but Google is IPv6 ready so PHPMailer waits a long time trying that before it tries IPv4.  That wait is either a major bottleneck, or a failure point as execution timeouts come into play.
See https://www.digitalocean.com/community/questions/outgoing-connections-on-port-25-587-143-blocked-over-ipv6
and
https://stackoverflow.com/questions/20068484/phpmailer-using-gmail-smtp-slow-when-sending-emails for example
2015-07-17 12:58:51 -04:00
Synchro
916ba4b8ac Correct oauth property names 2015-06-03 08:48:39 +02:00
Synchro
d24a921e52 Changed AuthType name to 'XOAUTH2'
Tested, fixed examples
Improved token script
Code cleanup
2015-05-21 03:12:17 +02:00
Synchro
ed41c8310d Docs 2015-05-20 09:06:40 +02:00
Synchro
e874b2a14b Code cleanups 2015-05-19 17:36:29 +02:00
sherryl4george
b4cf92e843 XOAUTH Changes 2015-05-19 16:13:33 +02:00
Synchro
ab36b539a6 Expose stream context options 2015-04-27 21:18:12 +02:00
Synchro
50eac8739f Use multibyte text in tests
Add explicit test for UTF-8 with embedded images, see #279 and #377
Add ISO-8859-1 test
2015-03-25 19:22:55 +01:00
Synchro
cee5e9b442 Add example of sending a file upload 2014-12-24 10:40:13 +01:00
Synchro
851da29103 Remove stray license file 2014-12-17 16:07:19 +01:00
Synchro
127d26ef3c Remove 'advanced' html2text converter to resolve license clash, fixes #232
Allow injection of custom html2text converter, amend tests to cover it
Update README and related docs
2014-12-17 16:07:02 +01:00
Synchro
ba4ece8e5b Don't set WordWrap in readme example, add comments about usage including 78 as a good value to use, fixes #327 2014-12-06 14:36:15 +01:00
Synchro
a1258f90e5 Fix various typos, js MIME type, thanks to @fbonzon, fixes #296 2014-10-12 11:17:17 +02:00
Ricardo
bad4392df1 Second Smallest PR 2014-09-28 02:25:22 -03:00
David Prévot
8fc2c93272 Drop useless executable bit 2014-09-27 11:34:07 -04:00
Synchro
e8c61ada87 Add SMTP example
Simplify other code examples
2014-09-25 14:18:57 +02:00
Synchro
c2ab690546 Reorder code generation so it still works if an exception is thrown. 2014-08-31 20:02:47 +02:00
Synchro
6365f4d6fd PHPDoc cleanup - consistent naming of integer and boolean types 2014-06-06 09:45:38 +02:00
Synchro
608c301af9 PHPDoc cleanup - consistent naming of integer and boolean types 2014-06-06 08:01:56 +02:00
Synchro
e3314c44ed Fix body setting in list example 2014-04-24 14:39:33 +02:00
michaelkonecny
213bdd6de4 host declaration was there twice 2014-04-09 18:29:41 +02:00
amatosg
b0e2ccc855 Update gmail.phps
making it easier to read.
2014-04-04 16:00:44 -05:00