Commit Graph

106 Commits

Author SHA1 Message Date
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