Changeset 13984 for trunk/src/bp-members/bp-members-functions.php

Timestamp:

07/27/2024 07:01:02 PM (20 months ago)

Author:

espellcaste

Message:

Enforce requirement of usernames having valid letters.

Profile links dont

File:

• trunk/src/bp-members/bp-members-functions.php (modified) (5 diffs)

trunk/src/bp-members/bp-members-functions.php

@@ -1622 +1622 @@
     // Note: This check only works on Multisite.
     $limited_email_domains = get_site_option( 'limited_email_domains' );
-    if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
+    if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
         $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-        if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
+
+        if ( ! in_array( $emaildomain, $limited_email_domains, true ) ) {
             $errors['domain_not_allowed'] = 1;
         }
@@ -1634 +1635 @@
     }
 
-    $retval = ! empty( $errors ) ? $errors : true;
-
-    return $retval;
+    return ! empty( $errors ) ? $errors : true;
 }
 
@@ -1713 +1712 @@
         // User name can't be on the list of illegal names.
         $illegal_names = get_site_option( 'illegal_names' );
-        if ( in_array( $user_name, (array) $illegal_names ) ) {
-            $errors->add( 'user_name', __( 'That username is not allowed', 'buddypress' ) );
+        if ( in_array( $user_name, (array) $illegal_names, true ) ) {
+            $errors->add( 'user_name', __( 'That username is not allowed.', 'buddypress' ) );
         }
 
@@ -1724 +1723 @@
         // Minimum of 4 characters.
         if ( strlen( $user_name ) < 4 ) {
-            $errors->add( 'user_name',  __( 'Username must be at least 4 characters', 'buddypress' ) );
+            $errors->add( 'user_name', __( 'Username must be at least 4 characters.', 'buddypress' ) );
+        }
+
+        // Maximum of 60 characters.
+        if ( strlen( $user_name ) > 60 ) {
+            $errors->add( 'user_name', __( 'Username may not be longer than 60 characters.', 'buddypress' ) );
         }
 
         // No underscores. @todo Why not?
-        if ( false !== strpos( ' ' . $user_name, '_' ) ) {
+        if ( str_contains( ' ' . $user_name, '_' ) ) {
             $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character "_"!', 'buddypress' ) );
         }
@@ -1735 +1739 @@
         $match = array();
         preg_match( '/[0-9]*/', $user_name, $match );
-        if ( $match[0] == $user_name ) {
+
+        // Check for valid letters.
+        $valid_letters = preg_match( '/[a-zA-Z]+/', $user_name );
+
+        if ( $match[0] === $user_name || ! $valid_letters ) {
             $errors->add( 'user_name', __( 'Sorry, usernames must have letters too!', 'buddypress' ) );
         }
 
         // Check into signups.
-        $signups = BP_Signup::get( array(
-            'user_login' => $user_name,
-        ) );
+        $signups = BP_Signup::get(
+            array(
+                'user_login' => $user_name,
+            )
+        );
 
         $signup = isset( $signups['signups'] ) && ! empty( $signups['signups'][0] ) ? $signups['signups'][0] : false;