Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: chadmis/PHPMailer
head fork: Synchro/PHPMailer
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Aug 05, 2014
@Synchro Synchro Use older PCRE pattern if using a troublesome lib version, fixes #41
…and #261
@Synchro Synchro Changelog 92b72c2
@Synchro Synchro Changelog 45a4c29
@Synchro Synchro Merge branch 'master' of 0b34a1a
@Synchro Synchro Don't use object property for intermediate values of the wrong type ba52881
@Synchro Synchro Rename tval param to something more readable
Ensure port and timeout are set as integers
Commits on Aug 06, 2014
@AnrDaemon AnrDaemon Add indent for multiline server replies
Add indent for multiline server replies when printing debug log to console.
Commits on Aug 07, 2014
@Synchro Synchro Merge pull request #262 from AnrDaemon/patch-1
Add indent for multiline server replies
Commits on Aug 10, 2014
@EionRobb EionRobb Support images with data: uri's in HTML message 9344404
Commits on Aug 11, 2014
@Synchro Synchro Make edebug behave the same way in PHPMailer and SMTP classes - alway…
…s output in UTF-8, see #263
@Synchro Synchro Allow injection of a user-defined debug output method, fixes #260 165cd47
@Synchro Synchro Merge branch 'master' of 9f265c5
@Synchro Synchro Merge pull request #264 from EionRobb/patch-1
Support images with data: uri's in HTML message
@Synchro Synchro Cleanup e6a20a6
@Synchro Synchro phpdoc cleanup in language files 9989207
@Synchro Synchro Ignore vendor folder when generating docs d6a63fc
@Synchro Synchro PHPdocs
Consistent line breaks, tidier output in default debug output
@Synchro Synchro Update docs generation script fb331b0
Commits on Aug 13, 2014
@Synchro Synchro Add basic docs for extras classes, fixes #240 accb157
Commits on Aug 24, 2014
@AnrDaemon AnrDaemon SMTP::getLastReply() should be populated with last server reply, no m…
…atter what it was

The SMTP::getLastReply() result is not populated in case of server error.
Truth be said, it should, for consistency's sake at the very least.
But real reason is that writing something like 

        throw new Exception('DATA command unsuccessful. Last server reply: ' . $inst->getLastReply());

is an order of magnitude cleaner, than a tantric dance with array values (you have to turn SMTP::getError() method call into variable somewhere first, too!)…

