Changes in branches/1.2/bp-core/bp-core-avatars.php [2876:2984]

File:

• branches/1.2/bp-core/bp-core-avatars.php (modified) (9 diffs)

branches/1.2/bp-core/bp-core-avatars.php

@@ -109 +109 @@
         $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"';
 
-    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, BP_AVATAR_UPLOAD_PATH ) . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
+    $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', BP_AVATAR_URL . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
     $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
 
@@ -131 +131 @@
 
         if ( $avatar_url )
-            return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
+            return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
     }
 
@@ -163 +163 @@
         $gravatar = apply_filters( 'bp_gravatar_url', $host ) . md5( $email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
 
-        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
-
+        return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
     } else {
-        return false;
+        return apply_filters( 'bp_core_fetch_avatar', false, $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
     }
 }
@@ -230 +229 @@
 function bp_core_avatar_handle_upload( $file, $upload_dir_filter ) {
     global $bp;
+
+    /***
+     * You may want to hook into this filter if you want to override this function.
+     * Make sure you return false.
+     */
+    if ( !apply_filters( 'bp_core_pre_avatar_handle_upload', true, $file, $upload_dir_filter ) )
+        return true;
 
     require_once( ABSPATH . '/wp-admin/includes/image.php' );
@@ -269 +275 @@
     }
 
-    /* Resize the image down to something manageable and then delete the original */
-    if ( getimagesize( $bp->avatar_admin->original['file'] ) > BP_AVATAR_ORIGINAL_MAX_WIDTH )
-        $bp->avatar_admin->resized = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
-
-    $bp->avatar_admin->image = new stdClass;
+    /* Get image size */
+    $size = @getimagesize( $bp->avatar_admin->original['file'] );
+
+    /* 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 */
+        if ( is_wp_error( $thumb ) ) {
+            bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $thumb->get_error_message() ), 'error' );
+            return false;
+        }
+
+        /* Thumbnail is good so proceed */
+        $bp->avatar_admin->resized = $thumb;
+    }
 
     /* We only want to handle one image after resize. */
     if ( empty( $bp->avatar_admin->resized ) )
-        $bp->avatar_admin->image->dir = $bp->avatar_admin->original['file'];
+        $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->original['file'] );
     else {
-        $bp->avatar_admin->image->dir = $bp->avatar_admin->resized;
+        $bp->avatar_admin->image->dir = str_replace( BP_AVATAR_UPLOAD_PATH, '', $bp->avatar_admin->resized );
         @unlink( $bp->avatar_admin->original['file'] );
     }
 
     /* Set the url value for the image */
-    $bp->avatar_admin->image->url = str_replace( WP_CONTENT_DIR, BP_AVATAR_URL, $bp->avatar_admin->image->dir );
+    $bp->avatar_admin->image->url = BP_AVATAR_URL . $bp->avatar_admin->image->dir;
 
     return true;
@@ -304 +321 @@
 
     $r = wp_parse_args( $args, $defaults );
+
+    /***
+     * You may want to hook into this filter if you want to override this function.
+     * Make sure you return false.
+     */
+    if ( !apply_filters( 'bp_core_pre_avatar_handle_crop', true, $r ) )
+        return true;
+
     extract( $r, EXTR_SKIP );
 
@@ -309 +334 @@
         return false;
 
-    if ( !file_exists( WP_CONTENT_DIR . '/' . $original_file ) )
+    $original_file = BP_AVATAR_UPLOAD_PATH . $original_file;
+
+    if ( !file_exists( $original_file ) )
         return false;
 
     if ( !$item_id )
-        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir );
+        $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', dirname( $original_file ), $item_id, $object, $avatar_dir );
     else
         $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', BP_AVATAR_UPLOAD_PATH . '/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir );
@@ -338 +365 @@
 
     /* Crop the image */
-    $full_cropped = wp_crop_image( WP_CONTENT_DIR . $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( WP_CONTENT_DIR . $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 );
+    $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 */
-    @unlink( WP_CONTENT_DIR . $original_file );
+    @unlink( $original_file );
 
     return true;
@@ -389 +416 @@
 
 function bp_core_avatar_upload_path() {
-    if ( bp_core_is_multisite() )
-        $path = ABSPATH . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
-    else {
-        if ( !$path = get_option( 'upload_path' ) )
-            $path = WP_CONTENT_DIR . '/uploads';
-    }
-
-    return apply_filters( 'bp_core_avatar_upload_path', $path );
+    $upload_dir = wp_upload_dir();
+    return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
 }
 
 function bp_core_avatar_url() {
-    if ( !bp_core_is_multisite() )
-        return WP_CONTENT_URL;
-
-    return apply_filters( 'bp_core_avatar_url', get_blog_option( BP_ROOT_BLOG, 'siteurl' ) );
+    $upload_dir = wp_upload_dir();
+    return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
 }