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

123 Commits

Author SHA1 Message Date
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
Synchro
86994962e3 Make text in logo image more readable 2014-04-03 12:25:08 +02:00
Marton Tasnadi
2e7b440784 HTML5 meta charset 2014-03-29 20:08:22 +01:00
Synchro
943e0bd529 New graphics 2014-03-10 16:25:31 +01:00
Synchro
73093a32a3 Add fake pop server and POP-before-SMTP tests.
Update POP before SMTP example to use new static method.
2013-08-02 16:19:01 +02:00
Synchro
d992ae6dc4 Centralise check for debug output
PSR-2 reformat

Enable debug output for failing test

Fix broken test
Comment clearout

Proper thin spaces before French punctuation

Fix phpdocs for addrAppend and addrFormat, fixes #81
Minor code cleanup, remove some local vars

See changelog.

More phpdoc cleanup
2013-07-30 12:51:15 +02:00
Synchro
d852751809 Fix wrong filename for image file - thanks to @mauglee 2013-06-06 17:27:12 +02:00
Marcus Bointon
019499efc3 Convert line breaks to CRLF in MsgHTML, closes #52
Fix double suffix on image cids, see #50
Remove unneeded test files, re-use example content for tests
Remove reference to phpmailer-lite
Ignore .idea folder
2013-05-01 10:20:10 +02:00
Synchro
4b255188db HTML5 doctype 2013-04-27 13:46:06 +02:00
Synchro
6e5e55bace Add advice on mail testing, links to testing tools 2013-04-27 13:45:01 +02:00
Synchro
ff8718f722 Major overhaul and cleanup of example code
Update test_script to use some recently changed features, rename to code_generator
Generated code actually works!
Update SyntaxHighlighter
New PHPMailer graphic
2013-04-26 18:22:45 +02:00
mattsturdy
e94a9b3156 Update examples/test_smtp_gmail_advanced.php 2013-02-27 20:55:02 -03:00
mattsturdy
ea60bd844a Update examples/test_smtp_gmail_basic.php
update to use RFC 2606 email addresses
2013-02-27 20:54:03 -03:00
mattsturdy
2f7b3ec0f5 Update examples/test_smtp_gmail_advanced.php
updated to use RFC 2606 emails
2013-02-27 20:52:16 -03:00
matt sturdy
a7cfc81b68 Updated example/*gmail* scripts to use TLS and port 587. Simplified test_scripts/index.php, new style, required fields and added option to form for setting TLS/SSL with SMTP 2013-02-27 09:30:29 -03:00
Synchro
6f919df65e Import 5.2.2rc2 from Google Code
Major cleanup of PHPDocs
Test suite works again
2012-11-21 16:12:07 +01:00
Marcus Bointon
cca7fc22fb Import PHPMailer 5.2.0 from apache project 2011-08-23 10:20:10 +02:00
Marcus Bointon
8d4fc6d507 Merge in changes from the 5.0-dev branch 2009-05-05 11:22:26 +00:00
Marcus Bointon
fb07adf194 Fix wrong folder nesting 2008-11-11 15:34:07 +00:00