One day, someone have to turn all this into proper exceptions...
Commits on Aug 25, 2014
@Synchro Synchro Merge pull request #269 from AnrDaemon/patch-2
SMTP::getLastReply() should be populated with last server reply…
@Synchro Synchro Don't load the autoloader automatically - not a class' job! 2b7da56
@Synchro Synchro Cleaner handling of last_reply, see #269 16a7dbe
@Synchro Synchro Changelog 244f22e
@Synchro Synchro Improve README 912f05c
@Synchro Synchro Fix typo 730cf0c
Commits on Aug 31, 2014
@Synchro Synchro Fix for encoding long content-disposition filenames 76bc29a
@Synchro Synchro Changelog ec1408d
@Synchro Synchro Reorder code generation so it still works if an exception is thrown. c2ab690
Commits on Sep 11, 2014
@Zodiac1978 Zodiac1978 Remove "hacked" from "hacked by Lance Rushing"
Remove "hacked" from "hacked by Lance Rushing", because it is a false positive for some malware scanner who check for the string "hacked by".
See also:
@Synchro Synchro Merge pull request #274 from Zodiac1978/patch-1
Remove "hacked" from "hacked by Lance Rushing"
Commits on Sep 25, 2014
@Synchro Synchro Add SMTP example
Simplify other code examples
@Synchro Synchro Overhaul SMTP class debug output handling 4755880
@Synchro Synchro Changelog 7c61be9
@Synchro Synchro 5.2.9 release b56c9b6
Commits on Sep 26, 2014
@Synchro Synchro Fix Changelog! 73b6167
Commits on Sep 27, 2014
David Prévot Drop useless executable bit 8fc2c93
@Synchro Synchro Merge pull request #285 from DavidPrevot/executable
Drop useless executable bit
Commits on Sep 28, 2014
@Rikk Rikk Second Smallest PR bad4392
@Synchro Synchro Merge pull request #286 from Rikk/patch-1
Remove extra parenthesis
Commits on Oct 01, 2014
@Synchro Synchro Add VERSION file, fixes #289 9a34593
Commits on Oct 10, 2014
@Synchro Synchro Fix timeout for RFC to match SMTP class default, see #293 34d35f3
Commits on Oct 12, 2014
@Synchro Synchro Fix various typos, js MIME type, thanks to @fbonzon, fixes #296 a1258f9
Commits on Oct 13, 2014
@Synchro Synchro Clean up MIME-type formatting, reorder 74bdf93
@Synchro Synchro Increase default timelimit to match RFC, make data command wait longe…
…r, see #293
Commits on Oct 15, 2014
@Synchro Synchro Changelog 8ca62ad
@Synchro Synchro Add wiki link 02af1ae
@Synchro Synchro Fix setDebugoutput type label 792b51f
@Synchro Synchro Permit shorter var names 0ba3549
@Synchro Synchro Allow some legacy coding practices since there's nothing we can do ab…
…out them
@Synchro Synchro Fix short var name for scrutinizer 09d40c4
Commits on Oct 23, 2014
@Synchro Synchro Merge pull request #302 from mirjalal/master
Azerbaijani translation
Commits on Oct 24, 2014
@mirjalal mirjalal Azerbaijani transilation 80169a4
Commits on Oct 31, 2014
@martinvd martinvd Dutch translation fix 3e0d299
@Synchro Synchro Merge pull request #305 from martinvd/patch-1
Dutch translation fix
Commits on Nov 03, 2014
@Synchro Synchro Avoid convoluted syntax
Use more robust comparisons, be more forgiving where it's not important
Don't assume temp file writing worked
Commits on Nov 06, 2014
@ceceprawiro ceceprawiro Indonesian translation 311c957
@Synchro Synchro Changelog df23c21
@Synchro Synchro Update scrutinizer config 479968f
@Synchro Synchro Update scrutinizer config 63a6397
@Synchro Synchro Update scrutinizer config 93e422e
@ceceprawiro ceceprawiro Indonesia translation a79adea
@Synchro Synchro Remove BOM from az language file 1594dcc
@Synchro Synchro Update scrutinizer config d066daa
@Synchro Synchro Avoid Debugoutput clash with built-in function names, fixes #308 d6acd1c
@Synchro Synchro Avoid Debugoutput clash with built-in function names, fixes #308 3535327
@Synchro Synchro Merge pull request #307 from ceceprawiro/master
Indonesian translation
@Synchro Synchro Changelog 6d67358
@Synchro Synchro Update README 85c7c6b
Commits on Nov 08, 2014
@heronman heronman SMTP extended error codes stored in $smtp->error 8d2961a
@heronman heronman Added HELO/EHLO reply parsing. Corresponding get methods: getServerEx…
…tensions(), getAuthAllowed(), getTLSAllowed()
@heronman heronman Auth method selection added, according to STMP extensions list 542c479
Commits on Nov 09, 2014
@heronman heronman A little bugfix 51b1fe2
@Synchro Synchro Update NTLM SASL lib
 This is still pretty old, bad code, and I think it's incomplete, and I don't have an NTLM system to test against. Should probably be removed.
