Version 4.2.0

system/Helpers/Form/Email.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Email input class for Form Builder
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		11 Mar 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Helpers\Form;
@@ -79,6 +78,24 @@ class _Email extends Text
 	 				throw new \DomainException( 'form_email_banned' );
 	 			}
  			}
+
+			/* Check it's an allowed domain */
+			if ( !\IPS\Member::loggedIn()->isAdmin() and \IPS\Settings::i()->allowed_reg_email !== '' AND $allowedEmailDomains = explode( ',', \IPS\Settings::i()->allowed_reg_email )  )
+			{
+				$matched = FALSE;
+				foreach ( $allowedEmailDomains AS $domain )
+				{
+					if( \mb_stripos( $this->value,  "@" . $domain ) !== FALSE )
+					{
+						$matched = TRUE;
+					}
+				}
+
+				if ( count( $allowedEmailDomains ) AND !$matched )
+				{
+					throw new \DomainException( 'form_email_banned' );
+				}
+			}
 		}
 	}
 }