/*~ class.phpmailer.php
.---------------------------------------------------------------------------.
| Software: PHPMailer - PHP email class |
-| Version: 2.0.3 |
+| Version: 2.0.4 |
| Contact: via sourceforge.net support pages (also www.codeworxtech.com) |
| Info: http://phpmailer.sourceforge.net |
| Support: http://sourceforge.net/projects/phpmailer/ |
* PHPMailer - PHP email transport class
* @package PHPMailer
* @author Andy Prevost
- * @copyright 2004 - 2008 Andy Prevost
+ * @copyright 2004 - 2009 Andy Prevost
*/
class PHPMailer {
* characters.
* @var int
*/
- var $WordWrap = '0';
+ var $WordWrap = 0;
/**
* Method to send mail: ("mail", "sendmail", or "smtp").
* Holds PHPMailer version.
* @var string
*/
- var $Version = "2.0.3";
+ var $Version = "2.0.4";
/**
* Sets the email address that a reading confirmation will be sent.
var $Hostname = '';
/**
- * Sets the message id to be used in the Message-Id header.
+ * Sets the message ID to be used in the Message-Id header.
* If empty, a unique id will be generated.
* @var string
*/
var $message_type = '';
var $boundary = array();
var $language = array();
- var $error_count = '0';
- var $LE = "\r\n";
+ var $error_count = 0;
+ var $LE = "\n";
var $sign_cert_file = "";
var $sign_key_file = "";
var $sign_key_pass = "";
$this->ContentType = 'multipart/alternative';
}
- $this->error_count = '0'; // reset errors
+ $this->error_count = 0; // reset errors
$this->SetMessageType();
$header .= $this->CreateHeader();
$body = $this->CreateBody();
function MailSend($header, $body) {
$to = '';
- for($i = '0'; $i < count($this->to); $i++) {
+ for($i = 0; $i < count($this->to); $i++) {
if($i != 0) { $to .= ', '; }
$to .= $this->AddrFormat($this->to[$i]);
}
}
/* Attempt to send attach all recipients */
- for($i = '0'; $i < count($this->to); $i++) {
+ for($i = 0; $i < count($this->to); $i++) {
if(!$this->smtp->Recipient($this->to[$i][0])) {
$bad_rcpt[] = $this->to[$i][0];
}
}
- for($i = '0'; $i < count($this->cc); $i++) {
+ for($i = 0; $i < count($this->cc); $i++) {
if(!$this->smtp->Recipient($this->cc[$i][0])) {
$bad_rcpt[] = $this->cc[$i][0];
}
}
- for($i = '0'; $i < count($this->bcc); $i++) {
+ for($i = 0; $i < count($this->bcc); $i++) {
if(!$this->smtp->Recipient($this->bcc[$i][0])) {
$bad_rcpt[] = $this->bcc[$i][0];
}
}
if(count($bad_rcpt) > 0) { // Create error message
- for($i = '0'; $i < count($bad_rcpt); $i++) {
+ for($i = 0; $i < count($bad_rcpt); $i++) {
if($i != 0) {
$error .= ', ';
}
$this->smtp->do_debug = $this->SMTPDebug;
$hosts = explode(';', $this->Host);
- $index = '0';
+ $index = 0;
$connection = ($this->smtp->Connected());
/* Retry while there is no connection */
while($index < count($hosts) && $connection == false) {
$hostinfo = array();
- if(isInStringIgnoreCase('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
+ if(eregi('^(.+):([0-9]+)$', $hosts[$index], $hostinfo)) {
$host = $hostinfo[1];
$port = $hostinfo[2];
} else {
for ($i=0 ;$i < count($line); $i++) {
$line_part = explode(' ', $line[$i]);
$buf = '';
- for ($e = '0'; $e<count($line_part); $e++) {
+ for ($e = 0; $e<count($line_part); $e++) {
$word = $line_part[$e];
if ($qp_mode and (strlen($word) > $length)) {
$space_left = $length - strlen($buf) - 1;
}
} else {
$buf_o = $buf;
- $buf .= ($e == '0') ? $word : (' ' . $word);
+ $buf .= ($e == 0) ? $word : (' ' . $word);
if (strlen($buf) > $length and $buf_o != '') {
$message .= $buf_o . $soft_break;
if ($dec < 128) { // Single byte character.
// If the encoded char was found at pos 0, it will fit
// otherwise reduce maxLength to start of the encoded char
- $maxLength = ($encodedCharPos == '0') ? $maxLength :
+ $maxLength = ($encodedCharPos == 0) ? $maxLength :
$maxLength - ($lookBack - $encodedCharPos);
$foundSplitPos = true;
} elseif ($dec >= 192) { // First byte of a multi byte character
if($this->Mailer != 'mail') {
if(count($this->to) > 0) {
$result .= $this->AddrAppend('To', $this->to);
- } elseif (count($this->cc) == '0') {
+ } elseif (count($this->cc) == 0) {
$result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
}
}
}
if($this->MessageID != '') {
- $result .= $this->HeaderLine('Message-Id',$this->MessageID);
+ $result .= $this->HeaderLine('Message-ID',$this->MessageID);
} else {
- $result .= sprintf("Message-Id: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+ $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
}
$result .= $this->HeaderLine('X-Priority', $this->Priority);
$result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version ' . $this->Version . ']');
}
// Add custom headers
- for($index = '0'; $index < count($this->CustomHeader); $index++) {
+ for($index = 0; $index < count($this->CustomHeader); $index++) {
$result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
}
if (!$this->sign_key_file) {
$this->attachment[$cur][4] = $type;
$this->attachment[$cur][5] = false; // isStringAttachment
$this->attachment[$cur][6] = 'attachment';
- $this->attachment[$cur][7] = '0';
+ $this->attachment[$cur][7] = 0;
return true;
}
$mime = array();
/* Add all attachments */
- for($i = '0'; $i < count($this->attachment); $i++) {
+ for($i = 0; $i < count($this->attachment); $i++) {
/* Check for string attachment */
$bString = $this->attachment[$i][5];
if ($bString) {
$mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
if($disposition == 'inline') {
- $mime[] = sprintf("Content-Id: <%s>%s", $cid, $this->LE);
+ $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
}
$mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
* @return string
*/
function EncodeHeader ($str, $position = 'text') {
- $x = '0';
+ $x = 0;
switch (strtolower($position)) {
case 'phrase':
break;
}
- if ($x == '0') {
+ if ($x == 0) {
return ($str);
}
// Base64 has a 4:3 ratio
$offset = $avgLength = floor($length * $ratio * .75);
- for ($i = '0'; $i < $mb_length; $i += $offset) {
- $lookBack = '0';
+ for ($i = 0; $i < $mb_length; $i += $offset) {
+ $lookBack = 0;
do {
$offset = $avgLength - $lookBack;
while( list(, $line) = each($lines) ) {
$linlen = strlen($line);
$newline = '';
- for($i = '0'; $i < $linlen; $i++) {
+ for($i = 0; $i < $linlen; $i++) {
$c = substr( $line, $i, 1 );
$dec = ord( $c );
- if ( ( $i == '0' ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+ if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
$c = '=2E';
}
if ( $dec == 32 ) {
$this->attachment[$cur][4] = $type;
$this->attachment[$cur][5] = true; // isString
$this->attachment[$cur][6] = 'attachment';
- $this->attachment[$cur][7] = '0';
+ $this->attachment[$cur][7] = 0;
}
/**
* image type. For JPEG images use "image/jpeg" and for GIF images
* use "image/gif".
* @param string $path Path to the attachment.
- * @param string $cid Content id of the attachment. Use this to identify
+ * @param string $cid Content ID of the attachment. Use this to identify
* the Id for accessing the image in an HTML form.
* @param string $name Overrides the attachment name.
* @param string $encoding File encoding (see $Encoding).
*/
function InlineImageExists() {
$result = false;
- for($i = '0'; $i < count($this->attachment); $i++) {
+ for($i = 0; $i < count($this->attachment); $i++) {
if($this->attachment[$i][6] == 'inline') {
$result = true;
break;
projects / mailer.git / blobdiff