@Synchro Synchro Fix SM image 740780d
Commits on Nov 10, 2014
@heronman heronman $helo_rply recovered. SMTP extension methods reconsidered (refer to c…
Commits on Nov 13, 2014
@Synchro Synchro Merge pull request #311 from heronman/master
A bugfix in SMTP::authenticate, plus some improvements
@Synchro Synchro Code cleanup e6f70f1
@Synchro Synchro Changelog 009538f
@Synchro Synchro Cleanup de5c035
Commits on Nov 21, 2014
@gergoe gergoe Fixing an issue with embedded images
Fixed the issue with html parsing when there was an embedded base64
encoded image in the source - which resulted in regexp errors (too long
@gergoe gergoe changed white spaces 76a67bc
@Synchro Synchro Merge pull request #319 from gergoe/master
Fixing an issue with embedded images
@hemmerich hemmerich Update class.smtp.php
Not all SMTP servers will provide a value for SIZE. This commit checks to be certain there is an element in the array before attempting to access it.
@hemmerich hemmerich Update class.smtp.php
Set the value to 0 if the fields array is empty
Commits on Nov 24, 2014
@Synchro Synchro Merge pull request #320 from hemmerich/patch-1
Update class.smtp.php
Commits on Dec 06, 2014
@Synchro Synchro Don't set WordWrap in readme example, add comments about usage includ…
…ing 78 as a good value to use, fixes #327
@Synchro Synchro Merge branch 'master' of 4a46a82
@Synchro Synchro Make tests a bit less verbose b7f1dd1
Commits on Dec 17, 2014
@Synchro Synchro Remove 'advanced' html2text converter to resolve license clash, fixes #…

Allow injection of custom html2text converter, amend tests to cover it
Update README and related docs
@Synchro Synchro Remove stray license file 851da29
Commits on Dec 22, 2014
@natoshi natoshi Removed duplicate line
The if statement would check if the DKIM_domain is empty two times.
@Synchro Synchro Merge pull request #333 from natoshi/patch-1
Removed duplicate line
Commits on Dec 24, 2014
@Synchro Synchro Add example of sending a file upload cee5e9b
@Synchro Synchro Merge branch 'master' of 548aa26
Commits on Dec 25, 2014
@alfupe alfupe Update phpmailer.lang-es.php
Edited in a more fluent Spanish
Commits on Dec 26, 2014
@Synchro Synchro Merge pull request #336 from alfupe/patch-1
Update phpmailer.lang-es.php
Commits on Dec 28, 2014
@jimjag jimjag updates for add't tests and PSR2 afa80c5
@jimjag jimjag typo on PSR2 dcf5bf6
Commits on Jan 02, 2015
@SDKiller SDKiller Fixed callable call
Otherwise in case of autoloading classes with `composer` -  `Call to undefined function` error 
(thow `var_dump(is_callable($advanced))` returns `true` !)
@Synchro Synchro Merge pull request #342 from SDKiller/patch-1
Fixed callable call
Commits on Jan 05, 2015
@Synchro Synchro Use autoloader ecce82a
Commits on Jan 09, 2015
@Synchro Synchro Reformat code to PSR-2 standard 65784d1
@Synchro Synchro Refactor and major cleanup of EasyPeasyICS, including a fix for #338 4309101
@Synchro Synchro Merge branch 'master' of 34b33d9
@Synchro Synchro Up PHPUnit dep to 4.3 7b66825
Commits on Jan 28, 2015
@Synchro Synchro Fix inappropriate checks in set(), make more reliable c00fdf7
Commits on Feb 02, 2015
@nawawi nawawi malaysian translation 9abd78e
@Synchro Synchro Merge pull request #352 from nawawi/master
malaysian translation
@Synchro Synchro Changelog 5862562
@Synchro Synchro Cleanup 80c6258
Commits on Feb 04, 2015
@mialy mialy Bulgarian translation 4989a9b
@Synchro Synchro Merge pull request #355 from mialy/bulgarian
Bulgarian translation
@Synchro Synchro Changelog 6fb0f62
Commits on Feb 17, 2015
@Synchro Synchro Add Armenian translation 40fa68e
Commits on Feb 25, 2015
@Synchro Synchro Add Slovene translation 7530ff8
Commits on Feb 26, 2015
@Synchro Synchro Make phpcs happier 2dc47a8
Commits on Mar 02, 2015
@TomasVotruba TomasVotruba travis: PHP 7.0 nightly added
+ syntax fix to 2 spaces
Commits on Mar 03, 2015
@Synchro Synchro Merge pull request #373 from TomasVotruba/patch-1
travis: PHP 7.0 nightly added
Commits on Mar 04, 2015
@Synchro Synchro Scrutinizer fix 19c0651
@Synchro Synchro Merge branch 'master' of 93c8cd0
@Synchro Synchro More efficient, more readable loops in wrapText
Add multibyte wordwrap test
phpDoc cleanup in tests
@Synchro Synchro changelog 073bf14
@Synchro Synchro changelog de664ae
@Synchro Synchro Clean up indenting ec9148b
Commits on Mar 05, 2015
@Synchro Synchro Avoid ternary statements
Use boolean values consistently for magic_quotes settings