WordPress 4.5

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

diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index dac11614a4ac90b1597bf7f660f3a66937f28e25..35d34e4ac699feafe60d17dea9205cc592f918b4 100644 (file)
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -49,7 +49,12 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
                $subdirectory_reserved_names = get_subdirectory_reserved_names();
 
                if ( in_array( $domain, $subdirectory_reserved_names ) ) {
-                       wp_die( sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $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' ),
+                                       '<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
+                               )
+                       );
                }
        }
 
@@ -90,6 +95,15 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
        $password = 'N/A';
        $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.
+                *
+                * @since 4.5.0
+                *
+                * @param string $email Email of the non-existent user.
+                */
+               do_action( 'pre_network_site_new_created_user', $email );
+
                $user_id = username_exists( $domain );
                if ( $user_id ) {
                        wp_die( __( 'The domain or path entered conflicts with an existing username.' ) );
@@ -118,17 +132,29 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
                        update_user_option( $user_id, 'primary_blog', $id, true );
                }
 
-               $content_mail = sprintf(
-                       /* translators: 1: user login, 2: site url, 3: site name/title */
-                       __( 'New site created by %1$s
+               wp_mail(
+                       get_site_option( 'admin_email' ),
+                       sprintf(
+                               /* translators: %s: network name */
+                               __( '[%s] New Site Created' ),
+                               $current_site->site_name
+                       ),
+                       sprintf(
+                               /* translators: 1: user login, 2: site url, 3: site name/title */
+                               __( 'New site created by %1$s
 
 Address: %2$s
 Name: %3$s' ),
-                       $current_user->user_login,
-                       get_site_url( $id ),
-                       wp_unslash( $title )
+                               $current_user->user_login,
+                               get_site_url( $id ),
+                               wp_unslash( $title )
+                       ),
+                       sprintf(
+                               'From: "%1$s" <%2$s>',
+                               _x( 'Site Admin', 'email "From" field' ),
+                               get_site_option( 'admin_email' )
+                       )
                );
-               wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
                wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
                wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
                exit;
@@ -168,14 +194,14 @@ if ( ! empty( $messages ) ) {
 <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
        <table class="form-table">
                <tr class="form-field form-required">
-                       <th scope="row"><label for="site-address"><?php _e( 'Site Address' ) ?></label></th>
+                       <th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ) ?></label></th>
                        <td>
                        <?php if ( is_subdomain_install() ) { ?>
                                <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
                        <?php } else {
                                echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
                        <?php }
-                       echo '<p id="site-address-desc">' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
+                       echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
                        ?>
                        </td>
                </tr>
@@ -220,7 +246,17 @@ if ( ! empty( $messages ) ) {
                        <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
                </tr>
        </table>
-       <?php submit_button( __('Add Site'), 'primary', 'add-site' ); ?>
+
+       <?php
+       /**
+        * Fires at the end of the new site form in network admin.
+        *
+        * @since 4.5.0
+        */
+       do_action( 'network_site_new_form' );
+
+       submit_button( __( 'Add Site' ), 'primary', 'add-site' );
+       ?>
        </form>
 </div>
 <?php