Change limited_email_domains to a textarea, props momo360modena for patch, fixes #426

Handle changing from space deliminated string to array


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

2 files changed, 17 insertions, 9 deletions

diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php
index 03d6c82..26293d1 100644
--- a/wp-admin/wpmu-edit.php
+++ b/wp-admin/wpmu-edit.php
@@ -12,7 +12,7 @@ if( $_GET[ 'id' ] ) {
 	$id = intval( $_POST[ 'id' ] ); 
 }
 
-if( isset( $_POST['ref'] ) == false && empty( $_SERVER['HTTP_REFERER'] ) == false ) {
+if( isset( $_POST['ref'] ) == false && !empty($_SERVER['HTTP_REFERER']) ) {
 	$_POST['ref'] = $_SERVER['HTTP_REFERER'];
 }
 
@@ -24,28 +24,34 @@ switch( $_GET['action'] ) {
 			wp_die( __("You probably need to go back to the <a href='wpmu-options.php'>options page</a>") );
 
 		update_site_option( "WPLANG", $_POST['WPLANG'] );
+		
 		if( is_email( $_POST['admin_email'] ) )
 			update_site_option( "admin_email", $_POST['admin_email'] );
-		$illegal_names = split( ' ', $_POST['illegal_names'] );
-		
+
+		$illegal_names = split( ' ', $_POST['illegal_names'] );		
 		foreach( (array) $illegal_names as $name ) {
 			$name = trim( $name );
 			if( $name != '' )
 				$names[] = trim( $name );
 		}
-		
 		update_site_option( "illegal_names", $names );
+		
 		update_site_option( "registration", $_POST['registration'] );
 		update_site_option( "registrationnotification", $_POST['registrationnotification'] );
-		
+
 		if( $_POST['limited_email_domains'] != '' ) {
-			update_site_option( "limited_email_domains", split( ' ', $_POST['limited_email_domains'] ) );
+			$limited_email_domains = str_replace( ' ', "\n", $_POST[ 'limited_email_domains' ] );
+			$limited_email_domains = split( "\n", stripslashes( $limited_email_domains ) );
+			foreach( (array) $limited_email_domains as $domain ) {
+				$limited_email[] = trim( $domain );
+			}
+			update_site_option( "limited_email_domains", $limited_email );
 		} else {
 			update_site_option( "limited_email_domains", '' );
 		}
 		
 		if( $_POST['banned_email_domains'] != '' ) {
-			$banned_email_domains = split( "\n", stripslashes($_POST['banned_email_domains']) );
+			$banned_email_domains = split( "\n", stripslashes( $_POST[ 'banned_email_domains' ] ) );
 			foreach( (array) $banned_email_domains as $domain ) {
 				$banned[] = trim( $domain );
 			}
diff --git a/wp-admin/wpmu-options.php b/wp-admin/wpmu-options.php
index 9517e49..ae35e90 100644
--- a/wp-admin/wpmu-options.php
+++ b/wp-admin/wpmu-options.php
@@ -99,9 +99,11 @@ if (isset($_GET['updated'])) {
 			<tr valign="top">
 				<th scope="row"><?php _e('Limited Email Registrations') ?></th> 
 				<td>
-					<input name="limited_email_domains" type="text" id="limited_email_domains" style="width: 95%" value="<?php echo get_site_option('limited_email_domains') == '' ? '' : @implode( " ", get_site_option('limited_email_domains') ); ?>" size="45" />
+					<?php $limited_email_domains = get_site_option('limited_email_domains');
+					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
+					<textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea>
 					<br />
-					<?php _e('If you want to limit blog registrations to certain domains. Separate domains by spaces.') ?>
+					<?php _e('If you want to limit blog registrations to certain domains. One domain per line.') ?>
 				</td> 
 			</tr>