Version 4.7.13

system/Email/Email.php

@@ -113,6 +113,36 @@ abstract class _Email
 			return 'IPS\Email\Outgoing\Php';
 		}
 	}
+
+	/**
+	 * Whether the IPS CIC email system is used. Only affects IPS Cloud Installs
+	 *
+	 * @param   string|null     $type       The type of email
+	 *
+	 * @return bool
+	 */
+	public static function usingCicEmail( ?string $type ) : bool
+	{
+		return false;
+	}
+
+	/**
+	 * Whether an email is registered as blocked by the current email platform (probably only implemented on cloud)
+	 *
+	 * @param 	string 		$email		The email
+	 * @param 	string|null $type		The type of email
+	 *
+	 * @return 	bool
+	 */
+	public static function emailIsBlocked( string $email, ?string $type = null ) : bool
+	{
+		$type = $type ?: static::TYPE_TRANSACTIONAL;
+		if ( !is_subclass_of( \get_called_class(), '\IPS\Email' ) )
+		{
+			return static::classToUse( $type )::emailIsBlocked( $email, $type );
+		}
+		return false;
+	}
 	
 	/**
 	 * Factory
@@ -720,12 +750,6 @@ abstract class _Email
 	 */
 	public function send( $to, $cc=array(), $bcc=array(), $fromEmail = NULL, $fromName = NULL, $additionalHeaders = array(), $autoSubmitted = TRUE, $updateAds = TRUE )
 	{
-		/* Check we have recipients */
-		if ( !static::_parseRecipients( $to, TRUE ) )
-		{
-			return;
-		}
-		
 		/* Send the email */
 		try
 		{
@@ -1158,6 +1182,7 @@ abstract class _Email
 	 *
 	 * @param	string|array|\IPS\Member	$data		The member or email address, or array of members or email addresses, to send to
 	 * @param	bool						$emailOnly	If TRUE, will use email only rather than names too. Set to TRUE for the "To" header
+	 *
 	 * @return	string
 	 * @see		<a href='http://www.faqs.org/rfcs/rfc2822.html'>RFC 2822</a>
 	 */

system/Email/Incoming/Email.php

@@ -243,7 +243,7 @@ class _Email
             }
 
 			/* We need to convert the text to UTF-8 if it is not already */
-			if ( mb_strtolower( $charset ) != 'utf-8' )
+			if ( mb_strtolower( $charset ) != 'utf-8' and ( in_array( mb_strtolower( $charset ), array_map( 'mb_strtolower', mb_list_encodings() ) ) ) )
 			{
 				$text = mb_convert_encoding( $text, 'UTF-8', mb_strtoupper( $charset ) );
 			}

system/Email/Outgoing/Exception.php

@@ -42,13 +42,7 @@ class _Exception extends \RuntimeException
 		/* Store these for the extraLogData() method */
 		$this->extraDetails = $extra;
 		$this->messageKey = $message;
-		
-		switch ( $code )
-		{				
-			default:
-				$message = \IPS\Member::loggedIn()->language()->addToStack( $message, FALSE, array( 'sprintf' => $extra ) );
-				break;
-		}
+		$message = \IPS\Member::loggedIn()->language()->addToStack( $message, FALSE, array( 'sprintf' => $extra ) );
 
 		return parent::__construct( $message, $code, $previous );
 	}