Changeset 6600 for trunk/bp-xprofile/bp-xprofile-screens.php

Timestamp:

12/10/2012 12:52:16 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Avatars:

• Clean up avatar code.
• When uploading a png, use the correct file extension.
• Fixes #4705.
• Enqueue Jcrop styling.

File:

• trunk/bp-xprofile/bp-xprofile-screens.php (modified) (6 diffs)

trunk/bp-xprofile/bp-xprofile-screens.php

@@ -37 +37 @@
  */
 function xprofile_screen_edit_profile() {
-    global $bp;
 
     if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
         return false;
+
+    $bp = buddypress();
 
     // Make sure a group is set.
@@ -105 +106 @@
 
                 // Certain types of fields (checkboxes, multiselects) may come through empty. Save them as an empty array so that they don't get overwritten by the default on the next edit.
-                if ( empty( $_POST['field_' . $field_id] ) )
+                if ( empty( $_POST['field_' . $field_id] ) ) {
                     $value = array();
-                else
+                } else {
                     $value = $_POST['field_' . $field_id];
-
-                if ( !xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[$field_id] ) )
+                }
+
+                if ( !xprofile_set_field_data( $field_id, bp_displayed_user_id(), $value, $is_required[$field_id] ) ) {
                     $errors = true;
-                else
+                } else {
                     do_action( 'xprofile_profile_field_data_updated', $field_id, $value );
+                }
 
                 // Save the visibility level
@@ -123 +126 @@
 
             // Set the feedback messages
-            if ( !empty( $errors ) )
+            if ( !empty( $errors ) ) {
                 bp_core_add_message( __( 'There was a problem updating some of your profile information, please try again.', 'buddypress' ), 'error' );
-            else
+            } else {
                 bp_core_add_message( __( 'Changes saved.', 'buddypress' ) );
+            }
 
             // Redirect back to the edit screen to display the updates and message
@@ -145 +149 @@
  */
 function xprofile_screen_change_avatar() {
-    global $bp;
-
+
+    // Bail if not the correct screen
     if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
         return false;
 
+    // Bail if there are action variables
     if ( bp_action_variables() ) {
         bp_do_404();
@@ -155 +160 @@
     }
 
+    $bp = buddypress();
+
     if ( ! isset( $bp->avatar_admin ) )
         $bp->avatar_admin = new stdClass();
@@ -180 +187 @@
         check_admin_referer( 'bp_avatar_cropstore' );
 
-        if ( !bp_core_avatar_handle_crop( array( 'item_id' => bp_displayed_user_id(), 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
-            bp_core_add_message( __( 'There was a problem cropping your avatar, please try uploading it again', 'buddypress' ), 'error' );
-        else {
-            bp_core_add_message( __( 'Your new avatar was uploaded successfully!', 'buddypress' ) );
+        $args = array(
+            'item_id'       => bp_displayed_user_id(),
+            'original_file' => $_POST['image_src'],
+            'crop_x'        => $_POST['x'],
+            'crop_y'        => $_POST['y'],
+            'crop_w'        => $_POST['w'],
+            'crop_h'        => $_POST['h']
+        );
+
+        if ( ! bp_core_avatar_handle_crop( $args ) ) {
+            bp_core_add_message( __( 'There was a problem cropping your avatar.', 'buddypress' ), 'error' );
+        } else {
+            bp_core_add_message( __( 'Your new avatar was uploaded successfully.', 'buddypress' ) );
             do_action( 'xprofile_avatar_uploaded' );
         }