Wordpress 3.6

[autoinstalls/wordpress.git] / wp-admin / network / user-new.php

diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index cd9a3f836a2dfe20f5be0e9ed601eadfb7eca004..316fffe58cbd7d6eca86b4336caf81f464fc8c04 100644 (file)
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Add Site Administration Screen
+ * Add New User network administration panel.
  *
  * @package WordPress
  * @subpackage Multisite
@@ -16,10 +16,15 @@ if ( ! is_multisite() )
 if ( ! current_user_can('create_users') )
        wp_die(__('You do not have sufficient permissions to add users to this network.'));
 
+get_current_screen()->add_help_tab( array(
+       'id'      => 'overview',
+       'title'   => __('Overview'),
+       'content' =>
+               '<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>'
+) );
 
-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>' . __('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>' .
+get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
        '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
@@ -30,26 +35,26 @@ if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
        if ( ! current_user_can( 'manage_network_users' ) )
                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;
+               }
+       }
 }
 
 if ( isset($_GET['update']) ) {
@@ -70,8 +75,17 @@ require('../admin-header.php'); ?>
 if ( ! empty( $messages ) ) {
        foreach ( $messages as $msg )
                echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
-} ?>
-       <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">     
+}
+
+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">
                <tr class="form-field form-required">
                        <th scope="row"><?php _e( 'Username' ) ?></th>
@@ -91,4 +105,3 @@ if ( ! empty( $messages ) ) {
 </div>
 <?php
 require('../admin-footer.php');
-?>
\ No newline at end of file