--- a/wp/wp-admin/network/site-new.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/network/site-new.php Mon Oct 14 17:39:30 2019 +0200
@@ -10,24 +10,25 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! is_multisite() )
- wp_die( __( 'Multisite support is not enabled.' ) );
+/** WordPress Translation Installation API */
+require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
-if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have sufficient permissions to add sites to this network.' ) );
+if ( ! current_user_can( 'create_sites' ) ) {
+ 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' =>
- '<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
- '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
+ 'content' =>
+ '<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
+ '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
) );
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
- '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+ '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>') . '</p>' .
+ '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
);
if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
@@ -41,16 +42,40 @@
if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
$domain = strtolower( $blog['domain'] );
- // If not a subdomain install, make sure the domain isn't a reserved word
+ // If not a subdomain installation, make sure the domain isn't a reserved word
if ( ! is_subdomain_install() ) {
- /** This filter is documented in wp-includes/ms-functions.php */
- $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
- 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 ) ) );
+ $subdirectory_reserved_names = get_subdirectory_reserved_names();
+
+ 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' ),
+ '<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
+ )
+ );
+ }
}
$title = $blog['title'];
+ $meta = array(
+ 'public' => 1
+ );
+
+ // Handle translation installation for the new site.
+ if ( isset( $_POST['WPLANG'] ) ) {
+ if ( '' === $_POST['WPLANG'] ) {
+ $meta['WPLANG'] = ''; // en_US
+ } elseif ( in_array( $_POST['WPLANG'], get_available_languages() ) ) {
+ $meta['WPLANG'] = $_POST['WPLANG'];
+ } elseif ( current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
+ $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
+ if ( $language ) {
+ $meta['WPLANG'] = $language;
+ }
+ }
+ }
+
if ( empty( $domain ) )
wp_die( __( 'Missing or invalid site address.' ) );
@@ -64,43 +89,76 @@
}
if ( is_subdomain_install() ) {
- $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
- $path = $current_site->path;
+ $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', get_network()->domain );
+ $path = get_network()->path;
} else {
- $newdomain = $current_site->domain;
- $path = $current_site->path . $domain . '/';
+ $newdomain = get_network()->domain;
+ $path = get_network()->path . $domain . '/';
}
$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.' ) );
+ }
$password = wp_generate_password( 12, false );
$user_id = wpmu_create_user( $domain, $password, $email );
- if ( false == $user_id )
+ if ( false === $user_id ) {
wp_die( __( 'There was an error creating the user.' ) );
- else
- wp_new_user_notification( $user_id, $password );
+ }
+
+ /**
+ * 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 );
}
$wpdb->hide_errors();
- $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
+ $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 ) ) {
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' ),
+ get_network()->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;
@@ -130,7 +188,7 @@
?>
<div class="wrap">
-<h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
+<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
<?php
if ( ! empty( $messages ) ) {
foreach ( $messages as $msg )
@@ -140,14 +198,14 @@
<?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" /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
+ <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\.|', '', get_network()->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" />
+ echo get_network()->domain . get_network()->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>
@@ -155,15 +213,56 @@
<th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
<td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
</tr>
+ <?php
+ $languages = get_available_languages();
+ $translations = wp_get_available_translations();
+ if ( ! empty( $languages ) || ! empty( $translations ) ) :
+ ?>
+ <tr class="form-field form-required">
+ <th scope="row"><label for="site-language"><?php _e( 'Site Language' ); ?></label></th>
+ <td>
+ <?php
+ // Network default.
+ $lang = get_site_option( 'WPLANG' );
+
+ // Use English if the default isn't available.
+ if ( ! in_array( $lang, $languages ) ) {
+ $lang = '';
+ }
+
+ wp_dropdown_languages(
+ array(
+ 'name' => 'WPLANG',
+ 'id' => 'site-language',
+ 'selected' => $lang,
+ 'languages' => $languages,
+ 'translations' => $translations,
+ 'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
+ )
+ );
+ ?>
+ </td>
+ </tr>
+ <?php endif; // Languages. ?>
<tr class="form-field form-required">
- <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></td>
+ <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>
<td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
</tr>
<tr class="form-field">
- <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>
+ <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 a link to set the 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