Coding Standards: Use strict comparison in wpmu_validate_blog_signup().

SergeyBiryukov · SergeyBiryukov · commit 8da02a866552 · 2025-01-03T22:55:42.000Z
Follow-up to [https://mu.trac.wordpress.org/changeset/8 mu:8], [https://mu.trac.wordpress.org/changeset/543 mu:543], [https://mu.trac.wordpress.org/changeset/550 mu:550], [https://mu.trac.wordpress.org/changeset/1364 mu:1364], [https://mu.trac.wordpress.org/changeset/1958 mu:1958], [12603], [32733]. Props debarghyabanerjee, aristath, poena, afercia, SergeyBiryukov. See #62279, #62283. git-svn-id: https://develop.svn.wordpress.org/trunk@59573 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
@@ -481,10 +481,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {
 	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
+
 	if ( ! is_array( $illegal_names ) ) {
 		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
 		add_site_option( 'illegal_names', $illegal_names );
 	}
+
 	if ( in_array( $user_name, $illegal_names, true ) ) {
 		$errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
 	}
@@ -516,10 +518,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {
 	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
+
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
 		$limited_email_domains = array_map( 'strtolower', $limited_email_domains );
-		$emaildomain           = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
-		if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {
+		$email_domain          = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
+
+		if ( ! in_array( $email_domain, $limited_email_domains, true ) ) {
 			$errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );
 		}
 	}
@@ -637,7 +641,8 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 
 	$errors        = new WP_Error();
 	$illegal_names = get_site_option( 'illegal_names' );
-	if ( false == $illegal_names ) {
+
+	if ( ! is_array( $illegal_names ) ) {
 		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
 		add_site_option( 'illegal_names', $illegal_names );
 	}
@@ -721,7 +726,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 	 * unless it's the user's own username.
 	 */
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object( $user ) && ( $user->user_login != $blogname ) ) ) {
+		if ( ! is_object( $user ) || ( is_object( $user ) && ( $user->user_login !== $blogname ) ) ) {
 			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -481,10 +481,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`$illegal_names = get_site_option( 'illegal_names' );`
	`484`	`+`
`484`	`485`	`if ( ! is_array( $illegal_names ) ) {`
`485`	`486`	`$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );`
`486`	`487`	`add_site_option( 'illegal_names', $illegal_names );`
`487`	`488`	`}`
	`489`	`+`
`488`	`490`	`if ( in_array( $user_name, $illegal_names, true ) ) {`
`489`	`491`	`$errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );`
`490`	`492`	`}`
`@@ -516,10 +518,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {`
`516`	`518`	`}`
`517`	`519`
`518`	`520`	`$limited_email_domains = get_site_option( 'limited_email_domains' );`
	`521`	`+`
`519`	`522`	`if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {`
`520`	`523`	`$limited_email_domains = array_map( 'strtolower', $limited_email_domains );`
`521`		`- $emaildomain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );`
`522`		`- if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {`
	`524`	`+ $email_domain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );`
	`525`	`+`
	`526`	`+ if ( ! in_array( $email_domain, $limited_email_domains, true ) ) {`
`523`	`527`	`$errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );`
`524`	`528`	`}`
`525`	`529`	`}`
`@@ -637,7 +641,8 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {`
`637`	`641`
`638`	`642`	`$errors = new WP_Error();`
`639`	`643`	`$illegal_names = get_site_option( 'illegal_names' );`
`640`		`- if ( false == $illegal_names ) {`
	`644`	`+`
	`645`	`+ if ( ! is_array( $illegal_names ) ) {`
`641`	`646`	`$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );`
`642`	`647`	`add_site_option( 'illegal_names', $illegal_names );`
`643`	`648`	`}`
`@@ -721,7 +726,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {`
`721`	`726`	`* unless it's the user's own username.`
`722`	`727`	`*/`
`723`	`728`	`if ( username_exists( $blogname ) ) {`
`724`		`- if ( ! is_object( $user ) \|\| ( is_object( $user ) && ( $user->user_login != $blogname ) ) ) {`
	`729`	`+ if ( ! is_object( $user ) \|\| ( is_object( $user ) && ( $user->user_login !== $blogname ) ) ) {`
`725`	`730`	`$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );`
`726`	`731`	`}`
`727`	`732`	`}`