Changeset 3757 for trunk/bp-core/bp-core-avatars.php

Timestamp:

01/20/2011 10:53:49 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Second pass at huge component refactor.

Move component files out of root directory and append '-loader' to the file names. Split those files up into smaller pieces.

Abstract 'settings' component out of 'core' and into its own component for future extension, including new template files in bp-default.

Append '-sa' to bbPress bridge file for 'Stand Alone' compatibility, to make room for bbPress plugin compatibility layer.

Various bug fixes through-out all components. Various code clean-up and documentation through-out all components.

Still more refactoring to do.

File:

• trunk/bp-core/bp-core-avatars.php (modified) (13 diffs)

trunk/bp-core/bp-core-avatars.php

@@ -1 +1 @@
 <?php
-/*
- Based on contributions from: Beau Lebens - http://www.dentedreality.com.au/
- Modified for BuddyPress by: Andy Peatling - http://apeatling.wordpress.com/
-*/
+/**
+ * BuddyPress Avatars
+ *
+ * Based on contributions from: Beau Lebens - http://www.dentedreality.com.au/
+ * Modified for BuddyPress by: Andy Peatling - http://apeatling.wordpress.com/
+ */
 
 /***
@@ -34 +36 @@
     if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
         if ( !isset( $bp->site_options['fileupload_maxk'] ) )
-            define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); /* 5mb */
+            define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); // 5mb
         else
             define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', $bp->site_options['fileupload_maxk'] * 1024 );
@@ -45 +47 @@
         define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-core/images/mystery-man-50.jpg' );
 }
-add_action( 'bp_init', 'bp_core_set_avatar_constants', 8 );
+add_action( 'bp_init', 'bp_core_set_avatar_constants', 3 );
 
 /**
@@ -164 +166 @@
      * or thumbnail image.
      */
-    $avatar_size = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';
-    $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1';
+    $avatar_size              = ( 'full' == $type ) ? '-bpfull' : '-bpthumb';
+    $legacy_user_avatar_name  = ( 'full' == $type ) ? '-avatar2' : '-avatar1';
     $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb';
 
@@ -263 +265 @@
 
         // Filter gravatar vars
-        $email      = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
-        $gravatar   = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
+        $email    = apply_filters( 'bp_core_gravatar_email', $email, $item_id, $object );
+        $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( strtolower( $email ) ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
 
     } else {
@@ -281 +283 @@
 
     $defaults = array(
-        'item_id' => false,
-        'object' => 'user', // user OR group OR blog OR custom type (if you use filters)
+        'item_id'    => false,
+        'object'     => 'user', // user OR group OR blog OR custom type (if you use filters)
         'avatar_dir' => false
     );
@@ -372 +374 @@
     }
 
-    /* Filter the upload location */
+    // Filter the upload location
     add_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
 
     $bp->avatar_admin->original = wp_handle_upload( $file['file'], array( 'action'=> 'bp_avatar_upload' ) );
 
-    /* Move the file to the correct upload location. */
+    // Move the file to the correct upload location.
     if ( !empty( $bp->avatar_admin->original['error'] ) ) {
         bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $bp->avatar_admin->original['error'] ), 'error' );
@@ -383 +385 @@
     }
 
-    /* Get image size */
+    // Get image size
     $size = @getimagesize( $bp->avatar_admin->original['file'] );
 
-    /* Check image size and shrink if too large */
+    // Check image size and shrink if too large
     if ( $size[0] > BP_AVATAR_ORIGINAL_MAX_WIDTH ) {
         $thumb = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
 
-        /* Check for thumbnail creation errors */
+        // Check for thumbnail creation errors
         if ( is_wp_error( $thumb ) ) {
             bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $thumb->get_error_message() ), 'error' );
@@ -396 +398 @@
         }
 
-        /* Thumbnail is good so proceed */
+        // Thumbnail is good so proceed
         $bp->avatar_admin->resized = $thumb;
     }
 
-    /* We only want to handle one image after resize. */
+    // We only want to handle one image after resize.
     if ( empty( $bp->avatar_admin->resized ) )
         $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->original['file'] );
@@ -414 +416 @@
     }
 
-    /* Set the url value for the image */
+    // Set the url value for the image
     $bp->avatar_admin->image->url = BP_AVATAR_URL . $bp->avatar_admin->image->dir;
 
@@ -424 +426 @@
 
     $defaults = array(
-        'object' => 'user',
-        'avatar_dir' => 'avatars',
-        'item_id' => false,
+        'object'        => 'user',
+        'avatar_dir'    => 'avatars',
+        'item_id'       => false,
         'original_file' => false,
-        'crop_w' => BP_AVATAR_FULL_WIDTH,
-        'crop_h' => BP_AVATAR_FULL_HEIGHT,
-        'crop_x' => 0,
-        'crop_y' => 0
+        'crop_w'        => BP_AVATAR_FULL_WIDTH,
+        'crop_h'        => BP_AVATAR_FULL_HEIGHT,
+        'crop_x'        => 0,
+        'crop_y'        => 0
     );
 
@@ -464 +466 @@
     require_once( ABSPATH . '/wp-admin/includes/file.php' );
 
-    /* Delete the existing avatar files for the object */
+    // Delete the existing avatar files for the object
     bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
 
-    /* Make sure we at least have a width and height for cropping */
+    // Make sure we at least have a width and height for cropping
     if ( !(int)$crop_w )
         $crop_w = BP_AVATAR_FULL_WIDTH;
@@ -474 +476 @@
         $crop_h = BP_AVATAR_FULL_HEIGHT;
 
-    /* Set the full and thumb filenames */
-    $full_filename = wp_hash( $original_file . time() ) . '-bpfull.jpg';
+    // Set the full and thumb filenames
+    $full_filename  = wp_hash( $original_file . time() ) . '-bpfull.jpg';
     $thumb_filename = wp_hash( $original_file . time() ) . '-bpthumb.jpg';
 
-    /* Crop the image */
-    $full_cropped = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
+    // Crop the image
+    $full_cropped  = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_FULL_WIDTH, BP_AVATAR_FULL_HEIGHT, false, $avatar_folder_dir . '/' . $full_filename );
     $thumb_cropped = wp_crop_image( $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, BP_AVATAR_THUMB_WIDTH, BP_AVATAR_THUMB_HEIGHT, false, $avatar_folder_dir . '/' . $thumb_filename );
 
-    /* Remove the original */
+    // Remove the original
     @unlink( $original_file );