Changes in trunk/wp-admin/network/user-new.php [17144:18131]

File:

• trunk/wp-admin/network/user-new.php (modified) (3 diffs)

trunk/wp-admin/network/user-new.php

@@ -19 +19 @@
 
 add_contextual_help($current_screen,
-    '<p>' . __('Add User will set up a new user account on the network and send them an email with their username and password.') . '</p>' .
+    '<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
     '<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>' .
     '<p><strong>' . __('For more information:') . '</strong></p>' .
@@ -31 +31 @@
         wp_die( __( 'You do not have permission to access this page.' ) );
 
-    if ( is_array( $_POST['user'] ) == false )
+    if ( ! is_array( $_POST['user'] ) )
         wp_die( __( 'Cannot create an empty user.' ) );
+
     $user = $_POST['user'];
-    if ( empty($user['username']) && empty($user['email']) )
-        wp_die( __( 'Missing username and email.' ) );
-    elseif ( empty($user['username']) )
-        wp_die( __( 'Missing username.' ) );
-    elseif ( empty($user['email']) )
-        wp_die( __( 'Missing email.' ) );
 
-    $password = wp_generate_password( 12, false);
-    $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+    $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] ); 
+    if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
+        $add_user_errors = $user_details[ 'errors' ];
+    } else {
+        $password = wp_generate_password( 12, false);
+        $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
-    if ( false == $user_id )
-        wp_die( __( 'Duplicated username or email address.' ) );
-    else
-        wp_new_user_notification( $user_id, $password );
-        
-    wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
-    exit;
+        if ( ! $user_id ) {
+            $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+        } else {
+            wp_new_user_notification( $user_id, $password );
+            wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
+            exit;
+        }
+    }
 }
 
@@ -71 +71 @@
     foreach ( $messages as $msg )
         echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
-} ?>
+}
+
+if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
+    <div class="error">
+        <?php
+            foreach ( $add_user_errors->get_error_messages() as $message )
+                echo "<p>$message</p>";
+        ?>
+    </div>
+<?php } ?>
     <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post"> 
     <table class="form-table">