Version 4.7.0

system/Email/Outgoing/Php.php

@@ -35,7 +35,12 @@ class _PHP extends \IPS\Email
 	 * @throws	\IPS\Email\Outgoing\Exception
 	 */
 	public function _send( $to, $cc=array(), $bcc=array(), $fromEmail = NULL, $fromName = NULL, $additionalHeaders = array() )
-	{				
+	{
+        if( !\function_exists( 'mail' ) )
+        {
+            throw new \IPS\Email\Outgoing\Exception( 'email_test_mailfunction_disabled' );
+        }
+
 		$boundary = "--==_mimepart_" . md5( mt_rand() );
 		
 		$subject = $this->compileSubject( static::_getMemberFromRecipients( $to ) );
@@ -50,7 +55,7 @@ class _PHP extends \IPS\Email
 		
 		try
 		{			
-			if ( !mail( $this->_parseRecipients( $to, TRUE ), static::encodeHeader( $subject ), $this->_compileMessage( static::_getMemberFromRecipients( $to ), $boundary, PHP_EOL, 68 ), implode( PHP_EOL, $headers ), \IPS\Settings::i()->php_mail_extra ) )
+			if ( !mail( $this->_parseRecipients( $to, TRUE ), static::encodeHeader( $subject ), $this->_compileMessage( static::_getMemberFromRecipients( $to ), $boundary, "\r\n", 68 ), implode( "\r\n", $headers ), \IPS\Settings::i()->php_mail_extra ) )
 			{
 				if ( $error = \IPS\IPS::$lastError )
 				{