X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/61343b82c4f0da4c68e4c6373daafff4a81efdd1..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-signup.php diff --git a/wp-signup.php b/wp-signup.php index 9dd2c3da..3373f8ec 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -5,9 +5,9 @@ require( dirname(__FILE__) . '/wp-load.php' ); add_action( 'wp_head', 'wp_no_robots' ); -require( './wp-blog-header.php' ); +require( dirname( __FILE__ ) . '/wp-blog-header.php' ); -if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) { +if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) { wp_redirect( network_home_url() ); die(); } @@ -18,6 +18,11 @@ if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && * @since MU */ function do_signup_header() { + /** + * Fires within the head section of the site sign-up screen. + * + * @since 3.0.0 + */ do_action( 'signup_header' ); } add_action( 'wp_head', 'do_signup_header' ); @@ -63,6 +68,11 @@ function wpmu_signup_stylesheet() { add_action( 'wp_head', 'wpmu_signup_stylesheet' ); get_header(); +/** + * Fires before the site sign-up form. + * + * @since 3.0.0 + */ do_action( 'before_signup_form' ); ?>
@@ -77,8 +87,8 @@ do_action( 'before_signup_form' ); * @param string $blog_title The new site title * @param array $errors */ -function show_blog_form($blogname = '', $blog_title = '', $errors = '') { - global $current_site; +function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { + $current_site = get_current_site(); // Blog name if ( !is_subdomain_install() ) echo ''; @@ -128,7 +138,14 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
get_error_message('user_email') ) { ?>

-
+
get_error_message('generic') ) { echo '

' . $errmsg . '

'; } + /** + * Fires at the end of the user registration form on the site sign-up form. + * + * @since 3.0.0 + * + * @param array $errors An array possibly containing 'user_name' or 'user_email' errors. + */ do_action( 'signup_extra_fields', $errors ); } @@ -184,7 +206,6 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') { * * @since MU * - * @uses wpmu_validate_user_signup() to retrieve an array of user data * @return array Contains username, email, and error messages. */ function validate_user_form() { @@ -196,26 +217,43 @@ function validate_user_form() { * * @since MU * - * @uses wp_get_current_user() to get the current user * @param string $blogname The new site name * @param string $blog_title The new blog title * @param array $errors */ -function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { - global $current_site; +function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { $current_user = wp_get_current_user(); if ( ! is_wp_error($errors) ) { $errors = new WP_Error(); } - // allow definition of default variables - $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); + $signup_defaults = array( + 'blogname' => $blogname, + 'blog_title' => $blog_title, + 'errors' => $errors + ); + + /** + * Filter the default site sign-up variables. + * + * @since 3.0.0 + * + * @param array $signup_defaults { + * An array of default site sign-up variables. + * + * @type string $blogname The site blogname. + * @type string $blog_title The site title. + * @type array $errors An array possibly containing 'blogname' or 'blog_title' errors. + * } + */ + $filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults ); + $blogname = $filtered_results['blogname']; $blog_title = $filtered_results['blog_title']; $errors = $filtered_results['errors']; - echo '

' . sprintf( __( 'Get another %s site in seconds' ), $current_site->site_name ) . '

'; + echo '

' . sprintf( __( 'Get another %s site in seconds' ), get_current_site()->site_name ) . '

'; if ( $errors->get_error_code() ) { echo '

' . __( 'There was a problem, please correct the form below and try again.' ) . '

'; @@ -239,7 +277,17 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {

- +

@@ -251,19 +299,24 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { * * @since MU * - * @uses wp_get_current_user() to retrieve the current user - * @uses wpmu_create_blog() to add a new site - * @uses confirm_another_blog_signup() to confirm the user's new site signup - * @return bool True if blog signup was validated, false if error + * @return null|bool True if blog signup was validated, false if error. + * The function halts all execution if the user is not logged in. */ function validate_another_blog_signup() { global $wpdb, $blogname, $blog_title, $errors, $domain, $path; $current_user = wp_get_current_user(); - if ( !is_user_logged_in() ) + if ( ! is_user_logged_in() ) { die(); + } $result = validate_blog_form(); - extract($result); + + // Extracted values set/overwrite globals. + $domain = $result['domain']; + $path = $result['path']; + $blogname = $result['blogname']; + $blog_title = $result['blog_title']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_another_blog($blogname, $blog_title, $errors); @@ -271,8 +324,34 @@ function validate_another_blog_signup() { } $public = (int) $_POST['blog_public']; - $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated - $meta = apply_filters( 'add_signup_meta', $meta ); + + $blog_meta_defaults = array( + 'lang_id' => 1, + 'public' => $public + ); + + /** + * Filter the new site meta variables. + * + * @since MU + * @deprecated 3.0.0 Use the 'add_signup_meta' filter instead. + * + * @param array $blog_meta_defaults An array of default blog meta variables. + */ + $meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults ); + /** + * Filter the new default site meta variables. + * + * @since 3.0.0 + * + * @param array $meta { + * An array of default site meta variables. + * + * @type int $lang_id The language ID. + * @type int $blog_public Whether search engines should be discouraged from indexing the site. 1 for true, 0 for false. + * } + */ + $meta = apply_filters( 'add_signup_meta', $meta_defaults ); wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid ); confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta); @@ -297,6 +376,11 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $ http://%2$s is your new site. Log in as “%4$s” using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>

$user_name, 'user_email' => $user_email, 'errors' => $errors )); + $signup_user_defaults = array( + 'user_name' => $user_name, + 'user_email' => $user_email, + 'errors' => $errors, + ); + + /** + * Filter the default user variables used on the user sign-up form. + * + * @since 3.0.0 + * + * @param array $signup_user_defaults { + * An array of default user variables. + * + * @type string $user_name The user username. + * @type string $user_email The user email address. + * @type array $errors An array of possible errors relevant to the sign-up user. + * } + */ + $filtered_results = apply_filters( 'signup_user_init', $signup_user_defaults ); $user_name = $filtered_results['user_name']; $user_email = $filtered_results['user_email']; $errors = $filtered_results['errors']; ?> -

site_name ) ?>

-
+

site_name ) ?>

+ - +

@@ -357,14 +460,13 @@ function signup_user($user_name = '', $user_email = '', $errors = '') { * * @since MU * - * @uses validate_user_form() to retrieve an array of the user data - * @uses wpmu_signup_user() to signup the new user - * @uses confirm_user_signup() to confirm the new user signup * @return bool True if new user signup was validated, false if error */ function validate_user_signup() { $result = validate_user_form(); - extract($result); + $user_name = $result['user_name']; + $user_email = $result['user_email']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_user($user_name, $user_email, $errors); @@ -376,7 +478,8 @@ function validate_user_signup() { return false; } - wpmu_signup_user($user_name, $user_email, apply_filters( 'add_signup_meta', array() ) ); + /** This filter is documented in wp-signup.php */ + wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) ); confirm_user_signup($user_name, $user_email); return true; @@ -397,6 +500,7 @@ function confirm_user_signup($user_name, $user_email) {

%s and click the link given.' ), $user_email ); ?>

$user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors )); + $signup_blog_defaults = array( + 'user_name' => $user_name, + 'user_email' => $user_email, + 'blogname' => $blogname, + 'blog_title' => $blog_title, + 'errors' => $errors + ); + + /** + * Filter the default site creation variables for the site sign-up form. + * + * @since 3.0.0 + * + * @param array $signup_blog_defaults { + * An array of default site creation variables. + * + * @type string $user_name The user username. + * @type string $user_email The user email address. + * @type string $blogname The blogname. + * @type string $blog_title The title of the site. + * @type array $errors An array of possible errors relevant to new site creation variables. + * } + */ + $filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults ); + $user_name = $filtered_results['user_name']; $user_email = $filtered_results['user_email']; $blogname = $filtered_results['blogname']; @@ -432,7 +557,10 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti - +

@@ -444,25 +572,26 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti * * @since MU * - * @uses wpmu_validate_user_signup() to retrieve an array of the new user data and errors - * @uses wpmu_validate_blog_signup() to retrieve an array of the new site data and errors - * @uses apply_filters() to make signup $meta filterable - * @uses signup_user() to signup a new user - * @uses signup_blog() to signup a the new user to a new site * @return bool True if the site signup was validated, false if error */ function validate_blog_signup() { // Re-validate user info. - $result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); - extract($result); + $user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] ); + $user_name = $user_result['user_name']; + $user_email = $user_result['user_email']; + $user_errors = $user_result['errors']; - if ( $errors->get_error_code() ) { - signup_user($user_name, $user_email, $errors); + if ( $user_errors->get_error_code() ) { + signup_user( $user_name, $user_email, $user_errors ); return false; } - $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']); - extract($result); + $result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] ); + $domain = $result['domain']; + $path = $result['path']; + $blogname = $result['blogname']; + $blog_title = $result['blog_title']; + $errors = $result['errors']; if ( $errors->get_error_code() ) { signup_blog($user_name, $user_email, $blogname, $blog_title, $errors); @@ -470,8 +599,10 @@ function validate_blog_signup() { } $public = (int) $_POST['blog_public']; - $meta = array ('lang_id' => 1, 'public' => $public); - $meta = apply_filters( 'add_signup_meta', $meta ); + $signup_meta = array ('lang_id' => 1, 'public' => $public); + + /** This filter is documented in wp-signup.php */ + $meta = apply_filters( 'add_signup_meta', $signup_meta ); wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta); confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta); @@ -507,15 +638,21 @@ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use

- +