Changeset 18131

Timestamp:

06/03/2011 06:59:12 PM (14 years ago)

Author:

ryan

Message:

Make user validation when adding a user via network admin consistent with adding a user elsewhere. Provide better feedback for validation problems. Props sorich87. fixes #17239

File:

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

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

@@ -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">