' . __('For more information:') . '
' . - '' . __('Documentation on Site Management') . '
' . - '' . __('Support Forums') . '
' + '' . __('Documentation on Site Management') . '
' . + '' . __('Support Forums') . '
' ); if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { check_admin_referer( 'add-blog', '_wpnonce_add-blog' ); - if ( ! current_user_can( 'manage_sites' ) ) - wp_die( __( 'You do not have permission to access this page.' ) ); - if ( ! is_array( $_POST['blog'] ) ) wp_die( __( 'Can’t create an empty site.' ) ); + $blog = $_POST['blog']; $domain = ''; if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) @@ -45,27 +43,32 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { // If not a subdomain install, 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:%s' ), implode( ', ', $subdirectory_reserved_names ) ) );
}
- $email = sanitize_email( $blog['email'] );
$title = $blog['title'];
if ( empty( $domain ) )
wp_die( __( 'Missing or invalid site address.' ) );
- if ( empty( $email ) )
+
+ if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
wp_die( __( 'Missing email address.' ) );
- if ( !is_email( $email ) )
+ }
+
+ $email = sanitize_email( $blog['email'] );
+ if ( ! is_email( $email ) ) {
wp_die( __( 'Invalid email address.' ) );
+ }
if ( is_subdomain_install() ) {
$newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
- $path = $base;
+ $path = $current_site->path;
} else {
$newdomain = $current_site->domain;
- $path = $base . $domain . '/';
+ $path = $current_site->path . $domain . '/';
}
$password = 'N/A';
@@ -73,19 +76,30 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
if ( !$user_id ) { // Create a new user with a random password
$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 );
+ wp_new_user_notification( $user_id, 'both' );
}
$wpdb->hide_errors();
$id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
$wpdb->show_errors();
- if ( !is_wp_error( $id ) ) {
- if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
+ 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( __( "New site created by %1s\n\nAddress: %2s\nName: %3s"), $current_user->user_login , get_site_url( $id ), stripslashes( $title ) );
+ }
+
+ $content_mail = 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 )
+ );
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' ) );
@@ -98,46 +112,52 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
if ( isset($_GET['update']) ) {
$messages = array();
if ( 'added' == $_GET['update'] )
- $messages[] = sprintf( __( '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'] ) ) );
+ $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');
$parent_file = 'sites.php';
-require('../admin-header.php');
+wp_enqueue_script( 'user-suggest' );
+
+require( ABSPATH . 'wp-admin/admin-header.php' );
?>
-
-
+
' . $msg . '
';
+ echo '' . $msg . '
';
} ?>
-