Skip to content

Commit

Permalink
Remove extra new lines
Browse files Browse the repository at this point in the history
  • Loading branch information
vkeranov committed Oct 27, 2012
1 parent bfbe8b2 commit 7e4356b
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions system/libraries/Email.php
Expand Up @@ -47,20 +47,20 @@ class CI_Email {
public $smtp_port = 25; // SMTP Port public $smtp_port = 25; // SMTP Port
public $smtp_timeout = 5; // SMTP Timeout in seconds public $smtp_timeout = 5; // SMTP Timeout in seconds
public $smtp_crypto = ''; // SMTP Encryption. Can be null, tls or ssl. public $smtp_crypto = ''; // SMTP Encryption. Can be null, tls or ssl.
public $wordwrap = TRUE; // TRUE/FALSE Turns word-wrap on/off public $wordwrap = TRUE; // TRUE/FALSE - Turns word-wrap on/off
public $wrapchars = 76; // Number of characters to wrap at. public $wrapchars = 76; // Number of characters to wrap at.
public $mailtype = 'text'; // text/html Defines email formatting public $mailtype = 'text'; // text/html - Defines email formatting
public $charset = 'utf-8'; // Default char set: iso-8859-1 or us-ascii public $charset = 'utf-8'; // Default char set: iso-8859-1 or us-ascii
public $multipart = 'mixed'; // "mixed" (in the body) or "related" (separate) public $multipart = 'mixed'; // "mixed" (in the body) or "related" (separate)
public $alt_message = ''; // Alternative message for HTML emails public $alt_message = ''; // Alternative message for HTML emails
public $validate = FALSE; // TRUE/FALSE. Enables email validation public $validate = FALSE; // TRUE/FALSE - Enables email validation
public $priority = 3; // Default priority (1 - 5) public $priority = 3; // Default priority (1 - 5)
public $newline = "\n"; // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822) public $newline = "\n"; // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
public $crlf = "\n"; // The RFC 2045 compliant CRLF for quoted-printable is "\r\n". Apparently some servers, public $crlf = "\n"; // The RFC 2045 compliant CRLF for quoted-printable is "\r\n". Apparently some servers,
// even on the receiving end think they need to muck with CRLFs, so using "\n", while // even on the receiving end think they need to muck with CRLFs, so using "\n", while
// distasteful, is the only thing that seems to work for all environments. // distasteful, is the only thing that seems to work for all environments.
public $dsn = FALSE; // Delivery Status Notification public $dsn = FALSE; // Delivery Status Notification
public $send_multipart = TRUE; // TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override. Set to FALSE for Yahoo. public $send_multipart = TRUE; // TRUE/FALSE - Yahoo does not like multipart alternative, so this is an override. Set to FALSE for Yahoo.
public $bcc_batch_mode = FALSE; // TRUE/FALSE - Turns on/off Bcc batch feature public $bcc_batch_mode = FALSE; // TRUE/FALSE - Turns on/off Bcc batch feature
public $bcc_batch_size = 200; // If bcc_batch_mode = TRUE, sets max number of Bccs in each batch public $bcc_batch_size = 200; // If bcc_batch_mode = TRUE, sets max number of Bccs in each batch


Expand Down Expand Up @@ -989,7 +989,6 @@ protected function _build_message()
$this->_finalbody = $hdr.$this->_finalbody; $this->_finalbody = $hdr.$this->_finalbody;
} }



if ($this->send_multipart !== FALSE) if ($this->send_multipart !== FALSE)
{ {
$this->_finalbody .= '--'.$this->_alt_boundary.'--'; $this->_finalbody .= '--'.$this->_alt_boundary.'--';
Expand Down Expand Up @@ -1661,7 +1660,7 @@ protected function _send_command($cmd, $data = '')
// -------------------------------------------------------------------- // --------------------------------------------------------------------


/** /**
* SMTP Authenticate * SMTP Authenticate
* *
* @return bool * @return bool
*/ */
Expand Down

0 comments on commit 7e4356b

Please sign in to comment.