[ci skip] Misc cleanup of CI_Email code

1 files changed, 64 insertions, 101 deletions

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 73bf7ffdd..1dcafeddd 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1663,8 +1663,8 @@ class CI_Email {
 			$this->reply_to($this->_headers['From']);
 		}
 
-		if ( ! isset($this->_recipients) && ! isset($this->_headers['To'])
-			&& ! isset($this->_bcc_array) && ! isset($this->_headers['Bcc'])
+		if (empty($this->_recipients) && ! isset($this->_headers['To'])
+			&& empty($this->_bcc_array) && ! isset($this->_headers['Bcc'])
 			&& ! isset($this->_headers['Cc']))
 		{
 			$this->_set_error_message('lang:email_no_recipients');
@@ -1935,27 +1935,21 @@ class CI_Email {
 			}
 		}
 
-		if (count($this->_cc_array) > 0)
+		foreach ($this->_cc_array as $val)
 		{
-			foreach ($this->_cc_array as $val)
+			if ($val !== '' && ! $this->_send_command('to', $val))
 			{
-				if ($val !== '' && ! $this->_send_command('to', $val))
-				{
-					$this->_smtp_end();
-					return FALSE;
-				}
+				$this->_smtp_end();
+				return FALSE;
 			}
 		}
 
-		if (count($this->_bcc_array) > 0)
+		foreach ($this->_bcc_array as $val)
 		{
-			foreach ($this->_bcc_array as $val)
+			if ($val !== '' && ! $this->_send_command('to', $val))
 			{
-				if ($val !== '' && ! $this->_send_command('to', $val))
-				{
-					$this->_smtp_end();
-					return FALSE;
-				}
+				$this->_smtp_end();
+				return FALSE;
 			}
 		}
 
@@ -1969,7 +1963,6 @@ class CI_Email {
 		$this->_send_data($this->_header_str.preg_replace('/^\./m', '..$1', $this->_finalbody));
 
 		$this->_send_data('.');
-
 		$reply = $this->_get_smtp_data();
 		$this->_set_error_message($reply);
 
@@ -1995,9 +1988,7 @@ class CI_Email {
 	 */
 	protected function _smtp_end()
 	{
-		($this->smtp_keepalive)
-			? $this->_send_command('reset')
-			: $this->_send_command('quit');
+		$this->_send_command($this->smtp_keepalive ? 'reset' : 'quit');
 	}
 
 	// --------------------------------------------------------------------
@@ -2016,11 +2007,13 @@ class CI_Email {
 
 		$ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : '';
 
-		$this->_smtp_connect = fsockopen($ssl.$this->smtp_host,
-							$this->smtp_port,
-							$errno,
-							$errstr,
-							$this->smtp_timeout);
+		$this->_smtp_connect = fsockopen(
+			$ssl.$this->smtp_host,
+			$this->smtp_port,
+			$errno,
+			$errstr,
+			$this->smtp_timeout
+		);
 
 		if ( ! is_resource($this->_smtp_connect))
 		{
@@ -2061,57 +2054,49 @@ class CI_Email {
 	{
 		switch ($cmd)
 		{
-			case 'hello' :
-
-						if ($this->_smtp_auth OR $this->_get_encoding() === '8bit')
-						{
-							$this->_send_data('EHLO '.$this->_get_hostname());
-						}
-						else
-						{
-							$this->_send_data('HELO '.$this->_get_hostname());
-						}
-
-						$resp = 250;
-			break;
-			case 'starttls'	:
-
-						$this->_send_data('STARTTLS');
-						$resp = 220;
-			break;
-			case 'from' :
-
-						$this->_send_data('MAIL FROM:<'.$data.'>');
-						$resp = 250;
-			break;
-			case 'to' :
-
-						if ($this->dsn)
-						{
-							$this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
-						}
-						else
-						{
-							$this->_send_data('RCPT TO:<'.$data.'>');
-						}
-
-						$resp = 250;
-			break;
-			case 'data'	:
-
-						$this->_send_data('DATA');
-						$resp = 354;
-			break;
-			case 'reset':
-
-						$this->_send_data('RSET');
-						$resp = 250;
-			break;
-			case 'quit'	:
+			case 'hello':
+				if ($this->_smtp_auth OR $this->_get_encoding() === '8bit')
+				{
+					$this->_send_data('EHLO '.$this->_get_hostname());
+				}
+				else
+				{
+					$this->_send_data('HELO '.$this->_get_hostname());
+				}
 
-						$this->_send_data('QUIT');
-						$resp = 221;
-			break;
+				$resp = 250;
+				break;
+			case 'starttls':
+				$this->_send_data('STARTTLS');
+				$resp = 220;
+				break;
+			case 'from':
+				$this->_send_data('MAIL FROM:<'.$data.'>');
+				$resp = 250;
+				break;
+			case 'to':
+				if ($this->dsn)
+				{
+					$this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
+				}
+				else
+				{
+					$this->_send_data('RCPT TO:<'.$data.'>');
+				}
+				$resp = 250;
+				break;
+			case 'data':
+				$this->_send_data('DATA');
+				$resp = 354;
+				break;
+			case 'reset':
+				$this->_send_data('RSET');
+				$resp = 250;
+				break;
+			case 'quit':
+				$this->_send_data('QUIT');
+				$resp = 221;
+				break;
 		}
 
 		$reply = $this->_get_smtp_data();
@@ -2153,7 +2138,6 @@ class CI_Email {
 		}
 
 		$this->_send_data('AUTH LOGIN');
-
 		$reply = $this->_get_smtp_data();
 
 		if (strpos($reply, '503') === 0)	// Already authenticated
@@ -2167,7 +2151,6 @@ class CI_Email {
 		}
 
 		$this->_send_data(base64_encode($this->smtp_user));
-
 		$reply = $this->_get_smtp_data();
 
 		if (strpos($reply, '334') !== 0)
@@ -2177,7 +2160,6 @@ class CI_Email {
 		}
 
 		$this->_send_data(base64_encode($this->smtp_pass));
-
 		$reply = $this->_get_smtp_data();
 
 		if (strpos($reply, '235') !== 0)
@@ -2300,34 +2282,15 @@ class CI_Email {
 	 */
 	public function print_debugger($include = array('headers', 'subject', 'body'))
 	{
-		$msg = '';
-
-		if (count($this->_debug_msg) > 0)
-		{
-			foreach ($this->_debug_msg as $val)
-			{
-				$msg .= $val;
-			}
-		}
+		$msg = implode('', $this->_debug_msg);
 
 		// Determine which parts of our raw data needs to be printed
 		$raw_data = '';
 		is_array($include) OR $include = array($include);
 
-		if (in_array('headers', $include, TRUE))
-		{
-			$raw_data = htmlspecialchars($this->_header_str)."\n";
-		}
-
-		if (in_array('subject', $include, TRUE))
-		{
-			$raw_data .= htmlspecialchars($this->_subject)."\n";
-		}
-
-		if (in_array('body', $include, TRUE))
-		{
-			$raw_data .= htmlspecialchars($this->_finalbody);
-		}
+		in_array('headers', $include, TRUE) && $raw_data  = htmlspecialchars($this->_header_str)."\n";
+		in_array('subject', $include, TRUE) && $raw_data .= htmlspecialchars($this->_subject)."\n";
+		in_array('body', $include, TRUE)    && $raw_data .= htmlspecialchars($this->_finalbody);
 
 		return $msg.($raw_data === '' ? '' : '<pre>'.$raw_data.'</pre>');
 	}