enmi-conf.org: comparison wp/wp-signup.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	wp_redirect( network_home_url() );
 	die();
 }
 /**
-* Prints signup_header via wp_head
+* Prints signup_header via wp_head.
 *
 * @since MU (3.0.0)
 */
 function do_signup_header() {
 	/**
 // Fix for page title.
 $wp_query->is_404 = false;
 /**
-* Fires before the Site Signup page is loaded.
+* Fires before the Site Sign-up page is loaded.
 *
 * @since 4.4.0
 */
 do_action( 'before_signup_header' );
 /**
-* Prints styles for front-end Multisite signup pages
+* Prints styles for front-end Multisite Sign-up pages.
 *
 * @since MU (3.0.0)
 */
 function wpmu_signup_stylesheet() {
 	?>
 add_action( 'wp_head', 'wpmu_signup_stylesheet' );
 get_header( 'wp-signup' );
 /**
-* Fires before the site sign-up form.
+* Fires before the site Sign-up form.
 *
 * @since 3.0.0
 */
 do_action( 'before_signup_form' );
 ?>
 <div id="signup-content" class="widecolumn">
 <div class="mu_register wp-signup-container" role="main">
 <?php
 /**
-* Generates and displays the Signup and Create Site forms
+* Generates and displays the Sign-up and Create Site forms.
 *
 * @since MU (3.0.0)
 *
 * @param string          $blogname   The new site name.
 * @param string          $blog_title The new site title.
 		<p class="error"><?php echo $errmsg; ?></p>
 		<?php
 	}
 	if ( ! is_subdomain_install() ) {
-		echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" /><br />';
+		echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" /><br />';
 	} else {
 		$site_domain = preg_replace( '|^www\.|', '', $current_network->domain );
-		echo '<input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" /><span class="suffix_address">.' . esc_html( $site_domain ) . '</span><br />';
+		echo '<input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" /><span class="suffix_address">.' . esc_html( $site_domain ) . '</span><br />';
 	}
 	if ( ! is_user_logged_in() ) {
 		if ( ! is_subdomain_install() ) {
 			$site = $current_network->domain . $current_network->path . __( 'sitename' );
 	if ( $errmsg ) {
 		?>
 		<p class="error"><?php echo $errmsg; ?></p>
 		<?php
 	}
-	echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" />';
+	echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" autocomplete="off" />';
 	?>
 	<?php
 	// Site Language.
 	$languages = signup_get_available_languages();
 	 */
 	do_action( 'signup_blogform', $errors );
 }
 /**
-* Validate the new site signup
+* Validates the new site sign-up.
 *
 * @since MU (3.0.0)
 *
 * @return array Contains the new site data and error messages.
 *               See wpmu_validate_blog_signup() for details.
 	echo '<label for="user_name">' . __( 'Username:' ) . '</label>';
 	$errmsg = $errors->get_error_message( 'user_name' );
 	if ( $errmsg ) {
 		echo '<p class="error">' . $errmsg . '</p>';
 	}
-	echo '<input name="user_name" type="text" id="user_name" value="' . esc_attr( $user_name ) . '" autocapitalize="none" autocorrect="off" maxlength="60" /><br />';
+	echo '<input name="user_name" type="text" id="user_name" value="' . esc_attr( $user_name ) . '" autocapitalize="none" autocorrect="off" maxlength="60" autocomplete="username" /><br />';
 	_e( '(Must be at least 4 characters, letters and numbers only.)' );
 	?>
 	<label for="user_email"><?php _e( 'Email&nbsp;Address:' ); ?></label>
 	<?php
 	$errmsg = $errors->get_error_message( 'user_email' );
 	if ( $errmsg ) {
 		?>
 		<p class="error"><?php echo $errmsg; ?></p>
 	<?php } ?>
-	<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" /><br /><?php _e( 'We send your registration email to this address. (Double-check your email address before continuing.)' ); ?>
+	<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" /><br /><?php _e( 'Your registration email is sent to this address. (Double-check your email address before continuing.)' ); ?>
 	<?php
 	$errmsg = $errors->get_error_message( 'generic' );
 	if ( $errmsg ) {
 		echo '<p class="error">' . $errmsg . '</p>';
 	}
 	 */
 	do_action( 'signup_extra_fields', $errors );
 }
 /**
-* Validate user signup name and email
+* Validates user sign-up name and email.
 *
 * @since MU (3.0.0)
 *
 * @return array Contains username, email, and error messages.
 *               See wpmu_validate_user_signup() for details.
 function validate_user_form() {
 	return wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
 }
 /**
-* Allow returning users to sign up for another site
+* Shows a form for returning users to sign up for another site.
 *
 * @since MU (3.0.0)
 *
 * @param string          $blogname   The new site name
 * @param string          $blog_title The new site title.
 				}
 				?>
 			</ul>
 	<?php } ?>
-	<p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ); ?></p>
+	<p><?php _e( 'If you are not going to use a great site domain, leave it for a new user. Now have at it!' ); ?></p>
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="gimmeanotherblog" />
 		<?php
 		/**
 		 * Hidden sign-up form fields output when creating another site or user.
 	</form>
 	<?php
 }
 /**
-* Validate a new site signup for an existing user.
+* Validates a new site sign-up for an existing user.
 *
-* @global string          $blogname   The new site's subdomain or directory name.
+* @since MU (3.0.0)
-* @global string          $blog_title The new site's title.
+*
-* @global WP_Error        $errors     Existing errors in the global scope.
+* @global string   $blogname   The new site's subdomain or directory name.
-* @global string          $domain     The new site's domain.
+* @global string   $blog_title The new site's title.
-* @global string          $path       The new site's path.
+* @global WP_Error $errors     Existing errors in the global scope.
-*
+* @global string   $domain     The new site's domain.
-* @since MU (3.0.0)
+* @global string   $path       The new site's path.
 *
-* @return null|bool True if site signup was validated, false if error.
+* @return null|bool True if site signup was validated, false on error.
 *                   The function halts all execution if the user is not logged in.
 */
 function validate_another_blog_signup() {
 	global $blogname, $blog_title, $errors, $domain, $path;
 	$current_user = wp_get_current_user();
 	confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id );
 	return true;
 }
 /**
-* Confirm a new site signup.
+* Shows a message confirming that the new site has been created.
 *
 * @since MU (3.0.0)
 * @since 4.4.0 Added the `$blog_id` parameter.
 *
 * @param string $domain     The domain URL.
 /**
 * Shows a form for a visitor to sign up for a new user account.
 *
 * @since MU (3.0.0)
 *
+* @global string $active_signup String that returns registration type. The value can be
+*                               'all', 'none', 'blog', or 'user'.
+*
 * @param string          $user_name  The username.
 * @param string          $user_email The user's email.
 * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
 */
 function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 	</form>
 	<?php
 }
 /**
-* Validate the new user signup
+* Validates the new user sign-up.
 *
 * @since MU (3.0.0)
 *
-* @return bool True if new user signup was validated, false if error
+* @return bool True if new user sign-up was validated, false on error.
 */
 function validate_user_signup() {
 	$result     = validate_user_form();
 	$user_name  = $result['user_name'];
 	$user_email = $result['user_email'];
 	confirm_user_signup( $user_name, $user_email );
 	return true;
 }
 /**
-* New user signup confirmation
+* Shows a message confirming that the new user has been registered and is awaiting activation.
 *
 * @since MU (3.0.0)
 *
-* @param string $user_name The username
+* @param string $user_name  The username.
-* @param string $user_email The user's email address
+* @param string $user_email The user's email address.
 */
 function confirm_user_signup( $user_name, $user_email ) {
 	?>
 	<h2>
 	<?php
 		<?php
 		/** This action is documented in wp-signup.php */
 		do_action( 'signup_hidden_fields', 'validate-site' );
 		?>
 		<?php show_blog_form( $blogname, $blog_title, $errors ); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Signup' ); ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Sign up' ); ?>" /></p>
 	</form>
 	<?php
 }
 /**
-* Validate new site signup
+* Validates new site signup.
 *
 * @since MU (3.0.0)
 *
-* @return bool True if the site signup was validated, false if error
+* @return bool True if the site sign-up was validated, false on error.
 */
 function validate_blog_signup() {
 	// Re-validate user info.
 	$user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
 	$user_name   = $user_result['user_name'];
 	?>
 	</p>
 	<p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
 	<h2><?php _e( 'Still waiting for your email?' ); ?></h2>
 	<p>
-		<?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ); ?>
+		<?php _e( 'If you have not received your email yet, there are a number of things you can do:' ); ?>
 		<ul id="noemail-tips">
 			<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ); ?></strong></p></li>
 			<li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ); ?></p></li>
 			<li>
 			<?php
 	/** This action is documented in wp-signup.php */
 	do_action( 'signup_finished' );
 }
 /**
-* Retrieves languages available during the site/user signup process.
+* Retrieves languages available during the site/user sign-up process.
 *
 * @since 4.4.0
 *
 * @see get_available_languages()
 *
 * @return string[] Array of available language codes. Language codes are formed by
 *                  stripping the .mo extension from the language file names.
 */
 function signup_get_available_languages() {
 	/**
-	 * Filters the list of available languages for front-end site signups.
+	 * Filters the list of available languages for front-end site sign-ups.
 	 *
 	 * Passing an empty array to this hook will disable output of the setting on the
-	 * signup form, and the default language will be used when creating the site.
+	 * sign-up form, and the default language will be used when creating the site.
 	 *
 	 * Languages not already installed will be stripped.
 	 *
 	 * @since 4.4.0
 	 *

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6