<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44626] trunk/src/wp-signup.php: Coding Standards: Manually fix coding standards violations in `wp-signup.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44626">44626</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44626","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-16 16:50:15 +0000 (Wed, 16 Jan 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Manually fix coding standards violations in `wp-signup.php`.
Props GaryJ, jrf, netweb, desrosj.
Fixes <a href="https://core.trac.wordpress.org/ticket/43405">#43405</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2019-01-16 15:21:49 UTC (rev 44625)
+++ trunk/src/wp-signup.php 2019-01-16 16:50:15 UTC (rev 44626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_network = get_network();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Blog name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Blog name.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="blogname">' . __( 'Site Name:' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="blogname">' . __( 'Site Domain:' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $errmsg = $errors->get_error_message( 'blogname' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg = $errors->get_error_message( 'blogname' );
+ if ( $errmsg ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="error"><?php echo $errmsg; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 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 />';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 />';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +138,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Blog Title
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="blog_title"><?php _e( 'Site Title:' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $errmsg = $errors->get_error_message( 'blog_title' ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $errmsg = $errors->get_error_message( 'blog_title' );
+ if ( $errmsg ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="error"><?php echo $errmsg; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +183,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // Languages.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_public_on_checked = $blog_public_off_checked = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_public_on_checked = '';
+ $blog_public_off_checked = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_public_off_checked = 'checked="checked"';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +251,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // User name
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="user_name">' . __( 'Username:' ) . '</label>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $errmsg = $errors->get_error_message( 'user_name' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg = $errors->get_error_message( 'user_name' );
+ if ( $errmsg ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="error">' . $errmsg . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<input name="user_name" type="text" id="user_name" value="' . esc_attr( $user_name ) . '" autocapitalize="none" autocorrect="off" maxlength="60" /><br />';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,12 +260,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="user_email"><?php _e( 'Email Address:' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $errmsg = $errors->get_error_message( 'user_email' ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $errmsg = $errors->get_error_message( 'user_email' );
+ if ( $errmsg ) {
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="error"><?php echo $errmsg; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <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.)' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $errmsg = $errors->get_error_message( 'generic' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg = $errors->get_error_message( 'generic' );
+ if ( $errmsg ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="error">' . $errmsg . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,8 +343,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Current user's display name. */
- printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!' ), $current_user->display_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: Current user's display name. */
+ __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!' ),
+ $current_user->display_name
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,9 +601,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php show_user_form( $user_name, $user_email, $errors ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $active_signup == 'blog' ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'blog' === $active_signup ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input id="signupblog" type="hidden" name="signup_for" value="blog" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php } elseif ( $active_signup == 'user' ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php } elseif ( 'user' === $active_signup ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input id="signupblog" type="hidden" name="signup_for" value="user" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,9 +926,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $newblogname = isset( $_GET['new'] ) ? strtolower( preg_replace( '/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'] ) ) : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user = wp_get_current_user();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $active_signup == 'none' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'none' === $active_signup ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Registration has been disabled.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( $active_signup == 'blog' && ! is_user_logged_in() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'blog' === $active_signup && ! is_user_logged_in() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: login URL */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -922,7 +936,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $stage ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'validate-user-signup':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $active_signup == 'all' || $_POST['signup_for'] == 'blog' && $active_signup == 'blog' || $_POST['signup_for'] == 'user' && $active_signup == 'user' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' === $active_signup
+ || ( 'blog' === $_POST['signup_for'] && 'blog' === $active_signup )
+ || ( 'user' === $_POST['signup_for'] && 'user' === $active_signup )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> validate_user_signup();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'User registration has been disabled.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,7 +946,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'validate-blog-signup':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $active_signup == 'all' || $active_signup == 'blog' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' === $active_signup || 'blog' === $active_signup ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> validate_blog_signup();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Site registration has been disabled.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,11 +964,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'preprocess_signup_form' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_user_logged_in() && ( 'all' === $active_signup || 'blog' === $active_signup ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> signup_another_blog( $newblogname );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_user_logged_in() && ( 'all' === $active_signup || 'user' === $active_signup ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> signup_user( $newblogname, $user_email );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_user_logged_in() && ( 'blog' === $active_signup ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Sorry, new registrations are not allowed at this time.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'You are logged in already. No need to register again!' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,7 +977,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $newblogname ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $newblog = get_blogaddress_by_name( $newblogname );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $active_signup == 'blog' || $active_signup == 'all' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'blog' === $active_signup || 'all' === $active_signup ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: site address */
</span><span class="cx" style="display: block; padding: 0 10px"> '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
</span></span></pre>
</div>
</div>
</body>
</html>