diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/network/site-new.php --- a/wp/wp-admin/network/site-new.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/network/site-new.php Mon Oct 14 18:28:13 2019 +0200 @@ -17,30 +17,34 @@ wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) ); } -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => - '

' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '

' . - '

' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '

' -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => + '

' . __( 'This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.' ) . '

' . + '

' . __( 'If the admin email for the new site does not exist in the database, a new user will also be created.' ) . '

', + ) +); get_current_screen()->set_help_sidebar( - '

' . __('For more information:') . '

' . - '

' . __('Documentation on Site Management') . '

' . - '

' . __('Support Forums') . '

' + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Site Management' ) . '

' . + '

' . __( 'Support Forums' ) . '

' ); -if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { +if ( isset( $_REQUEST['action'] ) && 'add-site' == $_REQUEST['action'] ) { check_admin_referer( 'add-blog', '_wpnonce_add-blog' ); - if ( ! is_array( $_POST['blog'] ) ) + if ( ! is_array( $_POST['blog'] ) ) { wp_die( __( 'Can’t create an empty site.' ) ); + } - $blog = $_POST['blog']; + $blog = $_POST['blog']; $domain = ''; - if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) + if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) { $domain = strtolower( $blog['domain'] ); + } // If not a subdomain installation, make sure the domain isn't a reserved word if ( ! is_subdomain_install() ) { @@ -49,7 +53,8 @@ if ( in_array( $domain, $subdirectory_reserved_names ) ) { wp_die( /* translators: %s: reserved names list */ - sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ), + sprintf( + __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ), '' . implode( ', ', $subdirectory_reserved_names ) . '' ) ); @@ -59,7 +64,7 @@ $title = $blog['title']; $meta = array( - 'public' => 1 + 'public' => 1, ); // Handle translation installation for the new site. @@ -76,8 +81,9 @@ } } - if ( empty( $domain ) ) + if ( empty( $domain ) ) { wp_die( __( 'Missing or invalid site address.' ) ); + } if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) { wp_die( __( 'Missing email address.' ) ); @@ -97,8 +103,8 @@ } $password = 'N/A'; - $user_id = email_exists($email); - if ( !$user_id ) { // Create a new user with a random password + $user_id = email_exists( $email ); + if ( ! $user_id ) { // Create a new user with a random password /** * Fires immediately before a new user is created via the network site-new.php page. * @@ -113,18 +119,18 @@ wp_die( __( 'The domain or path entered conflicts with an existing username.' ) ); } $password = wp_generate_password( 12, false ); - $user_id = wpmu_create_user( $domain, $password, $email ); + $user_id = wpmu_create_user( $domain, $password, $email ); if ( false === $user_id ) { wp_die( __( 'There was an error creating the user.' ) ); } /** - * Fires after a new user has been created via the network site-new.php page. - * - * @since 4.4.0 - * - * @param int $user_id ID of the newly created user. - */ + * Fires after a new user has been created via the network site-new.php page. + * + * @since 4.4.0 + * + * @param int $user_id ID of the newly created user. + */ do_action( 'network_site_new_created_user', $user_id ); } @@ -132,7 +138,7 @@ $id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() ); $wpdb->show_errors(); if ( ! is_wp_error( $id ) ) { - if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) { + if ( ! is_super_admin( $user_id ) && ! get_user_option( 'primary_blog', $user_id ) ) { update_user_option( $user_id, 'primary_blog', $id, true ); } @@ -145,10 +151,12 @@ ), sprintf( /* translators: 1: user login, 2: site url, 3: site name/title */ - __( 'New site created by %1$s + __( + 'New site created by %1$s Address: %2$s -Name: %3$s' ), +Name: %3$s' + ), $current_user->user_login, get_site_url( $id ), wp_unslash( $title ) @@ -160,25 +168,34 @@ ) ); wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) ); - wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) ); + wp_redirect( + add_query_arg( + array( + 'update' => 'added', + 'id' => $id, + ), + 'site-new.php' + ) + ); exit; } else { wp_die( $id->get_error_message() ); } } -if ( isset($_GET['update']) ) { +if ( isset( $_GET['update'] ) ) { $messages = array(); - if ( 'added' == $_GET['update'] ) + if ( 'added' == $_GET['update'] ) { $messages[] = sprintf( /* translators: 1: dashboard url, 2: network admin edit url */ __( 'Site added. Visit Dashboard or Edit Site' ), esc_url( get_admin_url( absint( $_GET['id'] ) ) ), network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) ) ); + } } -$title = __('Add New Site'); +$title = __( 'Add New Site' ); $parent_file = 'sites.php'; wp_enqueue_script( 'user-suggest' ); @@ -191,27 +208,42 @@

' . $msg . '

'; -} ?> + } +} +?> +

+*' +); +?> +

- - + +
- + - - + + - - + + - +