WordPress 3.8

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

diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 3119eb5720edcc316aea37279a38bea940ac1214..6b18ad53c78405b4ba76ee34e02905db1d675559 100644 (file)
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( is_multisite() ) {
        if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) )
 
 if ( is_multisite() ) {
        if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) )


@@ -18,6 +18,8 @@ if ( is_multisite() ) {
 
 if ( is_multisite() ) {
        function admin_created_user_email( $text ) {
 
 if ( is_multisite() ) {
        function admin_created_user_email( $text ) {

+               $roles = get_editable_roles();
+               $role = $roles[ $_REQUEST['role'] ];

                /* translators: 1: Site name, 2: site URL, 3: role */
                return sprintf( __( 'Hi,
 You\'ve been invited to join \'%1$s\' at
                /* translators: 1: Site name, 2: site URL, 3: role */
                return sprintf( __( 'Hi,
 You\'ve been invited to join \'%1$s\' at


@@ -26,7 +28,7 @@ If you do not want to join this site please ignore
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:

-%%s' ), get_bloginfo('name'), home_url(), esc_html( $_REQUEST[ 'role' ] ) );
+%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );

        }
        add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
 
        }
        add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
 


@@ -72,6 +74,9 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
                } else {
                        $newuser_key = substr( md5( $user_id ), 0, 5 );
                        add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
                } else {
                        $newuser_key = substr( md5( $user_id ), 0, 5 );
                        add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );

+
+                       $roles = get_editable_roles();
+                       $role = $roles[ $_REQUEST['role'] ];

                        /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
                        $message = __( 'Hi,
 
                        /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
                        $message = __( 'Hi,
 


@@ -80,7 +85,7 @@ You\'ve been invited to join \'%1$s\' at
 
 Please click the following link to confirm the invite:
 %4$s' );
 
 Please click the following link to confirm the invite:
 %4$s' );

-                       wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), home_url(), $_REQUEST[ 'role' ], home_url("/newbloguser/$newuser_key/")));
+                       wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );

                        $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
                }
        }
                        $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
                }
        }


@@ -106,13 +111,19 @@ Please click the following link to confirm the invite:
                        die();
                }
        } else {
                        die();
                }
        } else {

-               // Adding a new user to this blog
+               // Adding a new user to this site

                $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
                $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );

-               unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );

                if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
                        $add_user_errors = $user_details[ 'errors' ];
                } else {
                if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
                        $add_user_errors = $user_details[ 'errors' ];
                } else {

-                       $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
+                       /**
+                        * Filter the user_login, also known as the username, before it is added to the site.
+                        *
+                        * @since 2.0.3
+                        *
+                        * @param string $user_login The sanitized username.
+                        */
+                       $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );

                        if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
                                add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
                        }
                        if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
                                add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
                        }


@@ -122,7 +133,7 @@ Please click the following link to confirm the invite:
                                wpmu_activate_signup( $key );
                                $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
                        } else {
                                wpmu_activate_signup( $key );
                                $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
                        } else {

-                               $redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' );
+                               $redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );

                        }
                        wp_redirect( $redirect );
                        die();
                        }
                        wp_redirect( $redirect );
                        die();


@@ -177,19 +188,26 @@ get_current_screen()->set_help_sidebar(
 wp_enqueue_script('wp-ajax-response');
 wp_enqueue_script('user-profile');
 
 wp_enqueue_script('wp-ajax-response');
 wp_enqueue_script('user-profile');
 

+/**
+ * Filter whether to enable user auto-complete for non-super admins in Multisite.
+ *
+ * @since 3.4.0
+ *
+ * @param bool $enable Whether to enable auto-complete for non-super admins. Default false.
+ */

 if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
        && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
 ) {
        wp_enqueue_script( 'user-suggest' );
 }
 
 if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
        && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
 ) {
        wp_enqueue_script( 'user-suggest' );
 }
 

