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

560 Commits

Author SHA1 Message Date
Synchro
16a7dbefe3 Cleaner handling of last_reply, see #269 2014-08-25 20:32:29 +02:00
Synchro
2b7da567bc Don't load the autoloader automatically - not a class' job! 2014-08-25 20:31:37 +02:00
Marcus Bointon
a7d3e83b6d Merge pull request #269 from AnrDaemon/patch-2
SMTP::getLastReply() should be populated with last server reply…
2014-08-25 18:30:12 +02:00
AnrDaemon
d45a19f2b7 SMTP::getLastReply() should be populated with last server reply, no matter 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 

      if(!$inst->data($_message))
        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...
2014-08-24 05:50:58 +04:00
Synchro
accb157ab3 Add basic docs for extras classes, fixes #240 2014-08-13 11:33:26 +02:00
Synchro
fb331b0d1a Update docs generation script 2014-08-11 17:52:40 +02:00
Synchro
54c0357f06 PHPdocs
Consistent line breaks, tidier output in default debug output
2014-08-11 11:45:55 +02:00
Synchro
d6a63fc0ca Ignore vendor folder when generating docs 2014-08-11 11:44:44 +02:00
Synchro
9989207655 phpdoc cleanup in language files 2014-08-11 11:44:17 +02:00
Synchro
e6a20a6ada Cleanup 2014-08-11 10:56:14 +02:00
Marcus Bointon
428c981427 Merge pull request #264 from EionRobb/patch-1
Support images with data: uri's in HTML message
2014-08-11 10:52:32 +02:00
Synchro
9f265c5ae7 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2014-08-11 10:37:46 +02:00
Synchro
165cd475c7 Allow injection of a user-defined debug output method, fixes #260 2014-08-11 10:36:06 +02:00
Synchro
819b9cb60f Make edebug behave the same way in PHPMailer and SMTP classes - always output in UTF-8, see #263 2014-08-11 10:21:31 +02:00
Eion Robb
93444041f1 Support images with data: uri's in HTML message 2014-08-11 08:40:34 +12:00
Marcus Bointon
a666aea346 Merge pull request #262 from AnrDaemon/patch-1
Add indent for multiline server replies
2014-08-07 09:01:58 +02:00
AnrDaemon
4dc19b8f67 Add indent for multiline server replies
Add indent for multiline server replies when printing debug log to console.
2014-08-07 03:08:35 +04:00
Synchro
9a4646e261 Rename tval param to something more readable
Ensure port and timeout are set as integers
2014-08-05 11:59:50 +02:00
Synchro
ba5288126b Don't use object property for intermediate values of the wrong type 2014-08-05 11:54:14 +02:00
Synchro
0b34a1ad26 Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2014-08-05 09:20:58 +02:00
Synchro
45a4c294a3 Changelog 2014-08-05 09:20:01 +02:00
Synchro
92b72c25ef Changelog 2014-08-05 09:19:18 +02:00
Synchro
125e9a0f21 Use older PCRE pattern if using a troublesome lib version, fixes #41 and #261 2014-08-05 09:18:02 +02:00
Marcus Bointon
1522094b82 Merge pull request #255 from Nyholm/patch-1
Added PHP 5.6 and HHVM to travis.yml
2014-07-09 23:56:40 +02:00
Tobias Nyholm
78adc4766a Added PHP 5.6 and HHVM to travis.yml 2014-07-09 21:47:51 +02:00
Marcus Bointon
022382c9bf Merge pull request #245 from glensc/patch-1
use PHP_VERSION constant
2014-06-13 11:18:30 +02:00
Elan Ruusamäe
d4e8f4305a use PHP_VERSION constant
less shellcode, just use PHP_VERSION constant

http://www.php.net//manual/en/reserved.constants.php
2014-06-13 12:15:05 +03:00
Synchro
7c74d52837 Fall back to fsockopen if stream_socket_client is disabled, fixes #243 2014-06-13 09:43:29 +02:00
Synchro
6175e1f3ea More debug info about connection 2014-06-12 18:25:56 +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
ca71445fb2 Make tests check for config
Generate debug output during POP tests
Ignore errors during POP3 disconnect
Update PHPUnit dependency to 4.1 in composer
2014-06-05 16:58:17 +02:00
Synchro
6d5a4e93a2 Handle unconnected connection resource consistently 2014-06-05 15:21:04 +02:00
Synchro
b1cb86ae86 Handle unconnected connection resource consistently 2014-06-05 14:06:12 +02:00
Synchro
d89f8c22e2 Cleanup 2014-06-05 13:52:07 +02:00
Synchro
e4008971fb Refactor of error handling and debug output
Better property defaults, no need for constructor
Better default port handling
2014-06-05 03:11:24 +02:00
Synchro
a71a0d89d7 Cleanup 2014-06-05 02:24:10 +02:00
Synchro
42030efc14 Remove unnecessary TODOs 2014-06-05 02:01:41 +02:00
Synchro
e6787f48aa Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	class.phpmailer.php
2014-06-05 01:40:06 +02:00
Synchro
204ebb552f Code cleanup 2014-06-05 01:09:17 +02:00
Synchro
1bdf8ee14f Fix random typing of error property in SMTP class, fixes #242
Make use of $smtp_conn consistent for a resource (i.e. null when not set, not 0)
Make use of $helo_rply consistent
Don't need a constructor any more - property default are fine
2014-06-05 01:08:50 +02:00
Synchro
b25c8d1321 Scrutinizer changes
Make callbacks use consistent arg types
2014-06-05 00:19:31 +02:00
Marcus Bointon
d4cae8d3b1 Merge pull request #237 from a-x-/patch-0
Clean up
2014-06-03 19:37:50 +02:00
Synchro
ab923badb8 Changelog 2014-06-03 19:35:25 +02:00
Marcus Bointon
fad630207f Merge pull request #241 from tarekdj/master
Arabic translation update
2014-06-03 19:33:55 +02:00
Djebali Tarek
dd58263bf1 Improving some linguistic issues. 2014-06-03 11:56:21 +01:00
Djebali Tarek
d84635758b Arabic translation update 2014-06-03 11:34:31 +01:00
Inventorem
fd1b6e3b7f Fix http:// ... 2014-05-28 03:50:56 +04:00
Inventorem
099a4b0f9e Clean up 2014-05-28 03:50:30 +04:00
Synchro
245381c747 Changelog 2014-05-14 17:23:17 +02:00