Update PHPMailer 5.2.2 to 5.2.14.
This commit is contained in:
markjcrane
parent
0a973bfd34
commit
fddef99e40
|
|
@ -1,4 +1,4 @@
|
|||
PHPMailer License License
|
||||
PHPMailer License
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
|
|
|
|||
|
|
@ -1,475 +1,623 @@
|
|||
ChangeLog
|
||||
# ChangeLog
|
||||
|
||||
NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6.
|
||||
IT WILL NOT WORK WITH PHP4.
|
||||
* Fix gmail XOAUTH2 scope, thanks to @sherryl4george
|
||||
* Fix extra line break in getSentMIMEMessage()
|
||||
|
||||
Version 5.2.2 (December 3, 2012)
|
||||
* Some fixes and syncs from https://github.com/Synchro/PHPMailer
|
||||
## Version 5.2.14 (Nov 1st 2015)
|
||||
* Allow addresses with IDN (Internationalized Domain Name) in PHP 5.3+, thanks to @fbonzon
|
||||
* Allow access to POP3 errors
|
||||
* Make all POP3 private properties and methods protected
|
||||
* **SECURITY** Fix vulnerability that allowed email addresses with line breaks (valid in RFC5322) to pass to SMTP, permitting message injection at the SMTP level. Mitigated in both the address validator and in the lower-level SMTP class. Thanks to Takeshi Terada.
|
||||
* Updated Brazilian Portuguese translations (Thanks to @phelipealves)
|
||||
|
||||
Version 5.2.2-rc2 (November 6, 2012)
|
||||
* Fix SMTP server rotation (Bugz: 118)
|
||||
* Allow override of autogen'ed 'Date' header (for Drupal's
|
||||
## Version 5.2.13 (Sep 14th 2015)
|
||||
* Rename internal oauth class to avoid name clashes
|
||||
* Improve Estonian translations
|
||||
|
||||
## Version 5.2.12 (Sep 1st 2015)
|
||||
* Fix incorrect composer package dependencies
|
||||
* Skip existing embedded image `cid`s in `msgHTML`
|
||||
|
||||
## Version 5.2.11 (Aug 31st 2015)
|
||||
* Don't switch to quoted-printable for long lines if already using base64
|
||||
* Fixed Travis-CI config when run on PHP 7
|
||||
* Added Google XOAUTH2 authentication mechanism, thanks to @sherryl4george
|
||||
* Add address parser for RFC822-format addresses
|
||||
* Update MS Office MIME types
|
||||
* Don't convert line breaks when using quoted-printable encoding
|
||||
* Handle MS Exchange returning an invalid empty AUTH-type list in EHLO
|
||||
* Don't set name or filename properties on MIME parts that don't have one
|
||||
|
||||
## Version 5.2.10 (May 4th 2015)
|
||||
* Add custom header getter
|
||||
* Use `application/javascript` for .js attachments
|
||||
* Improve RFC2821 compliance for timelimits, especially for end-of-data
|
||||
* Add Azerbaijani translations (Thanks to @mirjalal)
|
||||
* Minor code cleanup for robustness
|
||||
* Add Indonesian translations (Thanks to @ceceprawiro)
|
||||
* Avoid `error_log` Debugoutput naming clash
|
||||
* Add ability to parse server capabilities in response to EHLO (useful for SendGrid etc)
|
||||
* Amended default values for WordWrap to match RFC
|
||||
* Remove html2text converter class (has incompatible license)
|
||||
* Provide new mechanism for injecting html to text converters
|
||||
* Improve pointers to docs and support in README
|
||||
* Add example file upload script
|
||||
* Refactor and major cleanup of EasyPeasyICS, now a lot more usable
|
||||
* Make set() method simpler and more reliable
|
||||
* Add Malay translation (Thanks to @nawawi)
|
||||
* Add Bulgarian translation (Thanks to @mialy)
|
||||
* Add Armenian translation (Thanks to Hrayr Grigoryan)
|
||||
* Add Slovenian translation (Thanks to Klemen Tušar)
|
||||
* More efficient word wrapping
|
||||
* Add support for S/MIME signing with additional CA certificate (thanks to @IgitBuh)
|
||||
* Fix incorrect MIME structure when using S/MIME signing and isMail() (#372)
|
||||
* Improved checks and error messages for missing extensions
|
||||
* Store and report SMTP errors more consistently
|
||||
* Add MIME multipart preamble for better Outlook compatibility
|
||||
* Enable TLS encryption automatically if the server offers it
|
||||
* Provide detailed errors when individual recipients fail
|
||||
* Report more errors when connecting
|
||||
* Add extras classes to composer classmap
|
||||
* Expose stream_context_create options via new SMTPOptions property
|
||||
* Automatic encoding switch to quoted-printable if message lines are too long
|
||||
* Add Korean translation (Thanks to @ChalkPE)
|
||||
* Provide a pointer to troubleshooting docs on SMTP connection failure
|
||||
|
||||
## Version 5.2.9 (Sept 25th 2014)
|
||||
* **Important: The autoloader is no longer autoloaded by the PHPMailer class**
|
||||
* Update html2text from https://github.com/mtibben/html2text
|
||||
* Improve Arabic translations (Thanks to @tarekdj)
|
||||
* Consistent handling of connection variables in SMTP and POP3
|
||||
* PHPDoc cleanup
|
||||
* Update composer to use PHPUnit 4.1
|
||||
* Pass consistent params to callbacks
|
||||
* More consistent handling of error states and debug output
|
||||
* Use property defaults, remove constructors
|
||||
* Remove unreachable code
|
||||
* Use older regex validation pattern for troublesome PCRE library versions
|
||||
* Improve PCRE detection in older PHP versions
|
||||
* Handle debug output consistently, and always in UTF-8
|
||||
* Allow user-defined debug output method via a callable
|
||||
* msgHTML now converts data URIs to embedded images
|
||||
* SMTP::getLastReply() will now always be populated
|
||||
* Improved example code in README
|
||||
* Ensure long filenames in Content-Disposition are encoded correctly
|
||||
* Simplify SMTP debug output mechanism, clarify levels with constants
|
||||
* Add SMTP connection check example
|
||||
* Simplify examples, don't use mysql* functions
|
||||
|
||||
## Version 5.2.8 (May 14th 2014)
|
||||
* Increase timeout to match RFC2821 section 4.5.3.2 and thus not fail greetdelays, fixes #104
|
||||
* Add timestamps to default debug output
|
||||
* Add connection events and new level 3 to debug output options
|
||||
* Chinese language update (Thanks to @binaryoung)
|
||||
* Allow custom Mailer types (Thanks to @michield)
|
||||
* Cope with spaces around SMTP host specs
|
||||
* Fix processing of multiple hosts in connect string
|
||||
* Added Galician translation (Thanks to @donatorouco)
|
||||
* Autoloader now prepends
|
||||
* Docs updates
|
||||
* Add Latvian translation (Thanks to @eddsstudio)
|
||||
* Add Belarusian translation (Thanks to @amaksymiuk)
|
||||
* Make autoloader work better on older PHP versions
|
||||
* Avoid double-encoding if mbstring is overloading mail()
|
||||
* Add Portuguese translation (Thanks to @Jonadabe)
|
||||
* Make quoted-printable encoder respect line ending setting
|
||||
* Improve Chinese translation (Thanks to @PeterDaveHello)
|
||||
* Add Georgian translation (Thanks to @akalongman)
|
||||
* Add Greek translation (Thanks to @lenasterg)
|
||||
* Fix serverHostname on PHP < 5.3
|
||||
* Improve performance of SMTP class
|
||||
* Implement automatic 7bit downgrade
|
||||
* Add Vietnamese translation (Thanks to @vinades)
|
||||
* Improve example images, switch to PNG
|
||||
* Add Croatian translation (Thanks to @hrvoj3e)
|
||||
* Remove setting the Return-Path and deprecate the Return-path property - it's just wrong!
|
||||
* Fix language file loading if CWD has changed (@stephandesouza)
|
||||
* Add HTML5 email validation pattern
|
||||
* Improve Turkish translations (Thanks to @yasinaydin)
|
||||
* Improve Romanian translations (Thanks to @aflorea)
|
||||
* Check php.ini for path to sendmail/qmail before using default
|
||||
* Improve Farsi translation (Thanks to @MHM5000)
|
||||
* Don't use quoted-printable encoding for multipart types
|
||||
* Add Serbian translation (Thanks to ajevremovic at gmail.com)
|
||||
* Remove useless PHP5 check
|
||||
* Use SVG for build status badges
|
||||
* Store MessageDate on creation
|
||||
* Better default behaviour for validateAddress
|
||||
|
||||
## Version 5.2.7 (September 12th 2013)
|
||||
* Add Ukrainian translation from @Krezalis
|
||||
* Support for do_verp
|
||||
* Fix bug in CRAM-MD5 AUTH
|
||||
* Propagate Debugoutput option to SMTP class (@Reblutus)
|
||||
* Determine MIME type of attachments automatically
|
||||
* Add cross-platform, multibyte-safe pathinfo replacement (with tests) and use it
|
||||
* Add a new 'html' Debugoutput type
|
||||
* Clean up SMTP debug output, remove embedded HTML
|
||||
* Some small changes in header formatting to improve IETF msglint test results
|
||||
* Update test_script to use some recently changed features, rename to code_generator
|
||||
* Generated code actually works!
|
||||
* Update SyntaxHighlighter
|
||||
* Major overhaul and cleanup of example code
|
||||
* New PHPMailer graphic
|
||||
* msgHTML now uses RFC2392-compliant content ids
|
||||
* Add line break normalization function and use it in msgHTML
|
||||
* Don't set unnecessary reply-to addresses
|
||||
* Make fakesendmail.sh a bit cleaner and safer
|
||||
* Set a content-transfer-encoding on multiparts (fixes msglint error)
|
||||
* Fix cid generation in msgHTML (Thanks to @digitalthought)
|
||||
* Fix handling of multiple SMTP servers (Thanks to @NanoCaiordo)
|
||||
* SMTP->connect() now supports stream context options (Thanks to @stanislavdavid)
|
||||
* Add support for iCal event alternatives (Thanks to @reblutus)
|
||||
* Update to Polish language file (Thanks to Krzysztof Kowalewski)
|
||||
* Update to Norwegian language file (Thanks to @datagutten)
|
||||
* Update to Hungarian language file (Thanks to @dominicus-75)
|
||||
* Add Persian/Farsi translation from @jaii
|
||||
* Make SMTPDebug property type match type in SMTP class
|
||||
* Add unit tests for DKIM
|
||||
* Major refactor of SMTP class
|
||||
* Reformat to PSR-2 coding standard
|
||||
* Introduce autoloader
|
||||
* Allow overriding of SMTP class
|
||||
* Overhaul of PHPDocs
|
||||
* Fix broken Q-encoding
|
||||
* Czech language update (Thanks to @nemelu)
|
||||
* Removal of excess blank lines in messages
|
||||
* Added fake POP server and unit tests for POP-before-SMTP
|
||||
|
||||
## Version 5.2.6 (April 11th 2013)
|
||||
* Reflect move to PHPMailer GitHub organisation at https://github.com/PHPMailer/PHPMailer
|
||||
* Fix unbumped version numbers
|
||||
* Update packagist.org with new location
|
||||
* Clean up Changelog
|
||||
|
||||
## Version 5.2.5 (April 6th 2013)
|
||||
* First official release after move from Google Code
|
||||
* Fixes for qmail when sending via mail()
|
||||
* Merge in changes from Google code 5.2.4 release
|
||||
* Minor coding standards cleanup in SMTP class
|
||||
* Improved unit tests, now tests S/MIME signing
|
||||
* Travis-CI support on GitHub, runs tests with fake SMTP server
|
||||
|
||||
## Version 5.2.4 (February 19, 2013)
|
||||
* Fix tag and version bug.
|
||||
* un-deprecate isSMTP(), isMail(), IsSendmail() and isQmail().
|
||||
* Numerous translation updates
|
||||
|
||||
## Version 5.2.3 (February 8, 2013)
|
||||
* Fix issue with older PCREs and ValidateAddress() (Bugz: 124)
|
||||
* Add CRAM-MD5 authentication, thanks to Elijah madden, https://github.com/okonomiyaki3000
|
||||
* Replacement of obsolete Quoted-Printable encoder with a much better implementation
|
||||
* Composer package definition
|
||||
* New language added: Hebrew
|
||||
|
||||
## Version 5.2.2 (December 3, 2012)
|
||||
* Some fixes and syncs from https://github.com/Synchro/PHPMailer
|
||||
* Add Slovak translation, thanks to Michal Tinka
|
||||
|
||||
## Version 5.2.2-rc2 (November 6, 2012)
|
||||
* Fix SMTP server rotation (Bugz: 118)
|
||||
* Allow override of autogen'ed 'Date' header (for Drupal's
|
||||
og_mailinglist module)
|
||||
* No whitespace after '-f' option (Bugz: 116)
|
||||
* Work around potential warning (Bugz: 114)
|
||||
* No whitespace after '-f' option (Bugz: 116)
|
||||
* Work around potential warning (Bugz: 114)
|
||||
|
||||
Version 5.2.2-rc1 (September 28, 2012)
|
||||
* Header encoding works with long lines (Bugz: 93)
|
||||
* Turkish language update (Bugz: 94)
|
||||
* undefined $pattern in EncodeQ bug squashed (Bugz: 98)
|
||||
* use of mail() in safe_mode now works (Bugz: 96)
|
||||
* ValidateAddress() now 'public static' so people can override the
|
||||
## Version 5.2.2-rc1 (September 28, 2012)
|
||||
* Header encoding works with long lines (Bugz: 93)
|
||||
* Turkish language update (Bugz: 94)
|
||||
* undefined $pattern in EncodeQ bug squashed (Bugz: 98)
|
||||
* use of mail() in safe_mode now works (Bugz: 96)
|
||||
* ValidateAddress() now 'public static' so people can override the
|
||||
default and use their own validation scheme.
|
||||
* ValidateAddress() no longer uses broken FILTER_VALIDATE_EMAIL
|
||||
* Added in AUTH PLAIN SMTP authentication
|
||||
* ValidateAddress() no longer uses broken FILTER_VALIDATE_EMAIL
|
||||
* Added in AUTH PLAIN SMTP authentication
|
||||
|
||||
Version 5.2.2-beta2 (August 17, 2012)
|
||||
* Fixed Postfix VERP support (Bugz: 92)
|
||||
* Allow action_function callbacks to pass/use
|
||||
## Version 5.2.2-beta2 (August 17, 2012)
|
||||
* Fixed Postfix VERP support (Bugz: 92)
|
||||
* Allow action_function callbacks to pass/use
|
||||
the From address (passed as final param)
|
||||
* Prevent inf look for get_lines() (Bugz: 77)
|
||||
* New public var ($UseSendmailOptions). Only pass sendmail()
|
||||
* Prevent inf look for get_lines() (Bugz: 77)
|
||||
* New public var ($UseSendmailOptions). Only pass sendmail()
|
||||
options iff we really are using sendmail or something sendmail
|
||||
compatible. (Bugz: 75)
|
||||
* default setting for LE returned to "\n" due to popular demand.
|
||||
* default setting for LE returned to "\n" due to popular demand.
|
||||
|
||||
Version 5.2.2-beta1 (July 13, 2012)
|
||||
* Expose PreSend() and PostSend() as public methods to allow
|
||||
## Version 5.2.2-beta1 (July 13, 2012)
|
||||
* Expose PreSend() and PostSend() as public methods to allow
|
||||
for more control if serializing message sending.
|
||||
* GetSentMIMEMessage() only constructs the message copy when
|
||||
* GetSentMIMEMessage() only constructs the message copy when
|
||||
needed. Save memory.
|
||||
* Only pass params to mail() if the underlying MTA is
|
||||
* Only pass params to mail() if the underlying MTA is
|
||||
"sendmail" (as defined as "having the string sendmail
|
||||
in its pathname") [#69]
|
||||
* Attachments now work with Amazon SES and others [Bugz#70]
|
||||
* Debug output now sent to stdout (via echo) or error_log [Bugz#5]
|
||||
* New var: Debugoutput (for above) [Bugz#5]
|
||||
* SMTP reads now Timeout aware (new var: Timeout=15) [Bugz#71]
|
||||
* SMTP reads now can have a Timelimit associated with them
|
||||
* Attachments now work with Amazon SES and others [Bugz#70]
|
||||
* Debug output now sent to stdout (via echo) or error_log [Bugz#5]
|
||||
* New var: Debugoutput (for above) [Bugz#5]
|
||||
* SMTP reads now Timeout aware (new var: Timeout=15) [Bugz#71]
|
||||
* SMTP reads now can have a Timelimit associated with them
|
||||
(new var: Timelimit=30)[Bugz#71]
|
||||
* Fix quoting issue associated with charsets
|
||||
* default setting for LE is now RFC compliant: "\r\n"
|
||||
* Return-Path can now be user defined (new var: ReturnPath)
|
||||
* Fix quoting issue associated with charsets
|
||||
* default setting for LE is now RFC compliant: "\r\n"
|
||||
* Return-Path can now be user defined (new var: ReturnPath)
|
||||
(the default is "" which implies no change from previous
|
||||
behavior, which was to use either From or Sender) [Bugz#46]
|
||||
* X-Mailer header can now be disabled (by setting to a
|
||||
* X-Mailer header can now be disabled (by setting to a
|
||||
whitespace string, eg " ") [Bugz#66]
|
||||
* Bugz closed: #68, #60, #42, #43, #59, #55, #66, #48, #49,
|
||||
* Bugz closed: #68, #60, #42, #43, #59, #55, #66, #48, #49,
|
||||
#52, #31, #41, #5. #70, #69
|
||||
|
||||
Version 5.2.1 (January 16, 2012)
|
||||
* Closed several bugs#5
|
||||
* Performance improvements
|
||||
* MsgHTML() now returns the message as required.
|
||||
* New method: GetSentMIMEMessage() (returns full copy of sent message)
|
||||
## Version 5.2.1 (January 16, 2012)
|
||||
* Closed several bugs #5
|
||||
* Performance improvements
|
||||
* MsgHTML() now returns the message as required.
|
||||
* New method: GetSentMIMEMessage() (returns full copy of sent message)
|
||||
|
||||
Version 5.2 (July 19, 2011)
|
||||
* protected MIME body and header
|
||||
* better DKIM DNS Resource Record support
|
||||
* better aly handling
|
||||
* htmlfilter class added to extras
|
||||
* moved to Apache Extras
|
||||
## Version 5.2 (July 19, 2011)
|
||||
* protected MIME body and header
|
||||
* better DKIM DNS Resource Record support
|
||||
* better aly handling
|
||||
* htmlfilter class added to extras
|
||||
* moved to Apache Extras
|
||||
|
||||
Version 5.1 (October 20, 2009)
|
||||
* fixed filename issue with AddStringAttachment (thanks to Tony)
|
||||
* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in
|
||||
## Version 5.1 (October 20, 2009)
|
||||
* fixed filename issue with AddStringAttachment (thanks to Tony)
|
||||
* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in
|
||||
addition to PHP mail()
|
||||
* added DKIM digital signing functionality
|
||||
New properties:
|
||||
* added DKIM digital signing functionality, new properties:
|
||||
- DKIM_domain (sets the domain name)
|
||||
- DKIM_private (holds DKIM private key)
|
||||
- DKIM_passphrase (holds your DKIM passphrase)
|
||||
- DKIM_selector (holds the DKIM "selector")
|
||||
- DKIM_identity (holds the identifying email address)
|
||||
* added callback function support
|
||||
* added callback function support
|
||||
- callback function parameters include:
|
||||
result, to, cc, bcc, subject and body
|
||||
* see the test/test_callback.php file for usage.
|
||||
* added "auto" identity functionality
|
||||
- see the test/test_callback.php file for usage.
|
||||
* added "auto" identity functionality
|
||||
- can automatically add:
|
||||
- Return-path (if Sender not set)
|
||||
- Reply-To (if ReplyTo not set)
|
||||
- can be disabled:
|
||||
- $mail->SetFrom('yourname@yourdomain.com','First Last',false);
|
||||
- or by adding the $mail->Sender and/or $mail->ReplyTo properties
|
||||
Note: "auto" identity added to help with emails ending up in spam
|
||||
or junk boxes because of missing headers
|
||||
|
||||
Version 5.0.2 (May 24, 2009)
|
||||
* Fix for missing attachments when inline graphics are present
|
||||
* Fix for missing Cc in header when using SMTP (mail was sent,
|
||||
Note: "auto" identity added to help with emails ending up in spam or junk boxes because of missing headers
|
||||
|
||||
## Version 5.0.2 (May 24, 2009)
|
||||
* Fix for missing attachments when inline graphics are present
|
||||
* Fix for missing Cc in header when using SMTP (mail was sent,
|
||||
but not displayed in header -- Cc receiver only saw email To:
|
||||
line and no Cc line, but did get the email (To receiver
|
||||
saw same)
|
||||
|
||||
Version 5.0.1 (April 05, 2009)
|
||||
* Temporary fix for missing attachments
|
||||
## Version 5.0.1 (April 05, 2009)
|
||||
* Temporary fix for missing attachments
|
||||
|
||||
Version 5.0.0 (April 02, 2009)
|
||||
## Version 5.0.0 (April 02, 2009)
|
||||
With the release of this version, we are initiating a new version numbering
|
||||
system to differentiate from the PHP4 version of PHPMailer.
|
||||
Most notable in this release is fully object oriented code.
|
||||
|
||||
* With the release of this version, we are initiating a new version numbering
|
||||
system to differentiate from the PHP4 version of PHPMailer.
|
||||
* Most notable in this release is fully object oriented code.
|
||||
class.smtp.php:
|
||||
* Refactored class.smtp.php to support new exception handling
|
||||
code size reduced from 29.2 Kb to 25.6 Kb
|
||||
* Removed unnecessary functions from class.smtp.php:
|
||||
public function Expand($name) {
|
||||
public function Help($keyword="") {
|
||||
public function Noop() {
|
||||
public function Send($from) {
|
||||
public function SendOrMail($from) {
|
||||
public function Verify($name) {
|
||||
class.phpmailer.php:
|
||||
* Refactored class.phpmailer.php with new exception handling
|
||||
* Changed processing functionality of Sendmail and Qmail so they cannot be
|
||||
### class.smtp.php:
|
||||
* Refactored class.smtp.php to support new exception handling
|
||||
* code size reduced from 29.2 Kb to 25.6 Kb
|
||||
* Removed unnecessary functions from class.smtp.php:
|
||||
- public function Expand($name) {
|
||||
- public function Help($keyword="") {
|
||||
- public function Noop() {
|
||||
- public function Send($from) {
|
||||
- public function SendOrMail($from) {
|
||||
- public function Verify($name) {
|
||||
|
||||
### class.phpmailer.php:
|
||||
* Refactored class.phpmailer.php with new exception handling
|
||||
* Changed processing functionality of Sendmail and Qmail so they cannot be
|
||||
inadvertently used
|
||||
* removed getFile() function, just became a simple wrapper for
|
||||
* removed getFile() function, just became a simple wrapper for
|
||||
file_get_contents()
|
||||
* added check for PHP version (will gracefully exit if not at least PHP 5.0)
|
||||
class.phpmailer.php enhancements
|
||||
* enhanced code to check if an attachment source is the same as an embedded or
|
||||
* added check for PHP version (will gracefully exit if not at least PHP 5.0)
|
||||
* enhanced code to check if an attachment source is the same as an embedded or
|
||||
inline graphic source to eliminate duplicate attachments
|
||||
New /test_script
|
||||
* We have written a test script you can use to test the script as part of your
|
||||
installation. Once you press submit, the test script will send a multi-mime
|
||||
email with either the message you type in or an HTML email with an inline
|
||||
graphic. Two attachments are included in the email (one of the attachments
|
||||
is also the inline graphic so you can see that only one copy of the graphic
|
||||
is sent in the email). The test script will also display the functional
|
||||
script that you can copy/paste to your editor to duplicate the functionality.
|
||||
New examples
|
||||
* All new examples in both basic and advanced modes. Advanced examples show
|
||||
|
||||
### New /test_script
|
||||
We have written a test script you can use to test the script as part of your
|
||||
installation. Once you press submit, the test script will send a multi-mime
|
||||
email with either the message you type in or an HTML email with an inline
|
||||
graphic. Two attachments are included in the email (one of the attachments
|
||||
is also the inline graphic so you can see that only one copy of the graphic
|
||||
is sent in the email). The test script will also display the functional
|
||||
script that you can copy/paste to your editor to duplicate the functionality.
|
||||
|
||||
### New examples
|
||||
All new examples in both basic and advanced modes. Advanced examples show
|
||||
Exception handling.
|
||||
PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0
|
||||
* all new documentation
|
||||
|
||||
Please note: the website has been updated to reflect the changes in PHPMailer
|
||||
Version 5.0.0. http://phpmailer.codeworxtech.com/
|
||||
### PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0
|
||||
All new documentation
|
||||
|
||||
Version 2.3 (November 06, 2008)
|
||||
|
||||
* added Arabic language (many thanks to Bahjat Al Mostafa)
|
||||
* removed English language from language files and made it a default within
|
||||
## Version 2.3 (November 06, 2008)
|
||||
* added Arabic language (many thanks to Bahjat Al Mostafa)
|
||||
* removed English language from language files and made it a default within
|
||||
class.phpmailer.php - if no language is found, it will default to use
|
||||
the english language translation
|
||||
* fixed public/private declarations
|
||||
* corrected line 1728, $basedir to $directory
|
||||
* added $sign_cert_file to avoid improper duplicate use of $sign_key_file
|
||||
* corrected $this->Hello on line 612 to $this->Helo
|
||||
* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user
|
||||
* fixed public/private declarations
|
||||
* corrected line 1728, $basedir to $directory
|
||||
* added $sign_cert_file to avoid improper duplicate use of $sign_key_file
|
||||
* corrected $this->Hello on line 612 to $this->Helo
|
||||
* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user
|
||||
if default is not acceptable
|
||||
* removed trim() from return results in EncodeQP
|
||||
* /test and three files it contained are removed from version 2.3
|
||||
* fixed phpunit.php for compliance with PHP5
|
||||
* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg);
|
||||
* We have removed the /phpdoc from the downloads. All documentation is now on
|
||||
* removed trim() from return results in EncodeQP
|
||||
* /test and three files it contained are removed from version 2.3
|
||||
* fixed phpunit.php for compliance with PHP5
|
||||
* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg);
|
||||
* We have removed the /phpdoc from the downloads. All documentation is now on
|
||||
the http://phpmailer.codeworxtech.com website.
|
||||
|
||||
Version 2.2.1 () July 19 2008
|
||||
## Version 2.2.1 () July 19 2008
|
||||
* fixed line 1092 in class.smtp.php (my apologies, error on my part)
|
||||
|
||||
* fixed line 1092 in class.smtp.php (my apologies, error on my part)
|
||||
## Version 2.2 () July 15 2008
|
||||
* Fixed redirect issue (display of UTF-8 in thank you redirect)
|
||||
* fixed error in getResponse function declaration (class.pop3.php)
|
||||
* PHPMailer now PHP6 compliant
|
||||
* fixed line 1092 in class.smtp.php (endless loop from missing = sign)
|
||||
|
||||
Version 2.2 () July 15 2008
|
||||
## Version 2.1 (Wed, June 04 2008)
|
||||
NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE APPRECIATED.
|
||||
|
||||
* Fixed redirect issue (display of UTF-8 in thank you redirect)
|
||||
* fixed error in getResponse function declaration (class.pop3.php)
|
||||
* PHPMailer now PHP6 compliant
|
||||
* fixed line 1092 in class.smtp.php (endless loop from missing = sign)
|
||||
|
||||
Version 2.1 (Wed, June 04 2008)
|
||||
|
||||
** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.
|
||||
IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE
|
||||
APPRECIATED.
|
||||
|
||||
* added S/MIME functionality (ability to digitally sign emails)
|
||||
* added S/MIME functionality (ability to digitally sign emails)
|
||||
BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
|
||||
The "Signed Emails" functionality adds the Sign method to pass the private key
|
||||
filename and the password to read it, and then email will be sent with
|
||||
content-type multipart/signed and with the digital signature attached.
|
||||
* fully compatible with E_STRICT error level
|
||||
* fully compatible with E_STRICT error level
|
||||
- Please note:
|
||||
In about half the test environments this development version was subjected
|
||||
to, an error was thrown for the date() functions used (line 1565 and 1569).
|
||||
This is NOT a PHPMailer error, it is the result of an incorrectly configured
|
||||
PHP5 installation. The fix is to modify your 'php.ini' file and include the
|
||||
date.timezone = America/New York
|
||||
date.timezone = Etc/UTC (or your own zone)
|
||||
directive, to your own server timezone
|
||||
- If you do get this error, and are unable to access your php.ini file:
|
||||
In your PHP script, add
|
||||
date_default_timezone_set('America/Toronto');
|
||||
`date_default_timezone_set('Etc/UTC');`
|
||||
- do not try to use
|
||||
$myVar = date_default_timezone_get();
|
||||
`$myVar = date_default_timezone_get();`
|
||||
as a test, it will throw an error.
|
||||
* added ability to define path (mainly for embedded images)
|
||||
function MsgHTML($message,$basedir='') ... where:
|
||||
$basedir is the fully qualified path
|
||||
* fixed MsgHTML() function:
|
||||
- Embedded Images where images are specified by <protocol>:// will not be altered or embedded
|
||||
* fixed the return value of SMTP exit code ( pclose )
|
||||
* addressed issue of multibyte characters in subject line and truncating
|
||||
* added ability to have user specified Message ID
|
||||
* added ability to define path (mainly for embedded images)
|
||||
function `MsgHTML($message,$basedir='')` ... where:
|
||||
`$basedir` is the fully qualified path
|
||||
* fixed `MsgHTML()` function:
|
||||
- Embedded Images where images are specified by `<protocol>://` will not be altered or embedded
|
||||
* fixed the return value of SMTP exit code ( pclose )
|
||||
* addressed issue of multibyte characters in subject line and truncating
|
||||
* added ability to have user specified Message ID
|
||||
(default is still that PHPMailer create a unique Message ID)
|
||||
* corrected unidentified message type to 'application/octet-stream'
|
||||
* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al).
|
||||
* added check for added attachments
|
||||
* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny")
|
||||
* corrected unidentified message type to 'application/octet-stream'
|
||||
* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al).
|
||||
* added check for added attachments
|
||||
* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny")
|
||||
|
||||
Version 2.1.0beta2 (Sun, Dec 02 2007)
|
||||
* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon)
|
||||
* finished all testing, all known bugs corrected, enhancements tested
|
||||
- note: will NOT work with PHP4.
|
||||
## Version 2.1.0beta2 (Sun, Dec 02 2007)
|
||||
* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon)
|
||||
* finished all testing, all known bugs corrected, enhancements tested
|
||||
|
||||
please note, this is BETA software
|
||||
** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
|
||||
Note: will NOT work with PHP4.
|
||||
|
||||
Please note, this is BETA software **DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS; INTENDED STRICTLY FOR TESTING**
|
||||
|
||||
## Version 2.1.0beta1
|
||||
Please note, this is BETA software
|
||||
** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
|
||||
INTENDED STRICTLY FOR TESTING
|
||||
|
||||
Version 2.1.0beta1
|
||||
please note, this is BETA software
|
||||
** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
|
||||
INTENDED STRICTLY FOR TESTING
|
||||
|
||||
Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
|
||||
* implements new property to control VERP in class.smtp.php
|
||||
## Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
|
||||
* implements new property to control VERP in class.smtp.php
|
||||
example (requires instantiating class.smtp.php):
|
||||
$mail->do_verp = true;
|
||||
* POP-before-SMTP functionality included, thanks to Richard Davey
|
||||
* POP-before-SMTP functionality included, thanks to Richard Davey
|
||||
(see class.pop3.php & pop3_before_smtp_test.php for examples)
|
||||
* included example showing how to use PHPMailer with GMAIL
|
||||
* fixed the missing Cc in SendMail() and Mail()
|
||||
* included example showing how to use PHPMailer with GMAIL
|
||||
* fixed the missing Cc in SendMail() and Mail()
|
||||
|
||||
******************
|
||||
A note on sending bulk emails:
|
||||
## Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release
|
||||
* dramatically simplified using inline graphics ... it's fully automated and requires no user input
|
||||
* added automatic document type detection for attachments and pictures
|
||||
* added MsgHTML() function to replace Body tag for HTML emails
|
||||
* fixed the SendMail security issues (input validation vulnerability)
|
||||
* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address
|
||||
* removed the need to use the AltBody method (set from the HTML, or default text used)
|
||||
* set the PHP Mail() function as the default (still support SendMail, SMTP Mail)
|
||||
* removed the need to set the IsHTML property (set automatically)
|
||||
* added Estonian language file by Indrek Päri
|
||||
* added header injection patch
|
||||
* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc.
|
||||
* fixed warning message in SMTP get_lines method
|
||||
* added TLS/SSL SMTP support.
|
||||
* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7)
|
||||
* Works with PHP installed as a module or as CGI-PHP
|
||||
NOTE: will NOT work with PHP5 in E_STRICT error mode
|
||||
|
||||
If the email you are sending is not personalized, consider using the
|
||||
"undisclosed-recipient:;" strategy. That is, put all of your recipients
|
||||
in the Bcc field and set the To field to "undisclosed-recipients:;".
|
||||
It's a lot faster (only one send) and saves quite a bit on resources.
|
||||
Contrary to some opinions, this will not get you listed in spam engines -
|
||||
it's a legitimate way for you to send emails.
|
||||
## Version 1.73 (Sun, Jun 10 2005)
|
||||
* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
|
||||
* Now has a total of 20 translations
|
||||
* Fixed alt attachments bug: http://tinyurl.com/98u9k
|
||||
|
||||
A partial example for use with PHPMailer:
|
||||
|
||||
$mail->AddAddress("undisclosed-recipients:;");
|
||||
$mail->AddBCC("email1@anydomain.com,email2@anyotherdomain.com,email3@anyalternatedomain.com");
|
||||
|
||||
Many email service providers restrict the number of emails that can be sent
|
||||
in any given time period. Often that is between 50 - 60 emails maximum
|
||||
per hour or per send session.
|
||||
|
||||
If that's the case, then break up your Bcc lists into chunks that are one
|
||||
less than your limit, and put a pause in your script.
|
||||
*******************
|
||||
|
||||
Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release
|
||||
* dramatically simplified using inline graphics ... it's fully automated and requires no user input
|
||||
* added automatic document type detection for attachments and pictures
|
||||
* added MsgHTML() function to replace Body tag for HTML emails
|
||||
* fixed the SendMail security issues (input validation vulnerability)
|
||||
* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address
|
||||
* removed the need to use the AltBody method (set from the HTML, or default text used)
|
||||
* set the PHP Mail() function as the default (still support SendMail, SMTP Mail)
|
||||
* removed the need to set the IsHTML property (set automatically)
|
||||
* added Estonian language file by Indrek Päri
|
||||
* added header injection patch
|
||||
* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc.
|
||||
example of use:
|
||||
$mail->set('X-Priority', '3');
|
||||
$mail->set('X-MSMail-Priority', 'Normal');
|
||||
* fixed warning message in SMTP get_lines method
|
||||
* added TLS/SSL SMTP support
|
||||
example of use:
|
||||
$mail = new PHPMailer();
|
||||
$mail->Mailer = "smtp";
|
||||
$mail->Host = "smtp.example.com";
|
||||
$mail->SMTPSecure = "tls"; // option
|
||||
//$mail->SMTPSecure = "ssl"; // option
|
||||
...
|
||||
$mail->Send();
|
||||
* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7)
|
||||
* Works with PHP installed as a module or as CGI-PHP
|
||||
- NOTE: will NOT work with PHP5 in E_STRICT error mode
|
||||
|
||||
Version 1.73 (Sun, Jun 10 2005)
|
||||
* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
|
||||
* Now has a total of 20 translations
|
||||
* Fixed alt attachments bug: http://tinyurl.com/98u9k
|
||||
|
||||
Version 1.72 (Wed, May 25 2004)
|
||||
* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
|
||||
* Received: Removed this method because spam filter programs like
|
||||
## Version 1.72 (Wed, May 25 2004)
|
||||
* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
|
||||
* Received: Removed this method because spam filter programs like
|
||||
SpamAssassin reject this header.
|
||||
* Fixed error count bug.
|
||||
* SetLanguage default is now "language/".
|
||||
* Fixed magic_quotes_runtime bug.
|
||||
* Fixed error count bug.
|
||||
* SetLanguage default is now "language/".
|
||||
* Fixed magic_quotes_runtime bug.
|
||||
|
||||
Version 1.71 (Tue, Jul 28 2003)
|
||||
* Made several speed enhancements
|
||||
* Added German and Italian translation files
|
||||
* Fixed HELO/AUTH bugs on keep-alive connects
|
||||
* Now provides an error message if language file does not load
|
||||
* Fixed attachment EOL bug
|
||||
* Updated some unclear documentation
|
||||
* Added additional tests and improved others
|
||||
## Version 1.71 (Tue, Jul 28 2003)
|
||||
* Made several speed enhancements
|
||||
* Added German and Italian translation files
|
||||
* Fixed HELO/AUTH bugs on keep-alive connects
|
||||
* Now provides an error message if language file does not load
|
||||
* Fixed attachment EOL bug
|
||||
* Updated some unclear documentation
|
||||
* Added additional tests and improved others
|
||||
|
||||
Version 1.70 (Mon, Jun 20 2003)
|
||||
* Added SMTP keep-alive support
|
||||
* Added IsError method for error detection
|
||||
* Added error message translation support (SetLanguage)
|
||||
* Refactored many methods to increase library performance
|
||||
* Hello now sends the newer EHLO message before HELO as per RFC 2821
|
||||
* Removed the boundary class and replaced it with GetBoundary
|
||||
* Removed queue support methods
|
||||
* New $Hostname variable
|
||||
* New Message-ID header
|
||||
* Received header reformat
|
||||
* Helo variable default changed to $Hostname
|
||||
* Removed extra spaces in Content-Type definition (#667182)
|
||||
* Return-Path should be set to Sender when set
|
||||
* Adds Q or B encoding to headers when necessary
|
||||
* quoted-encoding should now encode NULs \000
|
||||
* Fixed encoding of body/AltBody (#553370)
|
||||
* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
|
||||
* Multiple bug fixes
|
||||
## Version 1.70 (Mon, Jun 20 2003)
|
||||
* Added SMTP keep-alive support
|
||||
* Added IsError method for error detection
|
||||
* Added error message translation support (SetLanguage)
|
||||
* Refactored many methods to increase library performance
|
||||
* Hello now sends the newer EHLO message before HELO as per RFC 2821
|
||||
* Removed the boundary class and replaced it with GetBoundary
|
||||
* Removed queue support methods
|
||||
* New $Hostname variable
|
||||
* New Message-ID header
|
||||
* Received header reformat
|
||||
* Helo variable default changed to $Hostname
|
||||
* Removed extra spaces in Content-Type definition (#667182)
|
||||
* Return-Path should be set to Sender when set
|
||||
* Adds Q or B encoding to headers when necessary
|
||||
* quoted-encoding should now encode NULs \000
|
||||
* Fixed encoding of body/AltBody (#553370)
|
||||
* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
|
||||
* Multiple bug fixes
|
||||
|
||||
Version 1.65 (Fri, Aug 09 2002)
|
||||
* Fixed non-visible attachment bug (#585097) for Outlook
|
||||
* SMTP connections are now closed after each transaction
|
||||
* Fixed SMTP::Expand return value
|
||||
* Converted SMTP class documentation to phpDocumentor format
|
||||
## Version 1.65 (Fri, Aug 09 2002)
|
||||
* Fixed non-visible attachment bug (#585097) for Outlook
|
||||
* SMTP connections are now closed after each transaction
|
||||
* Fixed SMTP::Expand return value
|
||||
* Converted SMTP class documentation to phpDocumentor format
|
||||
|
||||
Version 1.62 (Wed, Jun 26 2002)
|
||||
* Fixed multi-attach bug
|
||||
* Set proper word wrapping
|
||||
* Reduced memory use with attachments
|
||||
* Added more debugging
|
||||
* Changed documentation to phpDocumentor format
|
||||
## Version 1.62 (Wed, Jun 26 2002)
|
||||
* Fixed multi-attach bug
|
||||
* Set proper word wrapping
|
||||
* Reduced memory use with attachments
|
||||
* Added more debugging
|
||||
* Changed documentation to phpDocumentor format
|
||||
|
||||
Version 1.60 (Sat, Mar 30 2002)
|
||||
* Sendmail pipe and address patch (Christian Holtje)
|
||||
* Added embedded image and read confirmation support (A. Ognio)
|
||||
* Added unit tests
|
||||
* Added SMTP timeout support (*nix only)
|
||||
* Added possibly temporary PluginDir variable for SMTP class
|
||||
* Added LE message line ending variable
|
||||
* Refactored boundary and attachment code
|
||||
* Eliminated SMTP class warnings
|
||||
* Added SendToQueue method for future queuing support
|
||||
## Version 1.60 (Sat, Mar 30 2002)
|
||||
* Sendmail pipe and address patch (Christian Holtje)
|
||||
* Added embedded image and read confirmation support (A. Ognio)
|
||||
* Added unit tests
|
||||
* Added SMTP timeout support (*nix only)
|
||||
* Added possibly temporary PluginDir variable for SMTP class
|
||||
* Added LE message line ending variable
|
||||
* Refactored boundary and attachment code
|
||||
* Eliminated SMTP class warnings
|
||||
* Added SendToQueue method for future queuing support
|
||||
|
||||
Version 1.54 (Wed, Dec 19 2001)
|
||||
* Add some queuing support code
|
||||
* Fixed a pesky multi/alt bug
|
||||
* Messages are no longer forced to have "To" addresses
|
||||
## Version 1.54 (Wed, Dec 19 2001)
|
||||
* Add some queuing support code
|
||||
* Fixed a pesky multi/alt bug
|
||||
* Messages are no longer forced to have "To" addresses
|
||||
|
||||
Version 1.50 (Thu, Nov 08 2001)
|
||||
* Fix extra lines when not using SMTP mailer
|
||||
* Set WordWrap variable to int with a zero default
|
||||
## Version 1.50 (Thu, Nov 08 2001)
|
||||
* Fix extra lines when not using SMTP mailer
|
||||
* Set WordWrap variable to int with a zero default
|
||||
|
||||
Version 1.47 (Tue, Oct 16 2001)
|
||||
* Fixed Received header code format
|
||||
* Fixed AltBody order error
|
||||
* Fixed alternate port warning
|
||||
## Version 1.47 (Tue, Oct 16 2001)
|
||||
* Fixed Received header code format
|
||||
* Fixed AltBody order error
|
||||
* Fixed alternate port warning
|
||||
|
||||
Version 1.45 (Tue, Sep 25 2001)
|
||||
* Added enhanced SMTP debug support
|
||||
* Added support for multiple ports on SMTP
|
||||
* Added Received header for tracing
|
||||
* Fixed AddStringAttachment encoding
|
||||
* Fixed possible header name quote bug
|
||||
* Fixed wordwrap() trim bug
|
||||
* Couple other small bug fixes
|
||||
## Version 1.45 (Tue, Sep 25 2001)
|
||||
* Added enhanced SMTP debug support
|
||||
* Added support for multiple ports on SMTP
|
||||
* Added Received header for tracing
|
||||
* Fixed AddStringAttachment encoding
|
||||
* Fixed possible header name quote bug
|
||||
* Fixed wordwrap() trim bug
|
||||
* Couple other small bug fixes
|
||||
|
||||
Version 1.41 (Wed, Aug 22 2001)
|
||||
* Fixed AltBody bug w/o attachments
|
||||
* Fixed rfc_date() for certain mail servers
|
||||
## Version 1.41 (Wed, Aug 22 2001)
|
||||
* Fixed AltBody bug w/o attachments
|
||||
* Fixed rfc_date() for certain mail servers
|
||||
|
||||
Version 1.40 (Sun, Aug 12 2001)
|
||||
* Added multipart/alternative support (AltBody)
|
||||
* Documentation update
|
||||
* Fixed bug in Mercury MTA
|
||||
## Version 1.40 (Sun, Aug 12 2001)
|
||||
* Added multipart/alternative support (AltBody)
|
||||
* Documentation update
|
||||
* Fixed bug in Mercury MTA
|
||||
|
||||
Version 1.29 (Fri, Aug 03 2001)
|
||||
* Added AddStringAttachment() method
|
||||
* Added SMTP authentication support
|
||||
## Version 1.29 (Fri, Aug 03 2001)
|
||||
* Added AddStringAttachment() method
|
||||
* Added SMTP authentication support
|
||||
|
||||
Version 1.28 (Mon, Jul 30 2001)
|
||||
* Fixed a typo in SMTP class
|
||||
* Fixed header issue with Imail (win32) SMTP server
|
||||
* Made fopen() calls for attachments use "rb" to fix win32 error
|
||||
## Version 1.28 (Mon, Jul 30 2001)
|
||||
* Fixed a typo in SMTP class
|
||||
* Fixed header issue with Imail (win32) SMTP server
|
||||
* Made fopen() calls for attachments use "rb" to fix win32 error
|
||||
|
||||
Version 1.25 (Mon, Jul 02 2001)
|
||||
* Added RFC 822 date fix (Patrice)
|
||||
* Added improved error handling by adding a $ErrorInfo variable
|
||||
* Removed MailerDebug variable (obsolete with new error handler)
|
||||
## Version 1.25 (Mon, Jul 02 2001)
|
||||
* Added RFC 822 date fix (Patrice)
|
||||
* Added improved error handling by adding a $ErrorInfo variable
|
||||
* Removed MailerDebug variable (obsolete with new error handler)
|
||||
|
||||
Version 1.20 (Mon, Jun 25 2001)
|
||||
* Added quoted-printable encoding (Patrice)
|
||||
* Set Version as public and removed PrintVersion()
|
||||
* Changed phpdoc to only display public variables and methods
|
||||
## Version 1.20 (Mon, Jun 25 2001)
|
||||
* Added quoted-printable encoding (Patrice)
|
||||
* Set Version as public and removed PrintVersion()
|
||||
* Changed phpdoc to only display public variables and methods
|
||||
|
||||
Version 1.19 (Thu, Jun 21 2001)
|
||||
* Fixed MS Mail header bug
|
||||
* Added fix for Bcc problem with mail(). *Does not work on Win32*
|
||||
## Version 1.19 (Thu, Jun 21 2001)
|
||||
* Fixed MS Mail header bug
|
||||
* Added fix for Bcc problem with mail(). *Does not work on Win32*
|
||||
(See PHP bug report: http://www.php.net/bugs.php?id=11616)
|
||||
* mail() no longer passes a fifth parameter when not needed
|
||||
* mail() no longer passes a fifth parameter when not needed
|
||||
|
||||
Version 1.15 (Fri, Jun 15 2001)
|
||||
[Note: these changes contributed by Patrice Fournier]
|
||||
* Changed all remaining \n to \r\n
|
||||
* Bcc: header no longer writen to message except
|
||||
## Version 1.15 (Fri, Jun 15 2001)
|
||||
Note: these changes contributed by Patrice Fournier
|
||||
* Changed all remaining \n to \r\n
|
||||
* Bcc: header no longer written to message except
|
||||
when sent directly to sendmail
|
||||
* Added a small message to non-MIME compliant mail reader
|
||||
* Added Sender variable to change the Sender email
|
||||
* Added a small message to non-MIME compliant mail reader
|
||||
* Added Sender variable to change the Sender email
|
||||
used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode
|
||||
* Changed boundary setting to a place it will be set only once
|
||||
* Removed transfer encoding for whole message when using multipart
|
||||
* Message body now uses Encoding in multipart messages
|
||||
* Can set encoding and type to attachments 7bit, 8bit
|
||||
* Changed boundary setting to a place it will be set only once
|
||||
* Removed transfer encoding for whole message when using multipart
|
||||
* Message body now uses Encoding in multipart messages
|
||||
* Can set encoding and type to attachments 7bit, 8bit
|
||||
and binary attachment are sent as is, base64 are encoded
|
||||
* Can set Encoding to base64 to send 8 bits body
|
||||
* Can set Encoding to base64 to send 8 bits body
|
||||
through 7 bits servers
|
||||
|
||||
Version 1.10 (Tue, Jun 12 2001)
|
||||
* Fixed win32 mail header bug (printed out headers in message body)
|
||||
## Version 1.10 (Tue, Jun 12 2001)
|
||||
* Fixed win32 mail header bug (printed out headers in message body)
|
||||
|
||||
Version 1.09 (Fri, Jun 08 2001)
|
||||
* Changed date header to work with Netscape mail programs
|
||||
* Altered phpdoc documentation
|
||||
## Version 1.09 (Fri, Jun 08 2001)
|
||||
* Changed date header to work with Netscape mail programs
|
||||
* Altered phpdoc documentation
|
||||
|
||||
Version 1.08 (Tue, Jun 05 2001)
|
||||
* Added enhanced error-checking
|
||||
* Added phpdoc documentation to source
|
||||
## Version 1.08 (Tue, Jun 05 2001)
|
||||
* Added enhanced error-checking
|
||||
* Added phpdoc documentation to source
|
||||
|
||||
Version 1.06 (Fri, Jun 01 2001)
|
||||
* Added optional name for file attachments
|
||||
## Version 1.06 (Fri, Jun 01 2001)
|
||||
* Added optional name for file attachments
|
||||
|
||||
Version 1.05 (Tue, May 29 2001)
|
||||
* Code cleanup
|
||||
* Eliminated sendmail header warning message
|
||||
* Fixed possible SMTP error
|
||||
## Version 1.05 (Tue, May 29 2001)
|
||||
* Code cleanup
|
||||
* Eliminated sendmail header warning message
|
||||
* Fixed possible SMTP error
|
||||
|
||||
Version 1.03 (Thu, May 24 2001)
|
||||
* Fixed problem where qmail sends out duplicate messages
|
||||
## Version 1.03 (Thu, May 24 2001)
|
||||
* Fixed problem where qmail sends out duplicate messages
|
||||
|
||||
Version 1.02 (Wed, May 23 2001)
|
||||
* Added multiple recipient and attachment Clear* methods
|
||||
* Added Sendmail public variable
|
||||
* Fixed problem with loading SMTP library multiple times
|
||||
## Version 1.02 (Wed, May 23 2001)
|
||||
* Added multiple recipient and attachment Clear* methods
|
||||
* Added Sendmail public variable
|
||||
* Fixed problem with loading SMTP library multiple times
|
||||
|
||||
Version 0.98 (Tue, May 22 2001)
|
||||
* Fixed problem with redundant mail hosts sending out multiple messages
|
||||
* Added additional error handler code
|
||||
* Added AddCustomHeader() function
|
||||
* Added support for Microsoft mail client headers (affects priority)
|
||||
* Fixed small bug with Mailer variable
|
||||
* Added PrintVersion() function
|
||||
## Version 0.98 (Tue, May 22 2001)
|
||||
* Fixed problem with redundant mail hosts sending out multiple messages
|
||||
* Added additional error handler code
|
||||
* Added AddCustomHeader() function
|
||||
* Added support for Microsoft mail client headers (affects priority)
|
||||
* Fixed small bug with Mailer variable
|
||||
* Added PrintVersion() function
|
||||
|
||||
Version 0.92 (Tue, May 15 2001)
|
||||
* Changed file names to class.phpmailer.php and class.smtp.php to match
|
||||
## Version 0.92 (Tue, May 15 2001)
|
||||
* Changed file names to class.phpmailer.php and class.smtp.php to match
|
||||
current PHP class trend.
|
||||
* Fixed problem where body not being printed when a message is attached
|
||||
* Several small bug fixes
|
||||
* Fixed problem where body not being printed when a message is attached
|
||||
* Several small bug fixes
|
||||
|
||||
Version 0.90 (Tue, April 17 2001)
|
||||
* Intial public release
|
||||
## Version 0.90 (Tue, April 17 2001)
|
||||
* Initial public release
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,272 +1,251 @@
|
|||
<?php
|
||||
/*~ class.pop3.php
|
||||
.---------------------------------------------------------------------------.
|
||||
| Software: PHPMailer - PHP email class |
|
||||
| Version: 5.2.2 |
|
||||
| Site: https://code.google.com/a/apache-extras.org/p/phpmailer/ |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| Admin: Jim Jagielski (project admininistrator) |
|
||||
| Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
|
||||
| : Marcus Bointon (coolbru) coolbru@users.sourceforge.net |
|
||||
| : Jim Jagielski (jimjag) jimjag@gmail.com |
|
||||
| Founder: Brent R. Matzelle (original founder) |
|
||||
| Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved. |
|
||||
| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
|
||||
| Copyright (c) 2001-2003, Brent R. Matzelle |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| License: Distributed under the Lesser General Public License (LGPL) |
|
||||
| http://www.gnu.org/copyleft/lesser.html |
|
||||
| This program is distributed in the hope that it will be useful - WITHOUT |
|
||||
| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
||||
| FITNESS FOR A PARTICULAR PURPOSE. |
|
||||
'---------------------------------------------------------------------------'
|
||||
*/
|
||||
|
||||
/**
|
||||
* PHPMailer - PHP POP Before SMTP Authentication Class
|
||||
* NOTE: Designed for use with PHP version 5 and up
|
||||
* PHPMailer POP-Before-SMTP Authentication Class.
|
||||
* PHP Version 5
|
||||
* @package PHPMailer
|
||||
* @author Andy Prevost
|
||||
* @author Marcus Bointon
|
||||
* @author Jim Jagielski
|
||||
* @link https://github.com/PHPMailer/PHPMailer/
|
||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
||||
* @author Brent R. Matzelle (original founder)
|
||||
* @copyright 2012 - 2014 Marcus Bointon
|
||||
* @copyright 2010 - 2012 Jim Jagielski
|
||||
* @copyright 2004 - 2009 Andy Prevost
|
||||
* @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
|
||||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
||||
* @note This program is distributed in the hope that it will be useful - WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* PHP POP-Before-SMTP Authentication Class
|
||||
*
|
||||
* Version 5.2.2
|
||||
*
|
||||
* @license: LGPL, see PHPMailer License
|
||||
*
|
||||
* Specifically for PHPMailer to allow POP before SMTP authentication.
|
||||
* Does not yet work with APOP - if you have an APOP account, contact Jim Jagielski
|
||||
* and we can test changes to this script.
|
||||
*
|
||||
* This class is based on the structure of the SMTP class originally authored by Chris Ryan
|
||||
*
|
||||
* This class is rfc 1939 compliant and implements all the commands
|
||||
* required for POP3 connection, authentication and disconnection.
|
||||
*
|
||||
* PHPMailer POP-Before-SMTP Authentication Class.
|
||||
* Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
|
||||
* Does not support APOP.
|
||||
* @package PHPMailer
|
||||
* @author Richard Davey (orig) <rich@corephp.co.uk>
|
||||
* @author Andy Prevost
|
||||
* @author Jim Jagielski
|
||||
* @author Richard Davey (original author) <rich@corephp.co.uk>
|
||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
||||
*/
|
||||
|
||||
class POP3 {
|
||||
class POP3
|
||||
{
|
||||
/**
|
||||
* Default POP3 port
|
||||
* @var int
|
||||
* The POP3 PHPMailer Version number.
|
||||
* @var string
|
||||
* @access public
|
||||
*/
|
||||
public $Version = '5.2.14';
|
||||
|
||||
/**
|
||||
* Default POP3 port number.
|
||||
* @var integer
|
||||
* @access public
|
||||
*/
|
||||
public $POP3_PORT = 110;
|
||||
|
||||
/**
|
||||
* Default Timeout
|
||||
* @var int
|
||||
* Default timeout in seconds.
|
||||
* @var integer
|
||||
* @access public
|
||||
*/
|
||||
public $POP3_TIMEOUT = 30;
|
||||
|
||||
/**
|
||||
* POP3 Carriage Return + Line Feed
|
||||
* POP3 Carriage Return + Line Feed.
|
||||
* @var string
|
||||
* @access public
|
||||
* @deprecated Use the constant instead
|
||||
*/
|
||||
public $CRLF = "\r\n";
|
||||
|
||||
/**
|
||||
* Displaying Debug warnings? (0 = now, 1+ = yes)
|
||||
* @var int
|
||||
* Debug display level.
|
||||
* Options: 0 = no, 1+ = yes
|
||||
* @var integer
|
||||
* @access public
|
||||
*/
|
||||
public $do_debug = 2;
|
||||
public $do_debug = 0;
|
||||
|
||||
/**
|
||||
* POP3 Mail Server
|
||||
* POP3 mail server hostname.
|
||||
* @var string
|
||||
* @access public
|
||||
*/
|
||||
public $host;
|
||||
|
||||
/**
|
||||
* POP3 Port
|
||||
* @var int
|
||||
* POP3 port number.
|
||||
* @var integer
|
||||
* @access public
|
||||
*/
|
||||
public $port;
|
||||
|
||||
/**
|
||||
* POP3 Timeout Value
|
||||
* @var int
|
||||
* POP3 Timeout Value in seconds.
|
||||
* @var integer
|
||||
* @access public
|
||||
*/
|
||||
public $tval;
|
||||
|
||||
/**
|
||||
* POP3 Username
|
||||
* POP3 username
|
||||
* @var string
|
||||
* @access public
|
||||
*/
|
||||
public $username;
|
||||
|
||||
/**
|
||||
* POP3 Password
|
||||
* POP3 password.
|
||||
* @var string
|
||||
* @access public
|
||||
*/
|
||||
public $password;
|
||||
|
||||
/**
|
||||
* Sets the POP3 PHPMailer Version number
|
||||
* @var string
|
||||
* Resource handle for the POP3 connection socket.
|
||||
* @var resource
|
||||
* @access protected
|
||||
*/
|
||||
public $Version = '5.2.2';
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// PROPERTIES, PRIVATE AND PROTECTED
|
||||
/////////////////////////////////////////////////
|
||||
protected $pop_conn;
|
||||
|
||||
/**
|
||||
* @var resource Resource handle for the POP connection socket
|
||||
* Are we connected?
|
||||
* @var boolean
|
||||
* @access protected
|
||||
*/
|
||||
private $pop_conn;
|
||||
/**
|
||||
* @var boolean Are we connected?
|
||||
*/
|
||||
private $connected;
|
||||
/**
|
||||
* @var array Error container
|
||||
*/
|
||||
private $error; // Error log array
|
||||
protected $connected = false;
|
||||
|
||||
/**
|
||||
* Constructor, sets the initial values
|
||||
* @access public
|
||||
* @return POP3
|
||||
* Error container.
|
||||
* @var array
|
||||
* @access protected
|
||||
*/
|
||||
public function __construct() {
|
||||
$this->pop_conn = 0;
|
||||
$this->connected = false;
|
||||
$this->error = null;
|
||||
}
|
||||
protected $errors = array();
|
||||
|
||||
/**
|
||||
* Combination of public events - connect, login, disconnect
|
||||
* @access public
|
||||
* @param string $host
|
||||
* @param bool|int $port
|
||||
* @param bool|int $tval
|
||||
* Line break constant
|
||||
*/
|
||||
const CRLF = "\r\n";
|
||||
|
||||
/**
|
||||
* Simple static wrapper for all-in-one POP before SMTP
|
||||
* @param $host
|
||||
* @param integer|boolean $port The port number to connect to
|
||||
* @param integer|boolean $timeout The timeout value
|
||||
* @param string $username
|
||||
* @param string $password
|
||||
* @param int $debug_level
|
||||
* @return bool
|
||||
* @param integer $debug_level
|
||||
* @return boolean
|
||||
*/
|
||||
public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
|
||||
$this->host = $host;
|
||||
public static function popBeforeSmtp(
|
||||
$host,
|
||||
$port = false,
|
||||
$timeout = false,
|
||||
$username = '',
|
||||
$password = '',
|
||||
$debug_level = 0
|
||||
) {
|
||||
$pop = new POP3;
|
||||
return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
|
||||
}
|
||||
|
||||
// If no port value is passed, retrieve it
|
||||
if ($port == false) {
|
||||
/**
|
||||
* Authenticate with a POP3 server.
|
||||
* A connect, login, disconnect sequence
|
||||
* appropriate for POP-before SMTP authorisation.
|
||||
* @access public
|
||||
* @param string $host The hostname to connect to
|
||||
* @param integer|boolean $port The port number to connect to
|
||||
* @param integer|boolean $timeout The timeout value
|
||||
* @param string $username
|
||||
* @param string $password
|
||||
* @param integer $debug_level
|
||||
* @return boolean
|
||||
*/
|
||||
public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
|
||||
{
|
||||
$this->host = $host;
|
||||
// If no port value provided, use default
|
||||
if (false === $port) {
|
||||
$this->port = $this->POP3_PORT;
|
||||
} else {
|
||||
$this->port = $port;
|
||||
$this->port = (integer)$port;
|
||||
}
|
||||
|
||||
// If no port value is passed, retrieve it
|
||||
if ($tval == false) {
|
||||
// If no timeout value provided, use default
|
||||
if (false === $timeout) {
|
||||
$this->tval = $this->POP3_TIMEOUT;
|
||||
} else {
|
||||
$this->tval = $tval;
|
||||
$this->tval = (integer)$timeout;
|
||||
}
|
||||
|
||||
$this->do_debug = $debug_level;
|
||||
$this->username = $username;
|
||||
$this->password = $password;
|
||||
|
||||
// Refresh the error log
|
||||
$this->error = null;
|
||||
|
||||
// Connect
|
||||
$result = $this->Connect($this->host, $this->port, $this->tval);
|
||||
|
||||
// Reset the error log
|
||||
$this->errors = array();
|
||||
// connect
|
||||
$result = $this->connect($this->host, $this->port, $this->tval);
|
||||
if ($result) {
|
||||
$login_result = $this->Login($this->username, $this->password);
|
||||
|
||||
$login_result = $this->login($this->username, $this->password);
|
||||
if ($login_result) {
|
||||
$this->Disconnect();
|
||||
|
||||
$this->disconnect();
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// We need to disconnect regardless if the login succeeded
|
||||
$this->Disconnect();
|
||||
|
||||
// We need to disconnect regardless of whether the login succeeded
|
||||
$this->disconnect();
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to the POP3 server
|
||||
* Connect to a POP3 server.
|
||||
* @access public
|
||||
* @param string $host
|
||||
* @param bool|int $port
|
||||
* @param integer|boolean $port
|
||||
* @param integer $tval
|
||||
* @return boolean
|
||||
*/
|
||||
public function Connect ($host, $port = false, $tval = 30) {
|
||||
public function connect($host, $port = false, $tval = 30)
|
||||
{
|
||||
// Are we already connected?
|
||||
if ($this->connected) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
On Windows this will raise a PHP Warning error if the hostname doesn't exist.
|
||||
Rather than supress it with @fsockopen, let's capture it cleanly instead
|
||||
*/
|
||||
//On Windows this will raise a PHP Warning error if the hostname doesn't exist.
|
||||
//Rather than suppress it with @fsockopen, capture it cleanly instead
|
||||
set_error_handler(array($this, 'catchWarning'));
|
||||
|
||||
set_error_handler(array(&$this, 'catchWarning'));
|
||||
if (false === $port) {
|
||||
$port = $this->POP3_PORT;
|
||||
}
|
||||
|
||||
// Connect to the POP3 server
|
||||
$this->pop_conn = fsockopen($host, // POP3 Host
|
||||
// connect to the POP3 server
|
||||
$this->pop_conn = fsockopen(
|
||||
$host, // POP3 Host
|
||||
$port, // Port #
|
||||
$errno, // Error Number
|
||||
$errstr, // Error Message
|
||||
$tval); // Timeout (seconds)
|
||||
|
||||
$tval
|
||||
); // Timeout (seconds)
|
||||
// Restore the error handler
|
||||
restore_error_handler();
|
||||
|
||||
// Does the Error Log now contain anything?
|
||||
if ($this->error && $this->do_debug >= 1) {
|
||||
$this->displayErrors();
|
||||
}
|
||||
|
||||
// Did we connect?
|
||||
if ($this->pop_conn == false) {
|
||||
if (false === $this->pop_conn) {
|
||||
// It would appear not...
|
||||
$this->error = array(
|
||||
$this->setError(array(
|
||||
'error' => "Failed to connect to server $host on port $port",
|
||||
'errno' => $errno,
|
||||
'errstr' => $errstr
|
||||
);
|
||||
|
||||
if ($this->do_debug >= 1) {
|
||||
$this->displayErrors();
|
||||
}
|
||||
|
||||
));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Increase the stream time-out
|
||||
|
||||
// Check for PHP 4.3.0 or later
|
||||
if (version_compare(phpversion(), '5.0.0', 'ge')) {
|
||||
stream_set_timeout($this->pop_conn, $tval, 0);
|
||||
} else {
|
||||
// Does not work on Windows
|
||||
if (substr(PHP_OS, 0, 3) !== 'WIN') {
|
||||
socket_set_timeout($this->pop_conn, $tval, 0);
|
||||
}
|
||||
}
|
||||
|
||||
// Get the POP3 server response
|
||||
$pop3_response = $this->getResponse();
|
||||
|
||||
// Check for the +OK
|
||||
if ($this->checkResponse($pop3_response)) {
|
||||
// The connection is established and the POP3 server is talking
|
||||
|
|
@ -277,41 +256,32 @@ class POP3 {
|
|||
}
|
||||
|
||||
/**
|
||||
* Login to the POP3 server (does not support APOP yet)
|
||||
* Log in to the POP3 server.
|
||||
* Does not support APOP (RFC 2828, 4949).
|
||||
* @access public
|
||||
* @param string $username
|
||||
* @param string $password
|
||||
* @return boolean
|
||||
*/
|
||||
public function Login ($username = '', $password = '') {
|
||||
if ($this->connected == false) {
|
||||
$this->error = 'Not connected to POP3 server';
|
||||
|
||||
if ($this->do_debug >= 1) {
|
||||
$this->displayErrors();
|
||||
public function login($username = '', $password = '')
|
||||
{
|
||||
if (!$this->connected) {
|
||||
$this->setError('Not connected to POP3 server');
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($username)) {
|
||||
$username = $this->username;
|
||||
}
|
||||
|
||||
if (empty($password)) {
|
||||
$password = $this->password;
|
||||
}
|
||||
|
||||
$pop_username = "USER $username" . $this->CRLF;
|
||||
$pop_password = "PASS $password" . $this->CRLF;
|
||||
|
||||
// Send the Username
|
||||
$this->sendString($pop_username);
|
||||
$this->sendString("USER $username" . self::CRLF);
|
||||
$pop3_response = $this->getResponse();
|
||||
|
||||
if ($this->checkResponse($pop3_response)) {
|
||||
// Send the Password
|
||||
$this->sendString($pop_password);
|
||||
$this->sendString("PASS $password" . self::CRLF);
|
||||
$pop3_response = $this->getResponse();
|
||||
|
||||
if ($this->checkResponse($pop3_response)) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -320,99 +290,118 @@ class POP3 {
|
|||
}
|
||||
|
||||
/**
|
||||
* Disconnect from the POP3 server
|
||||
* Disconnect from the POP3 server.
|
||||
* @access public
|
||||
*/
|
||||
public function Disconnect () {
|
||||
public function disconnect()
|
||||
{
|
||||
$this->sendString('QUIT');
|
||||
|
||||
fclose($this->pop_conn);
|
||||
//The QUIT command may cause the daemon to exit, which will kill our connection
|
||||
//So ignore errors here
|
||||
try {
|
||||
@fclose($this->pop_conn);
|
||||
} catch (Exception $e) {
|
||||
//Do nothing
|
||||
};
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// Private Methods
|
||||
/////////////////////////////////////////////////
|
||||
|
||||
/**
|
||||
* Get the socket response back.
|
||||
* Get a response from the POP3 server.
|
||||
* $size is the maximum number of bytes to retrieve
|
||||
* @access private
|
||||
* @param integer $size
|
||||
* @return string
|
||||
* @access protected
|
||||
*/
|
||||
private function getResponse ($size = 128) {
|
||||
$pop3_response = fgets($this->pop_conn, $size);
|
||||
|
||||
return $pop3_response;
|
||||
protected function getResponse($size = 128)
|
||||
{
|
||||
$response = fgets($this->pop_conn, $size);
|
||||
if ($this->do_debug >= 1) {
|
||||
echo "Server -> Client: $response";
|
||||
}
|
||||
return $response;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a string down the open socket connection to the POP3 server
|
||||
* @access private
|
||||
* Send raw data to the POP3 server.
|
||||
* @param string $string
|
||||
* @return integer
|
||||
* @access protected
|
||||
*/
|
||||
private function sendString ($string) {
|
||||
$bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
|
||||
|
||||
return $bytes_sent;
|
||||
protected function sendString($string)
|
||||
{
|
||||
if ($this->pop_conn) {
|
||||
if ($this->do_debug >= 2) { //Show client messages when debug >= 2
|
||||
echo "Client -> Server: $string";
|
||||
}
|
||||
return fwrite($this->pop_conn, $string, strlen($string));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks the POP3 server response for +OK or -ERR
|
||||
* @access private
|
||||
* Checks the POP3 server response.
|
||||
* Looks for for +OK or -ERR.
|
||||
* @param string $string
|
||||
* @return boolean
|
||||
* @access protected
|
||||
*/
|
||||
private function checkResponse ($string) {
|
||||
protected function checkResponse($string)
|
||||
{
|
||||
if (substr($string, 0, 3) !== '+OK') {
|
||||
$this->error = array(
|
||||
$this->setError(array(
|
||||
'error' => "Server reported an error: $string",
|
||||
'errno' => 0,
|
||||
'errstr' => ''
|
||||
);
|
||||
|
||||
if ($this->do_debug >= 1) {
|
||||
$this->displayErrors();
|
||||
}
|
||||
|
||||
));
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* If debug is enabled, display the error message array
|
||||
* @access private
|
||||
* Add an error to the internal error store.
|
||||
* Also display debug output if it's enabled.
|
||||
* @param $error
|
||||
* @access protected
|
||||
*/
|
||||
private function displayErrors () {
|
||||
protected function setError($error)
|
||||
{
|
||||
$this->errors[] = $error;
|
||||
if ($this->do_debug >= 1) {
|
||||
echo '<pre>';
|
||||
|
||||
foreach ($this->error as $single_error) {
|
||||
print_r($single_error);
|
||||
foreach ($this->errors as $error) {
|
||||
print_r($error);
|
||||
}
|
||||
|
||||
echo '</pre>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Takes over from PHP for the socket warning handler
|
||||
* @access private
|
||||
* Get an array of error messages, if any.
|
||||
* @return array
|
||||
*/
|
||||
public function getErrors()
|
||||
{
|
||||
return $this->errors;
|
||||
}
|
||||
|
||||
/**
|
||||
* POP3 connection error handler.
|
||||
* @param integer $errno
|
||||
* @param string $errstr
|
||||
* @param string $errfile
|
||||
* @param integer $errline
|
||||
* @access protected
|
||||
*/
|
||||
private function catchWarning ($errno, $errstr, $errfile, $errline) {
|
||||
$this->error[] = array(
|
||||
protected function catchWarning($errno, $errstr, $errfile, $errline)
|
||||
{
|
||||
$this->setError(array(
|
||||
'error' => "Connecting to the POP3 server raised a PHP warning: ",
|
||||
'errno' => $errno,
|
||||
'errstr' => $errstr
|
||||
);
|
||||
'errstr' => $errstr,
|
||||
'errfile' => $errfile,
|
||||
'errline' => $errline
|
||||
));
|
||||
}
|
||||
|
||||
// End of class
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue