| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  | <?php | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  | /** | 
					
						
							|  |  |  |  *  PEAR's Mail:: interface. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * PHP versions 4 and 5 | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * LICENSE: | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (c) 2002-2007, Richard Heyes | 
					
						
							|  |  |  |  * All rights reserved. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Redistribution and use in source and binary forms, with or without | 
					
						
							|  |  |  |  * modification, are permitted provided that the following conditions | 
					
						
							|  |  |  |  * are met: | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * o Redistributions of source code must retain the above copyright | 
					
						
							|  |  |  |  *   notice, this list of conditions and the following disclaimer. | 
					
						
							|  |  |  |  * o Redistributions in binary form must reproduce the above copyright | 
					
						
							|  |  |  |  *   notice, this list of conditions and the following disclaimer in the | 
					
						
							|  |  |  |  *   documentation and/or other materials provided with the distribution. | 
					
						
							|  |  |  |  * o The names of the authors may not be used to endorse or promote | 
					
						
							|  |  |  |  *   products derived from this software without specific prior written | 
					
						
							|  |  |  |  *   permission. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 
					
						
							|  |  |  |  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 
					
						
							|  |  |  |  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
					
						
							|  |  |  |  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 
					
						
							|  |  |  |  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
					
						
							|  |  |  |  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
					
						
							|  |  |  |  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
					
						
							|  |  |  |  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
					
						
							|  |  |  |  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
					
						
							|  |  |  |  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
					
						
							|  |  |  |  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * @category    Mail | 
					
						
							|  |  |  |  * @package     Mail | 
					
						
							|  |  |  |  * @author      Chuck Hagenbuch <chuck@horde.org> | 
					
						
							|  |  |  |  * @copyright   1997-2010 Chuck Hagenbuch | 
					
						
							|  |  |  |  * @license     http://opensource.org/licenses/bsd-license.php New BSD License | 
					
						
							|  |  |  |  * @version     CVS: $Id: Mail.php 294747 2010-02-08 08:18:33Z clockwerx $ | 
					
						
							|  |  |  |  * @link        http://pear.php.net/package/Mail/ | 
					
						
							|  |  |  |  */ | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  | 
 | 
					
						
							|  |  |  | require_once 'PEAR.php'; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /** | 
					
						
							|  |  |  |  * PEAR's Mail:: interface. Defines the interface for implementing | 
					
						
							|  |  |  |  * mailers under the PEAR hierarchy, and provides supporting functions | 
					
						
							|  |  |  |  * useful in multiple mailer backends. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * @access public | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |  * @version $Revision: 294747 $ | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  |  * @package Mail | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | class Mail | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     /** | 
					
						
							|  |  |  |      * Line terminator used for separating header lines. | 
					
						
							|  |  |  |      * @var string | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     var $sep = "\r\n"; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /** | 
					
						
							|  |  |  |      * Provides an interface for generating Mail:: objects of various | 
					
						
							|  |  |  |      * types | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param string $driver The kind of Mail:: object to instantiate. | 
					
						
							|  |  |  |      * @param array  $params The parameters to pass to the Mail:: object. | 
					
						
							|  |  |  |      * @return object Mail a instance of the driver class or if fails a PEAR Error | 
					
						
							|  |  |  |      * @access public | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     function &factory($driver, $params = array()) | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         $driver = strtolower($driver); | 
					
						
							|  |  |  |         @include_once 'Mail/' . $driver . '.php'; | 
					
						
							|  |  |  |         $class = 'Mail_' . $driver; | 
					
						
							|  |  |  |         if (class_exists($class)) { | 
					
						
							|  |  |  |             $mailer = new $class($params); | 
					
						
							|  |  |  |             return $mailer; | 
					
						
							|  |  |  |         } else { | 
					
						
							|  |  |  |             return PEAR::raiseError('Unable to find class for driver ' . $driver); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /** | 
					
						
							|  |  |  |      * Implements Mail::send() function using php's built-in mail() | 
					
						
							|  |  |  |      * command. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param mixed $recipients Either a comma-seperated list of recipients | 
					
						
							|  |  |  |      *              (RFC822 compliant), or an array of recipients, | 
					
						
							|  |  |  |      *              each RFC822 valid. This may contain recipients not | 
					
						
							|  |  |  |      *              specified in the headers, for Bcc:, resending | 
					
						
							|  |  |  |      *              messages, etc. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param array $headers The array of headers to send with the mail, in an | 
					
						
							|  |  |  |      *              associative array, where the array key is the | 
					
						
							|  |  |  |      *              header name (ie, 'Subject'), and the array value | 
					
						
							|  |  |  |      *              is the header value (ie, 'test'). The header | 
					
						
							|  |  |  |      *              produced from those values would be 'Subject: | 
					
						
							|  |  |  |      *              test'. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param string $body The full text of the message body, including any | 
					
						
							|  |  |  |      *               Mime parts, etc. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @return mixed Returns true on success, or a PEAR_Error | 
					
						
							|  |  |  |      *               containing a descriptive error message on | 
					
						
							|  |  |  |      *               failure. | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |      * | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  |      * @access public | 
					
						
							|  |  |  |      * @deprecated use Mail_mail::send instead | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     function send($recipients, $headers, $body) | 
					
						
							|  |  |  |     { | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |         if (!is_array($headers)) { | 
					
						
							|  |  |  |             return PEAR::raiseError('$headers must be an array'); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         $result = $this->_sanitizeHeaders($headers); | 
					
						
							|  |  |  |         if (is_a($result, 'PEAR_Error')) { | 
					
						
							|  |  |  |             return $result; | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  | 
 | 
					
						
							|  |  |  |         // if we're passed an array of recipients, implode it.
 | 
					
						
							|  |  |  |         if (is_array($recipients)) { | 
					
						
							|  |  |  |             $recipients = implode(', ', $recipients); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         // get the Subject out of the headers array so that we can
 | 
					
						
							|  |  |  |         // pass it as a seperate argument to mail().
 | 
					
						
							|  |  |  |         $subject = ''; | 
					
						
							|  |  |  |         if (isset($headers['Subject'])) { | 
					
						
							|  |  |  |             $subject = $headers['Subject']; | 
					
						
							|  |  |  |             unset($headers['Subject']); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         // flatten the headers out.
 | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |         list(, $text_headers) = Mail::prepareHeaders($headers); | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  | 
 | 
					
						
							|  |  |  |         return mail($recipients, $subject, $body, $text_headers); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /** | 
					
						
							|  |  |  |      * Sanitize an array of mail headers by removing any additional header | 
					
						
							|  |  |  |      * strings present in a legitimate header's value.  The goal of this | 
					
						
							|  |  |  |      * filter is to prevent mail injection attacks. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param array $headers The associative array of headers to sanitize. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @access private | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     function _sanitizeHeaders(&$headers) | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         foreach ($headers as $key => $value) { | 
					
						
							|  |  |  |             $headers[$key] = | 
					
						
							|  |  |  |                 preg_replace('=((<CR>|<LF>|0x0A/%0A|0x0D/%0D|\\n|\\r)\S).*=i', | 
					
						
							|  |  |  |                              null, $value); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /** | 
					
						
							|  |  |  |      * Take an array of mail headers and return a string containing | 
					
						
							|  |  |  |      * text usable in sending a message. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param array $headers The array of headers to prepare, in an associative | 
					
						
							|  |  |  |      *              array, where the array key is the header name (ie, | 
					
						
							|  |  |  |      *              'Subject'), and the array value is the header | 
					
						
							|  |  |  |      *              value (ie, 'test'). The header produced from those | 
					
						
							|  |  |  |      *              values would be 'Subject: test'. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @return mixed Returns false if it encounters a bad address, | 
					
						
							|  |  |  |      *               otherwise returns an array containing two | 
					
						
							|  |  |  |      *               elements: Any From: address found in the headers, | 
					
						
							|  |  |  |      *               and the plain text version of the headers. | 
					
						
							|  |  |  |      * @access private | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     function prepareHeaders($headers) | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         $lines = array(); | 
					
						
							|  |  |  |         $from = null; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         foreach ($headers as $key => $value) { | 
					
						
							|  |  |  |             if (strcasecmp($key, 'From') === 0) { | 
					
						
							|  |  |  |                 include_once 'Mail/RFC822.php'; | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |                 $parser = new Mail_RFC822(); | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  |                 $addresses = $parser->parseAddressList($value, 'localhost', false); | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |                 if (is_a($addresses, 'PEAR_Error')) { | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  |                     return $addresses; | 
					
						
							|  |  |  |                 } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 $from = $addresses[0]->mailbox . '@' . $addresses[0]->host; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 // Reject envelope From: addresses with spaces.
 | 
					
						
							|  |  |  |                 if (strstr($from, ' ')) { | 
					
						
							|  |  |  |                     return false; | 
					
						
							|  |  |  |                 } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |                 $lines[] = $key . ': ' . $value; | 
					
						
							|  |  |  |             } elseif (strcasecmp($key, 'Received') === 0) { | 
					
						
							|  |  |  |                 $received = array(); | 
					
						
							|  |  |  |                 if (is_array($value)) { | 
					
						
							|  |  |  |                     foreach ($value as $line) { | 
					
						
							|  |  |  |                         $received[] = $key . ': ' . $line; | 
					
						
							|  |  |  |                     } | 
					
						
							|  |  |  |                 } | 
					
						
							|  |  |  |                 else { | 
					
						
							|  |  |  |                     $received[] = $key . ': ' . $value; | 
					
						
							|  |  |  |                 } | 
					
						
							|  |  |  |                 // Put Received: headers at the top.  Spam detectors often
 | 
					
						
							|  |  |  |                 // flag messages with Received: headers after the Subject:
 | 
					
						
							|  |  |  |                 // as spam.
 | 
					
						
							|  |  |  |                 $lines = array_merge($received, $lines); | 
					
						
							|  |  |  |             } else { | 
					
						
							|  |  |  |                 // If $value is an array (i.e., a list of addresses), convert
 | 
					
						
							|  |  |  |                 // it to a comma-delimited string of its elements (addresses).
 | 
					
						
							|  |  |  |                 if (is_array($value)) { | 
					
						
							|  |  |  |                     $value = implode(', ', $value); | 
					
						
							|  |  |  |                 } | 
					
						
							|  |  |  |                 $lines[] = $key . ': ' . $value; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         return array($from, join($this->sep, $lines)); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /** | 
					
						
							|  |  |  |      * Take a set of recipients and parse them, returning an array of | 
					
						
							|  |  |  |      * bare addresses (forward paths) that can be passed to sendmail | 
					
						
							|  |  |  |      * or an smtp server with the rcpt to: command. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @param mixed Either a comma-seperated list of recipients | 
					
						
							|  |  |  |      *              (RFC822 compliant), or an array of recipients, | 
					
						
							|  |  |  |      *              each RFC822 valid. | 
					
						
							|  |  |  |      * | 
					
						
							|  |  |  |      * @return mixed An array of forward paths (bare addresses) or a PEAR_Error | 
					
						
							|  |  |  |      *               object if the address list could not be parsed. | 
					
						
							|  |  |  |      * @access private | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     function parseRecipients($recipients) | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         include_once 'Mail/RFC822.php'; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         // if we're passed an array, assume addresses are valid and
 | 
					
						
							|  |  |  |         // implode them before parsing.
 | 
					
						
							|  |  |  |         if (is_array($recipients)) { | 
					
						
							|  |  |  |             $recipients = implode(', ', $recipients); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         // Parse recipients, leaving out all personal info. This is
 | 
					
						
							|  |  |  |         // for smtp recipients, etc. All relevant personal information
 | 
					
						
							|  |  |  |         // should already be in the headers.
 | 
					
						
							|  |  |  |         $addresses = Mail_RFC822::parseAddressList($recipients, 'localhost', false); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         // If parseAddressList() returned a PEAR_Error object, just return it.
 | 
					
						
							| 
									
										
											  
											
												extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).
PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
											
										 
											2010-05-03 16:49:59 -07:00
										 |  |  |         if (is_a($addresses, 'PEAR_Error')) { | 
					
						
							| 
									
										
										
										
											2008-09-30 09:38:47 -04:00
										 |  |  |             return $addresses; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         $recipients = array(); | 
					
						
							|  |  |  |         if (is_array($addresses)) { | 
					
						
							|  |  |  |             foreach ($addresses as $ob) { | 
					
						
							|  |  |  |                 $recipients[] = $ob->mailbox . '@' . $ob->host; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         return $recipients; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | } |