Limit email addresses used to register.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@131 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 9 insertions, 0 deletions

diff --git a/wp-inst/wp-includes/wpmu-functions.php b/wp-inst/wp-includes/wpmu-functions.php
index 36f83ce..d90567f 100644
--- a/wp-inst/wp-includes/wpmu-functions.php
+++ b/wp-inst/wp-includes/wpmu-functions.php
@@ -436,6 +436,13 @@ function createBlog( $domain, $path, $username, $weblog_title, $admin_email, $si
     if( empty($path) )
 	    $path = '/';
 	
+    $limited_email_domains = get_site_settings( 'limited_email_domains' );
+    if( is_array( $limited_email_domains ) ) {
+	    $emaildomain = substr( $admin_email, 1 + strpos( $admin_email, '@' ) );
+	    if( in_array( $emaildomain, $limited_email_domains ) == false ) {
+		    return "error: email domain not allowed";
+	    }
+    }
     // Check if the domain has been used already. We should return an error message.
     if( $wpdb->get_var("SELECT blog_id FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'" ) )
 	return 'error: Blog URL already taken.';
diff --git a/wp-inst/wp-newblog.php b/wp-inst/wp-newblog.php
index 8930f41..fe682e9 100644
--- a/wp-inst/wp-newblog.php
+++ b/wp-inst/wp-newblog.php
@@ -176,6 +176,8 @@ switch( $_POST[ 'stage' ] )
 		} else {
 		    if( $err == 'error: username used' ) {
 			$errormsg[ 'weblog_id' ] = "Sorry, that blog already exists!";
+		    } elseif( $err == 'error: email domain not allowed' ) {
+			$errormsg[ 'admin_email' ] = "Sorry, that email address is not allowed!";
 		    } else {
 			$errormsg[ 'weblog_id' ] = "Sorry, that blog already exists!";
 		    }