-require_once( 'admin-header.php' );
+require_once( ABSPATH . 'wp-admin/admin-header.php' );

 
 if ( isset($_GET['update']) ) {
        $messages = array();
        if ( is_multisite() ) {
                switch ( $_GET['update'] ) {
 
 if ( isset($_GET['update']) ) {
        $messages = array();
        if ( is_multisite() ) {
                switch ( $_GET['update'] ) {

-                       case "newuserconfimation":
+                       case "newuserconfirmation":

                                $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
                                break;
                        case "add":
                                $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
                                break;
                        case "add":


@@ -204,7 +222,7 @@ if ( isset($_GET['update']) ) {
                        case "does_not_exist":
                                $messages[] = __('The requested user does not exist.');
                                break;
                        case "does_not_exist":
                                $messages[] = __('The requested user does not exist.');
                                break;

-                       case "does_not_exist":
+                       case "enter_email":

                                $messages[] = __('Please enter a valid email address.');
                                break;
                }
                                $messages[] = __('Please enter a valid email address.');
                                break;
                }


@@ -215,7 +233,6 @@ if ( isset($_GET['update']) ) {
 }
 ?>
 <div class="wrap">
 }
 ?>
 <div class="wrap">

-<?php screen_icon(); ?>

 <h2 id="add-new-user"> <?php
 if ( current_user_can( 'create_users' ) ) {
        echo _x( 'Add New User', 'user' );
 <h2 id="add-new-user"> <?php
 if ( current_user_can( 'create_users' ) ) {
        echo _x( 'Add New User', 'user' );


@@ -262,7 +279,14 @@ if ( is_multisite() ) {
                $label = __('E-mail or Username');
        }
 ?>
                $label = __('E-mail or Username');
        }
 ?>

-<form action="" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<?php
+/**
+ * Fires inside the adduser form tag.
+ *
+ * @since 3.0.0
+ */
+?>
+<form action="" method="post" name="adduser" id="adduser" class="validate"<?php do_action( 'user_new_form_tag' );?>>

 <input name="action" type="hidden" value="adduser" />
 <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
 
 <input name="action" type="hidden" value="adduser" />
 <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
 


@@ -285,6 +309,20 @@ if ( is_multisite() ) {
        </tr>
 <?php } ?>
 </table>
        </tr>
 <?php } ?>
 </table>

+<?php
+/**
+ * Fires at the end of the new user form.
+ *
+ * Passes a contextual string to make both types of new user forms
+ * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
+ * and 'add-new-user' (single site and network admin).
+ *
+ * @since 3.7.0
+ *
+ * @param string $type A contextual string specifying which type of new user form the hook follows.
+ */
+do_action( 'user_new_form', 'add-existing-user' );
+?>

 <?php submit_button( __( 'Add Existing User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
 </form>
 <?php
 <?php submit_button( __( 'Add Existing User '), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
 </form>
 <?php


@@ -294,10 +332,11 @@ if ( current_user_can( 'create_users') ) {
        if ( $do_both )
                echo '<h3 id="create-new-user">' . __( 'Add New User' ) . '</h3>';
 ?>
        if ( $do_both )
                echo '<h3 id="create-new-user">' . __( 'Add New User' ) . '</h3>';
 ?>

-<p><?php _e('Create a brand new user and add it to this site.'); ?></p>
-<form action="" method="post" name="createuser" id="createuser" class="add:users: validate"<?php do_action('user_new_form_tag');?>>
+<p><?php _e('Create a brand new user and add them to this site.'); ?></p>
+<?php /** This action is documented in wp-admin/user-new.php */ ?>
+<form action="" method="post" name="createuser" id="createuser" class="validate"<?php do_action( 'user_new_form_tag' );?>>

 <input name="action" type="hidden" value="createuser" />
 <input name="action" type="hidden" value="createuser" />

-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ) ?>
+<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>

 <?php
 // Load up the passed data, else set to a default.
 foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_name' => 'lastname',
 <?php
 // Load up the passed data, else set to a default.
 foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_name' => 'lastname',


@@ -305,7 +344,7 @@ foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_nam
        $var = "new_user_$var";
        if( isset( $_POST['createuser'] ) ) {
                if ( ! isset($$var) )
        $var = "new_user_$var";
        if( isset( $_POST['createuser'] ) ) {
                if ( ! isset($$var) )

-                       $$var = isset( $_POST[$post_field] ) ? stripslashes( $_POST[$post_field] ) : '';
+                       $$var = isset( $_POST[$post_field] ) ? wp_unslash( $_POST[$post_field] ) : '';

        } else {
                $$var = false;
        }
        } else {
                $$var = false;
        }


@@ -334,11 +373,25 @@ foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_nam
                <th scope="row"><label for="url"><?php _e('Website') ?></label></th>
                <td><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
        </tr>
                <th scope="row"><label for="url"><?php _e('Website') ?></label></th>
                <td><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
        </tr>

-<?php if ( apply_filters('show_password_fields', true) ) : ?>
+<?php
+/**
+ * Filter the display of the password fields.
+ *
+ * @since 1.5.1
+ *
+ * @param bool $show Whether to show the password fields. Default true.
+ */
+if ( apply_filters( 'show_password_fields', true ) ) : ?>

        <tr class="form-field form-required">
        <tr class="form-field form-required">

-               <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></th>
-               <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
-               <br />
+               <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
+               <td>
+                       <input class="hidden" value=" " /><!-- #24364 workaround -->
+                       <input name="pass1" type="password" id="pass1" autocomplete="off" />
+               </td>
+       </tr>
+       <tr class="form-field form-required">
+               <th scope="row"><label for="pass2"><?php _e('Repeat Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
+               <td>

                <input name="pass2" type="password" id="pass2" autocomplete="off" />
                <br />
                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
                <input name="pass2" type="password" id="pass2" autocomplete="off" />
                <br />
                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>


@@ -370,10 +423,15 @@ foreach ( array( 'user_login' => 'login', 'first_name' => 'firstname', 'last_nam
        <?php } ?>
 </table>
 
        <?php } ?>
 </table>
 

+<?php
+/** This action is documented in wp-admin/user-new.php */
+do_action( 'user_new_form', 'add-new-user' );
+?>
+

 <?php submit_button( __( 'Add New User '), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
 </div>
 <?php
 <?php submit_button( __( 'Add New User '), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
 </div>
 <?php

-include('./admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );