Code is Poetry.
WordPress' code just... wasn't. This is now dealt with. Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS. Fixes #41057. Built from https://develop.svn.wordpress.org/trunk@42343 git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast
@@ -10,43 +10,48 @@
|
||||
/** Load WordPress Administration Bootstrap */
|
||||
require_once( dirname( __FILE__ ) . '/admin.php' );
|
||||
|
||||
if ( ! current_user_can('create_users') )
|
||||
wp_die(__('Sorry, you are not allowed to add users to this network.'));
|
||||
if ( ! current_user_can( 'create_users' ) ) {
|
||||
wp_die( __( 'Sorry, you are not allowed 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>'
|
||||
) );
|
||||
|
||||
get_current_screen()->set_help_sidebar(
|
||||
'<p><strong>' . __('For more information:') . '</strong></p>' .
|
||||
'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>') . '</p>' .
|
||||
'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
|
||||
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>',
|
||||
)
|
||||
);
|
||||
|
||||
if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
|
||||
get_current_screen()->set_help_sidebar(
|
||||
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
|
||||
'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>' ) . '</p>' .
|
||||
'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
|
||||
);
|
||||
|
||||
if ( isset( $_REQUEST['action'] ) && 'add-user' == $_REQUEST['action'] ) {
|
||||
check_admin_referer( 'add-user', '_wpnonce_add-user' );
|
||||
|
||||
if ( ! current_user_can( 'manage_network_users' ) )
|
||||
if ( ! current_user_can( 'manage_network_users' ) ) {
|
||||
wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
|
||||
}
|
||||
|
||||
if ( ! is_array( $_POST['user'] ) )
|
||||
if ( ! is_array( $_POST['user'] ) ) {
|
||||
wp_die( __( 'Cannot create an empty user.' ) );
|
||||
}
|
||||
|
||||
$user = wp_unslash( $_POST['user'] );
|
||||
|
||||
$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' ];
|
||||
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, sanitize_email( $user['email'] ) );
|
||||
$password = wp_generate_password( 12, false );
|
||||
$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
|
||||
|
||||
if ( ! $user_id ) {
|
||||
$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
|
||||
$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
|
||||
} else {
|
||||
/**
|
||||
* Fires after a new user has been created via the network user-new.php page.
|
||||
@@ -56,13 +61,20 @@ if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
|
||||
* @param int $user_id ID of the newly created user.
|
||||
*/
|
||||
do_action( 'network_user_new_created_user', $user_id );
|
||||
wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
|
||||
wp_redirect(
|
||||
add_query_arg(
|
||||
array(
|
||||
'update' => 'added',
|
||||
'user_id' => $user_id,
|
||||
), 'user-new.php'
|
||||
)
|
||||
);
|
||||
exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( isset($_GET['update']) ) {
|
||||
if ( isset( $_GET['update'] ) ) {
|
||||
$messages = array();
|
||||
if ( 'added' == $_GET['update'] ) {
|
||||
$edit_link = '';
|
||||
@@ -82,7 +94,7 @@ if ( isset($_GET['update']) ) {
|
||||
}
|
||||
}
|
||||
|
||||
$title = __('Add New User');
|
||||
$title = __( 'Add New User' );
|
||||
$parent_file = 'users.php';
|
||||
|
||||
require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
|
||||
@@ -91,30 +103,33 @@ require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
|
||||
<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
|
||||
<?php
|
||||
if ( ! empty( $messages ) ) {
|
||||
foreach ( $messages as $msg )
|
||||
foreach ( $messages as $msg ) {
|
||||
echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
|
||||
}
|
||||
}
|
||||
|
||||
if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
|
||||
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>";
|
||||
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" novalidate="novalidate">
|
||||
<form action="<?php echo network_admin_url( 'user-new.php?action=add-user' ); ?>" id="adduser" method="post" novalidate="novalidate">
|
||||
<table class="form-table">
|
||||
<tr class="form-field form-required">
|
||||
<th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
|
||||
<th scope="row"><label for="username"><?php _e( 'Username' ); ?></label></th>
|
||||
<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
|
||||
</tr>
|
||||
<tr class="form-field form-required">
|
||||
<th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
|
||||
<th scope="row"><label for="email"><?php _e( 'Email' ); ?></label></th>
|
||||
<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
|
||||
</tr>
|
||||
<tr class="form-field">
|
||||
<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
|
||||
<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
<?php
|
||||
@@ -126,7 +141,7 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
|
||||
do_action( 'network_user_new_form' );
|
||||
|
||||
wp_nonce_field( 'add-user', '_wpnonce_add-user' );
|
||||
submit_button( __('Add User'), 'primary', 'add-user' );
|
||||
submit_button( __( 'Add User' ), 'primary', 'add-user' );
|
||||
?>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user