Changeset 11779

Timestamp:

01/02/2018 10:20:02 AM (9 years ago)

Author:

djpaul

Message:

Core, Media: misc. tidy-up for the attachments functions.

File:

• trunk/src/bp-core/bp-core-attachments.php (modified) (8 diffs)

trunk/src/bp-core/bp-core-attachments.php

@@ -1190 +1190 @@
  */
 function bp_attachments_cover_image_ajax_upload() {
-        // Bail if not a POST action.
         if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
                 wp_die();
         }
 
-        /**
-         * Sending the json response will be different if
-         * the current Plupload runtime is html4
-         */
-        $is_html4 = false;
-        if ( ! empty( $_POST['html4' ] ) ) {
-                $is_html4 = true;
-        }
-
-        // Check the nonce.
         check_admin_referer( 'bp-uploader' );
 
-        // Init the BuddyPress parameters.
-        $bp_params = array();
-
-        // We need it to carry on.
-        if ( ! empty( $_POST['bp_params'] ) ) {
-                $bp_params = bp_parse_args( $_POST['bp_params'], array(
-                        'object'  => 'user',
-                        'item_id' => bp_loggedin_user_id(),
-                ), 'attachments_cover_image_ajax_upload' );
-        } else {
+        // Sending the json response will be different if the current Plupload runtime is html4.
+        $is_html4 = ! empty( $_POST['html4' ] );
+
+        if ( empty( $_POST['bp_params'] ) ) {
                 bp_attachments_json_response( false, $is_html4 );
         }
+
+        $bp_params = bp_parse_args( $_POST['bp_params'], array(
+                'object'  => 'user',
+                'item_id' => bp_loggedin_user_id(),
+        ), 'attachments_cover_image_ajax_upload' );
+
+        $bp_params['item_id'] = (int) $bp_params['item_id'];
+        $bp_params['object']  = sanitize_text_field( $bp_params['object'] );
 
         // We need the object to set the uploads dir filter.
@@ -1298 +1289 @@
         }
 
-        // Default error message.
         $error_message = __( 'There was a problem uploading the cover image.', 'buddypress' );
 
-        // Get BuddyPress Attachments Uploads Dir datas.
         $bp_attachments_uploads_dir = bp_attachments_uploads_dir_get();
 
@@ -1323 +1312 @@
         }
 
-        /**
+        /*
          * Generate the cover image so that it fit to feature's dimensions
          *
-         * Unlike the Avatar, Uploading and generating the cover image is happening during
+         * Unlike the avatar, uploading and generating the cover image is happening during
          * the same Ajax request, as we already instantiated the BP_Attachment_Cover_Image
          * class, let's use it.
@@ -1337 +1326 @@
 
         if ( ! $cover ) {
-                // Upload error response.
                 bp_attachments_json_response( false, $is_html4, array(
                         'type'    => 'upload_error',
@@ -1344 +1332 @@
         }
 
-        // Build the url to the file.
         $cover_url = trailingslashit( $bp_attachments_uploads_dir['baseurl'] ) . $cover_subdir . '/' . $cover['cover_basename'];
 
-        // Init Feedback code, 1 is success.
+        // 1 is success.
         $feedback_code = 1;
 
@@ -1392 +1379 @@
  */
 function bp_attachments_cover_image_ajax_delete() {
-        // Bail if not a POST action.
         if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
                 wp_send_json_error();
@@ -1438 +1424 @@
                 do_action( "{$component}_cover_image_deleted", (int) $cover_image_data['item_id'] );
 
-                // Defaults no cover image.
                 $response = array(
                         'reset_url'     => '',
-                        'feedback_code' => 3 ,
+                        'feedback_code' => 3,
                 );
 
@@ -1452 +1437 @@
                 }
 
-                // Finally send the reset url.
                 wp_send_json_success( $response );