Index: bp-core/bp-core-avatars.php =================================================================== --- bp-core/bp-core-avatars.php (revision 1793) +++ bp-core/bp-core-avatars.php (working copy) @@ -31,16 +31,46 @@ if ( !defined( 'BP_AVATAR_DEFAULT_THUMB' ) ) define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-xprofile/images/none-thumbnail.gif' ); - + +// Allow filtering of full avatar sizes +function bp_core_avatar_full_height() { + echo bp_get_core_avatar_full_height(); +} + function bp_get_core_avatar_full_height() { + return apply_filters( 'bp_get_core_avatar_full_height', BP_AVATAR_FULL_HEIGHT ); + } + +function bp_core_avatar_full_width() { + echo bp_get_core_avatar_full_width(); +} + function bp_get_core_avatar_full_width() { + return apply_filters( 'bp_get_core_avatar_full_width', BP_AVATAR_FULL_WIDTH ); + } + +// Allow filtering of thumb avatar sizes +function bp_core_avatar_thumb_height() { + echo bp_get_core_avatar_thumb_height(); +} + function bp_get_core_avatar_thumb_height() { + return apply_filters( 'bp_get_core_avatar_thumb_height', BP_AVATAR_THUMB_HEIGHT ); + } + +function bp_core_avatar_thumb_width() { + echo bp_get_core_avatar_thumb_width(); +} + function bp_get_core_avatar_thumb_width() { + return apply_filters( 'bp_get_core_avatar_thumb_width', BP_AVATAR_THUMB_WIDTH ); + } + function bp_core_fetch_avatar( $args = '' ) { global $bp, $current_blog; - + $defaults = array( 'item_id' => false, 'object' => 'user', // user OR group OR blog OR custom type (if you use filters) 'type' => 'thumb', 'avatar_dir' => false, - 'width' => false, + 'width' => false, 'height' => false, 'class' => 'avatar', 'css_id' => false, @@ -49,8 +79,8 @@ ); $params = wp_parse_args( $args, $defaults ); - extract( $params, EXTR_SKIP ); - + extract( $params, EXTR_SKIP ); + if ( !$item_id ) { if ( 'user' == $object ) $item_id = $bp->displayed_user->id; @@ -58,12 +88,12 @@ $item_id = $bp->groups->current_group->id; else if ( 'blog' == $object ) $item_id = $current_blog->id; - + $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object ); - + if ( !$item_id ) return false; } - + if ( !$avatar_dir ) { if ( 'user' == $object ) $avatar_dir = 'avatars'; @@ -71,31 +101,31 @@ $avatar_dir = 'group-avatars'; else if ( 'blog' == $object ) $avatar_dir = 'blog-avatars'; - + $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object ); - - if ( !$avatar_dir ) return false; + + if ( !$avatar_dir ) return false; } - + if ( !$css_id ) - $css_id = $object . '-' . $item_id . '-avatar'; - + $css_id = $object . '-' . $item_id . '-avatar'; + if ( $width ) $html_width = " width='{$width}'"; else - $html_width = ( 'thumb' == $type ) ? ' width="' . BP_AVATAR_THUMB_WIDTH . '"' : ' width="' . BP_AVATAR_FULL_WIDTH . '"'; - + $html_width = ( 'thumb' == $type ) ? ' width="' . bp_get_core_avatar_thumb_width() . '"' : ' width="' . bp_get_core_avatar_full_width() . '"'; + if ( $height ) $html_height = " height='{$height}'"; else - $html_height = ( 'thumb' == $type ) ? ' height="' . BP_AVATAR_THUMB_HEIGHT . '"' : ' height="' . BP_AVATAR_FULL_HEIGHT . '"'; - - $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', $bp->root_domain . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); - $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); - - /* If no avatars have been uploaded for this item, display a gravatar */ + $html_height = ( 'thumb' == $type ) ? ' height="' . bp_get_core_avatar_thumb_height() . '"' : ' height="' . bp_get_core_avatar_full_height() . '"'; + + $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', $bp->root_domain . '/' . basename( WP_CONTENT_DIR ) . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); + $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); + + /* If no avatars have been uploaded for this item, display a gravatar */ if ( !file_exists( $avatar_folder_dir ) && !$no_grav ) { - + if ( empty( $bp->grav_default->{$object} ) ) $default_grav = 'wavatar'; else if ( 'mystery' == $bp->grav_default->{$object} ) @@ -104,28 +134,28 @@ $default_grav = $bp->grav_default->{$object}; if ( $width ) $grav_size = $width; - else if ( 'full' == $type ) $grav_size = BP_AVATAR_FULL_WIDTH; - else if ( 'thumb' == $type ) $grav_size = BP_AVATAR_THUMB_WIDTH; - + else if ( 'full' == $type ) $grav_size = bp_get_core_avatar_full_width(); + else if ( 'thumb' == $type ) $grav_size = bp_get_core_avatar_thumb_width(); + if ( 'user' == $object ) { $ud = get_userdata( $item_id ); $grav_email = $ud->user_email; } else if ( 'group' == $object || 'blog' == $object ) { $grav_email = "{$item_id}-{$object}@{$bp->root_domain}"; } - - $grav_email = apply_filters( 'bp_core_gravatar_email', $grav_email, $item_id, $object ); + + $grav_email = apply_filters( 'bp_core_gravatar_email', $grav_email, $item_id, $object ); $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $grav_email ) . '?d=' . $default_grav . '&s=' . $grav_size; - + return apply_filters( 'bp_core_fetch_avatar', "{$alt}", $params ); } else if ( !file_exists( $avatar_folder_dir ) && $no_grav ) return false; - + /* Set the file names to search for to select the full size or thumbnail image. */ - $avatar_name = ( 'full' == $type ) ? '-bpfull' : '-bpthumb'; - $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1'; - $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb'; - + $avatar_name = ( 'full' == $type ) ? '-bpfull' : '-bpthumb'; + $legacy_user_avatar_name = ( 'full' == $type ) ? '-avatar2' : '-avatar1'; + $legacy_group_avatar_name = ( 'full' == $type ) ? '-groupavatar-full' : '-groupavatar-thumb'; + if ( $av_dir = opendir( $avatar_folder_dir ) ) { while ( false !== ( $avatar_file = readdir($av_dir) ) ) { if ( preg_match( "/{$avatar_name}/", $avatar_file ) || preg_match( "/{$legacy_user_avatar_name}/", $avatar_file ) || preg_match( "/{$legacy_group_avatar_name}/", $avatar_file ) ) @@ -134,12 +164,12 @@ } closedir($av_dir); - return apply_filters( 'bp_core_fetch_avatar', "{$alt}", $params ); + return apply_filters( 'bp_core_fetch_avatar', "{$alt}", $params ); } function bp_core_delete_existing_avatar( $args = '' ) { global $bp; - + $defaults = array( 'item_id' => false, 'object' => 'user', // user OR group OR blog OR custom type (if you use filters) @@ -147,8 +177,8 @@ ); $args = wp_parse_args( $args, $defaults ); - extract( $args, EXTR_SKIP ); - + extract( $args, EXTR_SKIP ); + if ( !$item_id ) { if ( 'user' == $object ) $item_id = $bp->displayed_user->id; @@ -156,12 +186,12 @@ $item_id = $bp->groups->current_group->id; else if ( 'blog' == $object ) $item_id = $current_blog->id; - + $item_id = apply_filters( 'bp_core_avatar_item_id', $item_id, $object ); - + if ( !$item_id ) return false; } - + if ( !$avatar_dir ) { if ( 'user' == $object ) $avatar_dir = 'avatars'; @@ -169,10 +199,10 @@ $avatar_dir = 'group-avatars'; else if ( 'blog' == $object ) $avatar_dir = 'blog-avatars'; - + $avatar_dir = apply_filters( 'bp_core_avatar_dir', $avatar_dir, $object ); - - if ( !$avatar_dir ) return false; + + if ( !$avatar_dir ) return false; } if ( 'user' == $object ) { @@ -183,7 +213,7 @@ delete_usermeta( $item_id, 'bp_core_avatar_v2' ); } - $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); + $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); if ( !file_exists( $avatar_folder_dir ) ) return false; @@ -191,7 +221,7 @@ if ( $av_dir = opendir( $avatar_folder_dir ) ) { while ( false !== ( $avatar_file = readdir($av_dir) ) ) { if ( ( preg_match( "/-bpfull/", $avatar_file ) || preg_match( "/-bpthumb/", $avatar_file ) ) && '.' != $avatar_file && '..' != $avatar_file ) - @unlink( $avatar_folder_dir . '/' . $avatar_file ); + @unlink( $avatar_folder_dir . '/' . $avatar_file ); } } closedir($av_dir); @@ -205,13 +235,13 @@ function bp_core_avatar_handle_upload( $file, $upload_dir_filter ) { global $bp; - + require_once( ABSPATH . '/wp-admin/includes/image.php' ); require_once( ABSPATH . '/wp-admin/includes/file.php' ); - + $uploadErrors = array( - 0 => __("There is no error, the file uploaded with success", 'buddypress'), - 1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE), + 0 => __("There is no error, the file uploaded with success", 'buddypress'), + 1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE), 2 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE), 3 => __("The uploaded file was only partially uploaded", 'buddypress'), 4 => __("No file was uploaded", 'buddypress'), @@ -222,20 +252,20 @@ bp_core_add_message( sprintf( __( 'Your upload failed, please try again. Error was: %s', 'buddypress' ), $uploadErrors[$file['file']['error']] ), 'error' ); return false; } - + if ( !bp_core_check_avatar_size( $file ) ) { bp_core_add_message( sprintf( __( 'The file you uploaded is too big. Please upload a file under %s', 'buddypress'), size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE) ), 'error' ); return false; } - + if ( !bp_core_check_avatar_type( $file ) ) { bp_core_add_message( __( 'Please upload only JPG, GIF or PNG photos.', 'buddypress' ), 'error' ); return false; } - + // 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. @@ -243,22 +273,22 @@ bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $bp->avatar_admin->original['error'] ), 'error' ); return false; } - + // 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; - - // 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 = $bp->avatar_admin->original['file']; else { $bp->avatar_admin->image->dir = $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, WP_CONTENT_URL, $bp->avatar_admin->image->dir ); @@ -267,56 +297,56 @@ function bp_core_avatar_handle_crop( $args = '' ) { global $bp; - + $defaults = array( 'object' => 'user', 'avatar_dir' => 'avatars', 'item_id' => false, 'original_file' => false, - 'crop_w' => BP_AVATAR_FULL_WIDTH, - 'crop_h' => BP_AVATAR_FULL_HEIGHT, + 'crop_w' => bp_get_core_avatar_full_width(), + 'crop_h' => bp_get_core_avatar_full_height(), 'crop_x' => 0, 'crop_y' => 0 ); $r = wp_parse_args( $args, $defaults ); extract( $r, EXTR_SKIP ); - + if ( !$original_file ) return false; if ( !file_exists( WP_CONTENT_DIR . '/' . $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', WP_CONTENT_DIR . dirname( $original_file ), $item_id, $object, $avatar_dir ); else $avatar_folder_dir = apply_filters( 'bp_core_avatar_folder_dir', WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/' . $avatar_dir . '/' . $item_id, $item_id, $object, $avatar_dir ); if ( !file_exists( $avatar_folder_dir ) ) return false; - + require_once( ABSPATH . '/wp-admin/includes/image.php' ); require_once( ABSPATH . '/wp-admin/includes/file.php' ); /* 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 */ if ( !(int)$crop_w ) - $crop_w = BP_AVATAR_FULL_WIDTH; - + $crop_w = bp_get_core_avatar_full_width(); + if ( !(int)$crop_h ) - $crop_h = BP_AVATAR_FULL_HEIGHT; + $crop_h = bp_get_core_avatar_full_height(); /* 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( 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( WP_CONTENT_DIR . $original_file, (int)$crop_x, (int)$crop_y, (int)$crop_w, (int)$crop_h, bp_get_core_avatar_full_width(), bp_get_core_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_get_core_avatar_thumb_width(), bp_get_core_avatar_thumb_height(), false, $avatar_folder_dir . '/' . $thumb_filename ); + /* Remove the original */ @unlink( WP_CONTENT_DIR . $original_file ); @@ -327,7 +357,7 @@ function bp_core_fetch_avatar_filter( $avatar, $id_or_email, $size, $default, $alt ) { if ( is_object ( $id_or_email ) ) $id_or_email = $id_or_email->user_id; - + $bp_avatar = bp_core_fetch_avatar( array( 'no_grav' => true, 'item_id' => $id_or_email, 'width' => $size, 'height' => $size, 'alt' => $alt ) ); return ( !$bp_avatar ) ? $avatar : $bp_avatar; @@ -337,21 +367,21 @@ function bp_core_check_avatar_upload($file) { if ( $file['error'] ) return false; - + return true; } function bp_core_check_avatar_size($file) { if ( $file['file']['size'] > BP_AVATAR_ORIGINAL_MAX_FILESIZE ) return false; - + return true; } function bp_core_check_avatar_type($file) { if ( ( strlen($file['file']['type']) && !preg_match('/(jpe?g|gif|png)$/', $file['file']['type'] ) ) && !preg_match( '/(jpe?g|gif|png)$/', $file['file']['name'] ) ) return false; - + return true; } Index: bp-core/bp-core-cssjs.php =================================================================== --- bp-core/bp-core-cssjs.php (revision 1793) +++ bp-core/bp-core-cssjs.php (working copy) @@ -94,6 +94,16 @@ global $bp; $image = apply_filters( 'bp_inline_cropper_image', getimagesize( $bp->avatar_admin->image->dir ) ); + + $width = (int)bp_get_core_avatar_full_width(); + $height = (int)bp_get_core_avatar_full_height(); + + // Calculate Aspect Ratio + if ( $width == $height ) + $aspect_ratio = 1; + elseif ( $width != $height ) + $aspect_ratio = $width / $height; + ?>