Changeset 13901 for trunk/src/bp-core/classes/class-bp-attachment-avatar.php

Timestamp:

06/02/2024 07:14:55 PM (20 months ago)

Author:

espellcaste

Message:

WPCS: Part IX: miscellaneous fixes for some of the files of the core component.

Follow-up to [13883], [13886], [13887], [13888], [13891], [13892], [13893] and [13900]

See #9164 and #7228

File:

• trunk/src/bp-core/classes/class-bp-attachment-avatar.php (modified) (13 diffs)

trunk/src/bp-core/classes/class-bp-attachment-avatar.php

@@ -32 +32 @@
         $allowed_types = bp_core_get_allowed_avatar_types();
 
-        parent::__construct( array(
-            'action'                => 'bp_avatar_upload',
-            'file_input'            => 'file',
-            'original_max_filesize' => bp_core_avatar_original_max_filesize(),
-
-            // Specific errors for avatars.
-            'upload_error_strings'  => array(
-                /* translators: %s: Max file size for the profile photo */
-                9  => sprintf( _x( 'That photo is too big. Please upload one smaller than %s', 'profile photo upload error', 'buddypress' ), size_format( bp_core_avatar_original_max_filesize() ) ),
-
-                /* translators: %s: comma separated list of file types allowed for the profile photo */
-                10 => sprintf( _nx( 'Please upload only this file type: %s.', 'Please upload only these file types: %s.', count( $allowed_types ), 'profile photo upload error', 'buddypress' ), self::get_avatar_types( $allowed_types ) ),
-            ),
-        ) );
+        parent::__construct(
+            array(
+                'action'                => 'bp_avatar_upload',
+                'file_input'            => 'file',
+                'original_max_filesize' => bp_core_avatar_original_max_filesize(),
+
+                // Specific errors for avatars.
+                'upload_error_strings'  => array(
+                    /* translators: %s: Max file size for the profile photo */
+                    9  => sprintf( _x( 'That photo is too big. Please upload one smaller than %s', 'profile photo upload error', 'buddypress' ), size_format( bp_core_avatar_original_max_filesize() ) ),
+
+                    /* translators: %s: comma separated list of file types allowed for the profile photo */
+                    10 => sprintf( _nx( 'Please upload only this file type: %s.', 'Please upload only these file types: %s.', count( $allowed_types ), 'profile photo upload error', 'buddypress' ), self::get_avatar_types( $allowed_types ) ),
+                ),
+            )
+        );
     }
 
@@ -98 +100 @@
             $file['error'] = 9;
 
-        // File is of invalid type.
+            // File is of invalid type.
         } elseif ( ! bp_core_check_avatar_type( array( 'file' => $file ) ) ) {
             $file['error'] = 10;
@@ -153 +155 @@
             3 => 180,
             6 => -90,
-            8 =>  90,
+            8 => 90,
         );
 
@@ -163 +165 @@
         if ( empty( $edit_args ) ) {
             return false;
+        }
 
         // Add the file to the edit arguments.
-        } else {
-            $edit_args['file'] = $file;
-        }
+        $edit_args['file'] = $file;
 
         return parent::edit_image( 'avatar', $edit_args );
@@ -176 +177 @@
      *
      * @since 2.3.0
-     *
      *
      * @param string $file the absolute path to the file.
@@ -186 +186 @@
         $full_height    = bp_core_avatar_full_height();
 
-        if ( isset( $uploaded_image[0] ) && $uploaded_image[0] < $full_width || $uploaded_image[1] < $full_height ) {
-            return true;
-        }
-
-        return false;
+        return ( isset( $uploaded_image[0] ) && ( $uploaded_image[0] < $full_width || $uploaded_image[1] < $full_height ) );
     }
 
@@ -198 +194 @@
      * @since 2.3.0
      *
-     * @see  BP_Attachment::crop for the list of parameters
+     * @see BP_Attachment::crop() for the list of parameters
      *
      * @param array $args Array of arguments for the cropping.
@@ -229 +225 @@
 
         // Bail if the avatar is not available.
-        if ( ! file_exists( $absolute_path ) )  {
+        if ( ! file_exists( $absolute_path ) ) {
             return false;
         }
@@ -281 +277 @@
                         }
 
-                        $is_full  = preg_match( "/-bpfull/", $avatar_file->name );
-                        $is_thumb = preg_match( "/-bpthumb/", $avatar_file->name );
+                        $is_full  = preg_match( '/-bpfull/', $avatar_file->name );
+                        $is_thumb = preg_match( '/-bpthumb/', $avatar_file->name );
 
                         if ( $is_full || $is_thumb ) {
@@ -322 +318 @@
             'thumb' => '',
         );
-        $timestamp   = bp_core_current_time( true, 'timestamp' );
+        $timestamp    = bp_core_current_time( true, 'timestamp' );
 
         foreach ( $avatar_types as $key_type => $type ) {
@@ -359 +355 @@
      */
     private function get_user_id() {
-        $bp = buddypress();
+        $bp      = buddypress();
         $user_id = 0;
 
@@ -424 +420 @@
                 'item_id'    => $user_id,
                 'has_avatar' => bp_get_user_has_avatar( $user_id ),
-                'nonces'  => array(
+                'nonces'     => array(
                     'set'    => wp_create_nonce( 'bp_avatar_cropstore' ),
                     'remove' => wp_create_nonce( 'bp_delete_avatar_link' ),
@@ -476 +472 @@
 
         // Include the specific css.
-        $script_data['extra_js']  = $js_scripts;
+        $script_data['extra_js'] = $js_scripts;
 
         // Set the object to contextualize the filter.