mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-06-05 15:09:37 +09:00
- fixed multisite file/image download;
This commit is contained in:
@@ -7,7 +7,7 @@ Ultimate Member is the #1 user profile & membership plugin for WordPress. The pl
|
||||
|
||||
| Latest Version |Requires at least|Stable Tag|
|
||||
| :------------: |:------------:|:------------:|
|
||||
| 2.0.25 | WordPress 4.9 or higher| 2.0.25 |
|
||||
| 2.0.27 | WordPress 4.9 or higher| 2.0.27 |
|
||||
|
||||
|
||||
Features of the plugin include:
|
||||
@@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version
|
||||
|
||||
Releases
|
||||
====================
|
||||
[Official Release Version: 2.0.25](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.25).
|
||||
[Official Release Version: 2.0.27](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.27).
|
||||
|
||||
[Official Release Version: 1.3.88](https://github.com/ultimatemember/ultimatemember/releases).
|
||||
|
||||
|
||||
@@ -2313,6 +2313,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
|
||||
} else {
|
||||
$file_url = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
|
||||
$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
|
||||
|
||||
if ( ! file_exists( $file_dir ) ) {
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$file_dir = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $file_dir );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( file_exists( $file_dir ) ) {
|
||||
|
||||
@@ -161,11 +161,19 @@ if ( ! class_exists( 'um\core\Files' ) ) {
|
||||
*/
|
||||
function image_download( $user_id, $field_key, $field_value ) {
|
||||
$file_path = UM()->uploader()->get_upload_base_dir() . $user_id . DIRECTORY_SEPARATOR . $field_value;
|
||||
if ( ! file_exists( $file_path ) ) {
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$file_path = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $file_path );
|
||||
}
|
||||
}
|
||||
|
||||
$file_info = get_user_meta( $user_id, $field_key . "_metadata", true );
|
||||
|
||||
$pathinfo = pathinfo( $file_path );
|
||||
$size = filesize( $file_path );
|
||||
$originalname = $file_info['original_name'];
|
||||
$type = $file_info['type'];
|
||||
$originalname = ! empty( $file_info['original_name'] ) ? $file_info['original_name'] : $pathinfo['basename'];
|
||||
$type = ! empty( $file_info['type'] ) ? $file_info['type'] : $pathinfo['extension'];
|
||||
|
||||
header('Content-Description: File Transfer');
|
||||
header('Content-Type: ' . $type );
|
||||
@@ -187,11 +195,19 @@ if ( ! class_exists( 'um\core\Files' ) ) {
|
||||
*/
|
||||
function file_download( $user_id, $field_key, $field_value ) {
|
||||
$file_path = UM()->uploader()->get_upload_base_dir() . $user_id . DIRECTORY_SEPARATOR . $field_value;
|
||||
if ( ! file_exists( $file_path ) ) {
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$file_path = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $file_path );
|
||||
}
|
||||
}
|
||||
|
||||
$file_info = get_user_meta( $user_id, $field_key . "_metadata", true );
|
||||
|
||||
$pathinfo = pathinfo( $file_path );
|
||||
$size = filesize( $file_path );
|
||||
$originalname = $file_info['original_name'];
|
||||
$type = $file_info['type'];
|
||||
$originalname = ! empty( $file_info['original_name'] ) ? $file_info['original_name'] : $pathinfo['basename'];
|
||||
$type = ! empty( $file_info['type'] ) ? $file_info['type'] : $pathinfo['extension'];
|
||||
|
||||
header('Content-Description: File Transfer');
|
||||
header('Content-Type: ' . $type );
|
||||
|
||||
@@ -47,16 +47,18 @@ function um_submit_form_errors_hook_login( $args ) {
|
||||
$user_name = $args['user_login'];
|
||||
}
|
||||
|
||||
if ( !username_exists( $user_name ) ) {
|
||||
/*if ( !username_exists( $user_name ) ) {
|
||||
if ( $is_email ) {
|
||||
UM()->form()->add_error( $field, __(' Sorry, we can\'t find an account with that email address','ultimate-member') );
|
||||
} else {
|
||||
UM()->form()->add_error( $field, __(' Sorry, we can\'t find an account with that username','ultimate-member') );
|
||||
}
|
||||
} else {
|
||||
if ( $args['user_password'] == '' ) {
|
||||
UM()->form()->add_error( 'user_password', __('Please enter your password','ultimate-member') );
|
||||
}
|
||||
|
||||
}*/
|
||||
|
||||
if ( $args['user_password'] == '' ) {
|
||||
UM()->form()->add_error( 'user_password', __('Please enter your password','ultimate-member') );
|
||||
}
|
||||
|
||||
$user = get_user_by( 'login', $user_name );
|
||||
@@ -100,26 +102,29 @@ add_action( 'um_submit_form_errors_hook_login', 'um_submit_form_errors_hook_logi
|
||||
*/
|
||||
function um_display_login_errors( $args ) {
|
||||
$error = '';
|
||||
|
||||
if( UM()->form()->count_errors() > 0 ) {
|
||||
|
||||
if ( UM()->form()->count_errors() > 0 ) {
|
||||
$errors = UM()->form()->errors;
|
||||
// hook for other plugins to display error
|
||||
$error_keys = array_keys( $errors );
|
||||
}
|
||||
}
|
||||
|
||||
if( isset( $args['custom_fields'] ) ){
|
||||
$custom_fields = $args['custom_fields'];
|
||||
}
|
||||
if ( isset( $args['custom_fields'] ) ) {
|
||||
$custom_fields = $args['custom_fields'];
|
||||
}
|
||||
|
||||
if( ! empty( $error_keys ) && ! empty( $custom_fields ) ){
|
||||
foreach( $error_keys as $error ){
|
||||
if( trim( $error ) && ! isset( $custom_fields[ $error ] ) && ! empty( $errors[ $error ] ) ){
|
||||
$error_message = apply_filters( 'login_errors', $errors[ $error ] );
|
||||
echo '<p class="um-notice err um-error-code-'.$error.'"><i class="um-icon-ios-close-empty" onclick="jQuery(this).parent().fadeOut();"></i>' . $error_message . '</p>';
|
||||
if ( ! empty( $error_keys ) && ! empty( $custom_fields ) ) {
|
||||
foreach ( $error_keys as $error ) {
|
||||
if ( trim( $error ) && ! isset( $custom_fields[ $error ] ) && ! empty( $errors[ $error ] ) ) {
|
||||
$error_message = apply_filters( 'login_errors', $errors[ $error ], $error );
|
||||
if ( empty( $error_message ) ) {
|
||||
return;
|
||||
}
|
||||
echo '<p class="um-notice err um-error-code-' . esc_attr( $error ) . '"><i class="um-icon-ios-close-empty" onclick="jQuery(this).parent().fadeOut();"></i>' . $error_message . '</p>';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
add_action( 'um_before_login_fields', 'um_display_login_errors' );
|
||||
|
||||
|
||||
@@ -421,12 +426,12 @@ function um_add_submit_button_to_login( $args ) {
|
||||
|
||||
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
|
||||
|
||||
<div class="um-left um-half"><input type="submit" value="<?php echo __( $primary_btn_word,'ultimate-member'); ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
<div class="um-right um-half"><a href="<?php echo $secondary_btn_url; ?>" class="um-button um-alt"><?php echo __( $secondary_btn_word,'ultimate-member'); ?></a></div>
|
||||
<div class="um-left um-half"><input type="submit" value="<?php esc_attr_e( $primary_btn_word, 'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
<div class="um-right um-half"><a href="<?php echo esc_attr( $secondary_btn_url ); ?>" class="um-button um-alt"><?php esc_attr_e( $secondary_btn_word,'ultimate-member'); ?></a></div>
|
||||
|
||||
<?php } else { ?>
|
||||
|
||||
<div class="um-center"><input type="submit" value="<?php echo __( $args['primary_btn_word'],'ultimate-member'); ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
<div class="um-center"><input type="submit" value="<?php esc_attr_e( $args['primary_btn_word'],'ultimate-member' ); ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
|
||||
@@ -1195,15 +1195,15 @@ function um_add_submit_button_to_profile( $args ) {
|
||||
|
||||
<?php if (isset( $args['secondary_btn'] ) && $args['secondary_btn'] != 0) { ?>
|
||||
|
||||
<div class="um-left um-half"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>"
|
||||
<div class="um-left um-half"><input type="submit" value="<?php esc_attr_e( $args['primary_btn_word'], 'ultimate-member' ); ?>"
|
||||
class="um-button"/></div>
|
||||
<div class="um-right um-half"><a href="<?php echo um_edit_my_profile_cancel_uri(); ?>"
|
||||
class="um-button um-alt"><?php echo $args['secondary_btn_word']; ?></a>
|
||||
<div class="um-right um-half"><a href="<?php echo esc_attr( um_edit_my_profile_cancel_uri() ); ?>"
|
||||
class="um-button um-alt"><?php esc_attr_e( $args['secondary_btn_word'], 'ultimate-member' ); ?></a>
|
||||
</div>
|
||||
|
||||
<?php } else { ?>
|
||||
|
||||
<div class="um-center"><input type="submit" value="<?php echo $args['primary_btn_word']; ?>"
|
||||
<div class="um-center"><input type="submit" value="<?php esc_attr_e( $args['primary_btn_word'], 'ultimate-member' ); ?>"
|
||||
class="um-button"/></div>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
@@ -585,12 +585,12 @@ function um_add_submit_button_to_register( $args ) {
|
||||
|
||||
<?php if ( isset($args['secondary_btn']) && $args['secondary_btn'] != 0 ) { ?>
|
||||
|
||||
<div class="um-left um-half"><input type="submit" value="<?php echo __( $primary_btn_word,'ultimate-member'); ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
<div class="um-right um-half"><a href="<?php echo $secondary_btn_url; ?>" class="um-button um-alt"><?php echo __( $secondary_btn_word,'ultimate-member'); ?></a></div>
|
||||
<div class="um-left um-half"><input type="submit" value="<?php esc_attr_e( $primary_btn_word,'ultimate-member' ) ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
<div class="um-right um-half"><a href="<?php echo esc_attr( $secondary_btn_url ); ?>" class="um-button um-alt"><?php esc_attr_e( $secondary_btn_word,'ultimate-member'); ?></a></div>
|
||||
|
||||
<?php } else { ?>
|
||||
|
||||
<div class="um-center"><input type="submit" value="<?php echo __( $primary_btn_word,'ultimate-member'); ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
<div class="um-center"><input type="submit" value="<?php esc_attr_e( $primary_btn_word,'ultimate-member' ) ?>" class="um-button" id="um-submit-btn" /></div>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
|
||||
@@ -226,7 +226,20 @@ function um_profile_field_filter_hook__file( $value, $data ) {
|
||||
$file_type = wp_check_filetype( $value );
|
||||
$uri = UM()->files()->get_download_link( UM()->fields()->set_id, $data['metakey'], um_user( 'ID' ) );
|
||||
|
||||
$removed = false;
|
||||
if ( ! file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value ) ) {
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$file_path = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value );
|
||||
if ( ! file_exists( $file_path ) ) {
|
||||
$removed = true;
|
||||
}
|
||||
} else {
|
||||
$removed = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ( $removed ) {
|
||||
$value = __( 'This file has been removed.', 'ultimate-member' );
|
||||
} else {
|
||||
$file_info = um_user( $data['metakey'] . "_metadata" );
|
||||
@@ -260,11 +273,24 @@ function um_profile_field_filter_hook__image( $value, $data ) {
|
||||
$uri = UM()->files()->get_download_link( UM()->fields()->set_id, $data['metakey'], um_user( 'ID' ) );
|
||||
$title = ( isset( $data['title'] ) ) ? $data['title'] : __( 'Untitled photo', 'ultimate-member' );
|
||||
|
||||
$removed = false;
|
||||
if ( ! file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value ) ) {
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$file_path = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value );
|
||||
if ( ! file_exists( $file_path ) ) {
|
||||
$removed = true;
|
||||
}
|
||||
} else {
|
||||
$removed = true;
|
||||
}
|
||||
}
|
||||
|
||||
// if value is an image tag
|
||||
if( preg_match( '/\<img.*src=\"([^"]+).*/', $value, $matches ) ) {
|
||||
$uri = $matches[1];
|
||||
$value = '<div class="um-photo"><a href="#" class="um-photo-modal" data-src="' . esc_attr( $uri ) . '"><img src="' . esc_attr( $uri ) . '" alt="' . esc_attr( $title ) . '" title="' . esc_attr( $title ) . '" class="" /></a></div>';
|
||||
} else if ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $value ) ) {
|
||||
} else if ( ! $removed ) {
|
||||
$value = '<div class="um-photo"><a href="#" class="um-photo-modal" data-src="' . esc_attr( $uri ) . '"><img src="' . esc_attr( $uri ) . '" alt="' . esc_attr( $title ) . '" title="' . esc_attr( $title ) . '" class="" /></a></div>';
|
||||
} else {
|
||||
$value = '';
|
||||
@@ -637,6 +663,24 @@ function um_profile_field_filter_xss_validation( $value, $data, $type = '' ) {
|
||||
add_filter( 'um_profile_field_filter_hook__','um_profile_field_filter_xss_validation', 10, 3 );
|
||||
|
||||
|
||||
/**
|
||||
* Trim All form POST submitted data
|
||||
*
|
||||
* @param $post_form
|
||||
* @param $mode
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
function um_submit_form_data_trim_fields( $post_form, $mode ) {
|
||||
foreach ( $post_form as &$field ) {
|
||||
$field = trim( $field );
|
||||
}
|
||||
|
||||
return $post_form;
|
||||
}
|
||||
add_filter( 'um_submit_form_data', 'um_submit_form_data_trim_fields', 9, 2 );
|
||||
|
||||
|
||||
/**
|
||||
* add role_select and role_radio to the $post_form
|
||||
* It is necessary for that if on these fields the conditional logic
|
||||
|
||||
@@ -556,10 +556,19 @@ function um_user_submitted_registration( $style = false ) {
|
||||
if ( UM()->fields()->get_field_type( $k ) == 'image' || UM()->fields()->get_field_type( $k ) == 'file' ) {
|
||||
$file = basename( $v );
|
||||
$filedata = get_user_meta( um_user( 'ID' ), $k . "_metadata", true );
|
||||
|
||||
$baseurl = UM()->uploader()->get_upload_base_url();
|
||||
if ( ! file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $file ) ) {
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$baseurl = str_replace( '/sites/' . get_current_blog_id() . '/', '/', $baseurl );
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! empty( $filedata['original_name'] ) ) {
|
||||
$v = '<a href="' . esc_attr( UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $file ) . '">' . $filedata['original_name'] . '</a>';
|
||||
$v = '<a href="' . esc_attr( $baseurl . um_user( 'ID' ) . '/' . $file ) . '">' . $filedata['original_name'] . '</a>';
|
||||
} else {
|
||||
$v = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . '/' . $file;
|
||||
$v = $baseurl . um_user( 'ID' ) . '/' . $file;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1659,8 +1668,27 @@ function um_closest_num( $array, $number ) {
|
||||
*/
|
||||
function um_get_cover_uri( $image, $attrs ) {
|
||||
$uri = false;
|
||||
$uri_common = false;
|
||||
$ext = '.' . pathinfo( $image, PATHINFO_EXTENSION );
|
||||
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$multisite_fix_dir = UM()->uploader()->get_upload_base_dir();
|
||||
$multisite_fix_url = UM()->uploader()->get_upload_base_url();
|
||||
$multisite_fix_dir = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $multisite_fix_dir );
|
||||
$multisite_fix_url = str_replace( '/sites/' . get_current_blog_id() . '/', '/', $multisite_fix_url );
|
||||
|
||||
if ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "cover_photo{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/cover_photo{$ext}?" . current_time( 'timestamp' );
|
||||
}
|
||||
|
||||
if ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "cover_photo-{$attrs}x{$attrs}{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/cover_photo-{$attrs}x{$attrs}{$ext}?". current_time( 'timestamp' );
|
||||
} elseif ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "cover_photo-{$attrs}{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/cover_photo-{$attrs}{$ext}?" . current_time( 'timestamp' );
|
||||
}
|
||||
}
|
||||
|
||||
if ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "cover_photo{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/cover_photo{$ext}?" . current_time( 'timestamp' );
|
||||
}
|
||||
@@ -1670,6 +1698,11 @@ function um_get_cover_uri( $image, $attrs ) {
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "cover_photo-{$attrs}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/cover_photo-{$attrs}{$ext}?" . current_time( 'timestamp' );
|
||||
}
|
||||
|
||||
if ( ! empty( $uri_common ) && empty( $uri ) ) {
|
||||
$uri = $uri_common;
|
||||
}
|
||||
|
||||
return $uri;
|
||||
}
|
||||
|
||||
@@ -1699,8 +1732,64 @@ function um_get_avatar_url( $get_avatar ) {
|
||||
*/
|
||||
function um_get_avatar_uri( $image, $attrs ) {
|
||||
$uri = false;
|
||||
$uri_common = false;
|
||||
$find = false;
|
||||
$ext = '.' . pathinfo( $image, PATHINFO_EXTENSION );
|
||||
|
||||
if ( is_multisite() ) {
|
||||
//multisite fix for old customers
|
||||
$multisite_fix_dir = UM()->uploader()->get_upload_base_dir();
|
||||
$multisite_fix_url = UM()->uploader()->get_upload_base_url();
|
||||
$multisite_fix_dir = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $multisite_fix_dir );
|
||||
$multisite_fix_url = str_replace( '/sites/' . get_current_blog_id() . '/', '/', $multisite_fix_url );
|
||||
|
||||
if ( $attrs == 'original' && file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/profile_photo{$ext}";
|
||||
} elseif ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$attrs}x{$attrs}{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/profile_photo-{$attrs}x{$attrs}{$ext}";
|
||||
} elseif ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$attrs}{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/profile_photo-{$attrs}{$ext}";
|
||||
} else {
|
||||
$sizes = UM()->options()->get( 'photo_thumb_sizes' );
|
||||
if ( is_array( $sizes ) ) {
|
||||
$find = um_closest_num( $sizes, $attrs );
|
||||
}
|
||||
|
||||
if ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$find}x{$find}{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/profile_photo-{$find}x{$find}{$ext}";
|
||||
} elseif ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$find}{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/profile_photo-{$find}{$ext}";
|
||||
} elseif ( file_exists( $multisite_fix_dir . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo{$ext}" ) ) {
|
||||
$uri_common = $multisite_fix_url . um_user( 'ID' ) . "/profile_photo{$ext}";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( $attrs == 'original' && file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$attrs}x{$attrs}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$attrs}x{$attrs}{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$attrs}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$attrs}{$ext}";
|
||||
} else {
|
||||
$sizes = UM()->options()->get( 'photo_thumb_sizes' );
|
||||
if ( is_array( $sizes ) ) {
|
||||
$find = um_closest_num( $sizes, $attrs );
|
||||
}
|
||||
|
||||
if ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$find}x{$find}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$find}x{$find}{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$find}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$find}{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo{$ext}";
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! empty( $uri_common ) && empty( $uri ) ) {
|
||||
$uri = $uri_common;
|
||||
}
|
||||
|
||||
/**
|
||||
* UM hook
|
||||
*
|
||||
@@ -1723,30 +1812,10 @@ function um_get_avatar_uri( $image, $attrs ) {
|
||||
* ?>
|
||||
*/
|
||||
$cache_time = apply_filters( 'um_filter_avatar_cache_time', current_time( 'timestamp' ), um_user( 'ID' ) );
|
||||
if ( $attrs == 'original' && file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$attrs}x{$attrs}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$attrs}x{$attrs}{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$attrs}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$attrs}{$ext}";
|
||||
} else {
|
||||
$sizes = UM()->options()->get( 'photo_thumb_sizes' );
|
||||
if ( is_array( $sizes ) ) {
|
||||
$find = um_closest_num( $sizes, $attrs );
|
||||
}
|
||||
|
||||
if ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$find}x{$find}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$find}x{$find}{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo-{$find}{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo-{$find}{$ext}";
|
||||
} elseif ( file_exists( UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . "profile_photo{$ext}" ) ) {
|
||||
$uri = UM()->uploader()->get_upload_base_url() . um_user( 'ID' ) . "/profile_photo{$ext}";
|
||||
}
|
||||
}
|
||||
|
||||
if ( ! empty( $cache_time ) ) {
|
||||
$uri .= "?{$cache_time}";
|
||||
}
|
||||
|
||||
return $uri;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ Donate link:
|
||||
Tags: community, member, membership, user-profile, user-registration
|
||||
Requires at least: 4.7
|
||||
Tested up to: 4.9
|
||||
Stable tag: 2.0.26
|
||||
Stable tag: 2.0.27
|
||||
License: GNU Version 2 or Any Later Version
|
||||
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
|
||||
|
||||
|
||||
Reference in New Issue
Block a user