' . __( 'You do not have sufficient permissions to add users to this network.' ) . '
', + 403 + ); + } } elseif ( ! current_user_can( 'create_users' ) ) { - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( + '' . __( 'You are not allowed to create users.' ) . '
', + 403 + ); } 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 -%2$s with the role of %3$s. -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: -%%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' ); - - function admin_created_user_subject( $text ) { - return sprintf( __( '[%s] Your site invite' ), get_bloginfo( 'name' ) ); - } } if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { check_admin_referer( 'add-user', '_wpnonce_add-user' ); $user_details = null; - if ( false !== strpos($_REQUEST[ 'email' ], '@') ) { - $user_details = get_user_by('email', $_REQUEST[ 'email' ]); + $user_email = wp_unslash( $_REQUEST['email'] ); + if ( false !== strpos( $user_email, '@' ) ) { + $user_details = get_user_by( 'email', $user_email ); } else { if ( is_super_admin() ) { - $user_details = get_user_by('login', $_REQUEST[ 'email' ]); + $user_details = get_user_by( 'login', $user_email ); } else { wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) ); die(); @@ -57,8 +50,13 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { die(); } - if ( ! current_user_can('promote_user', $user_details->ID) ) - wp_die(__('Cheatin’ uh?')); + if ( ! current_user_can( 'promote_user', $user_details->ID ) ) { + wp_die( + '' . __( 'You do not have sufficient permissions to add users to this network.' ) . '
', + 403 + ); + } // Adding an existing user to this blog $new_user_email = $user_details->user_email; @@ -68,15 +66,27 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) { $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' ); } else { - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) ); - $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' ); + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' ); } 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'] ]; + + /** + * Fires immediately after a user is invited to join a site, but before the notification is sent. + * + * @since 4.4.0 + * + * @param int $user_id The invited user's ID. + * @param array $role The role of invited user. + * @param string $newuser_key The key of the invitation. + */ + do_action( 'invite_user', $user_id, $role, $newuser_key ); + /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */ $message = __( 'Hi, @@ -94,8 +104,13 @@ Please click the following link to confirm the invite: } elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) { check_admin_referer( 'create-user', '_wpnonce_create-user' ); - if ( ! current_user_can('create_users') ) - wp_die(__('Cheatin’ uh?')); + if ( ! current_user_can( 'create_users' ) ) { + wp_die( + '' . __( 'You are not allowed to create users.' ) . '
', + 403 + ); + } if ( ! is_multisite() ) { $user_id = edit_user(); @@ -112,7 +127,8 @@ Please click the following link to confirm the invite: } } else { // Adding a new user to this site - $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] ); + $new_user_email = wp_unslash( $_REQUEST['email'] ); + $user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email ); if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) { $add_user_errors = $user_details[ 'errors' ]; } else { @@ -124,14 +140,19 @@ Please click the following link to confirm the invite: * @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() ) { + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email + add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email } - wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) ); - if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { - $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) ); - wpmu_activate_signup( $key ); - $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' ); + wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) ); + if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) { + $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) ); + $new_user = wpmu_activate_signup( $key ); + if ( ! is_wp_error( $new_user ) ) { + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' ); + } else { + $redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' ); + } } else { $redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' ); } @@ -181,12 +202,12 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '' . __('For more information:') . '
' . - '' . __('Documentation on Adding New Users') . '
' . + '' . __('Documentation on Adding New Users') . '
' . '' . __('Support Forums') . '
' ); wp_enqueue_script('wp-ajax-response'); -wp_enqueue_script('user-profile'); +wp_enqueue_script( 'user-profile' ); /** * Filter whether to enable user auto-complete for non-super admins in Multisite. @@ -206,6 +227,14 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); if ( isset($_GET['update']) ) { $messages = array(); if ( is_multisite() ) { + $edit_link = ''; + if ( ( isset( $_GET['user_id'] ) ) ) { + $user_id_new = absint( $_GET['user_id'] ); + if ( $user_id_new ) { + $edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) ); + } + } + switch ( $_GET['update'] ) { case "newuserconfirmation": $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.'); @@ -214,7 +243,12 @@ if ( isset($_GET['update']) ) { $messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.'); break; case "addnoconfirmation": - $messages[] = __('User has been added to your site.'); + if ( empty( $edit_link ) ) { + $messages[] = __( 'User has been added to your site.' ); + } else { + /* translators: %s: edit page url */ + $messages[] = sprintf( __( 'User has been added to your site. Edit user' ), $edit_link ); + } break; case "addexisting": $messages[] = __('That user is already a member of this site.'); @@ -233,13 +267,13 @@ if ( isset($_GET['update']) ) { } ?>' . $msg . '
' . $msg . '
' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '
'; - $label = __('E-mail'); + $label = __('Email'); $type = 'email'; } else { echo '' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '
'; - $label = __('E-mail or Username'); + $label = __('Email or Username'); $type = 'text'; } ?> - -