Merge _avatars.php into _user_data.php
Another needless file system operation less.
This commit is contained in:
Tetrakern
parent
64aeb43ae8
commit
f2e731475a
@ -535,12 +535,6 @@ add_action( 'wp', 'fictioneer_conditional_require_comments' );
|
||||
|
||||
require_once __DIR__ . '/includes/functions/users/_user_data.php';
|
||||
|
||||
/**
|
||||
* Add functions to handle avatars.
|
||||
*/
|
||||
|
||||
require_once __DIR__ . '/includes/functions/users/_avatars.php';
|
||||
|
||||
/**
|
||||
* Add the follow feature.
|
||||
*/
|
||||
|
||||
@ -1,169 +0,0 @@
|
||||
<?php
|
||||
|
||||
// =============================================================================
|
||||
// AVATAR FALLBACK
|
||||
// =============================================================================
|
||||
|
||||
if ( ! function_exists( 'fictioneer_get_default_avatar_url' ) ) {
|
||||
/**
|
||||
* Returns the default avatar URL
|
||||
*
|
||||
* @since 5.5.3
|
||||
*
|
||||
* @return string Default avatar URL.
|
||||
*/
|
||||
|
||||
function fictioneer_get_default_avatar_url() {
|
||||
$transient = get_transient( 'fictioneer_default_avatar' );
|
||||
|
||||
// Check Transient
|
||||
if (
|
||||
empty( $transient ) ||
|
||||
! is_array( $transient ) ||
|
||||
$transient['timestamp'] + DAY_IN_SECONDS < time()
|
||||
) {
|
||||
// Get default avatar (and avoid infinite loop)
|
||||
remove_filter( 'get_avatar_url', 'fictioneer_get_avatar_url' );
|
||||
$default_url = get_avatar_url( 'nonexistentemail@example.com' );
|
||||
add_filter( 'get_avatar_url', 'fictioneer_get_avatar_url', 10, 3 );
|
||||
|
||||
$transient = array(
|
||||
'url' => $default_url,
|
||||
'timestamp' => time()
|
||||
);
|
||||
|
||||
set_transient( 'fictioneer_default_avatar', $transient );
|
||||
} else {
|
||||
$default_url = $transient['url'];
|
||||
}
|
||||
|
||||
return $default_url;
|
||||
}
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// AVATAR FALLBACK
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Add fallback inline script to avatars
|
||||
*
|
||||
* @since 5.0.0
|
||||
*
|
||||
* @param string $avatar HTML for the avatar.
|
||||
* @param string $id_or_email ID or email of the user.
|
||||
*
|
||||
* @return string HTML with fallback script added.
|
||||
*/
|
||||
|
||||
function fictioneer_avatar_fallback( $avatar, $id_or_email ) {
|
||||
$default_url = fictioneer_get_default_avatar_url();
|
||||
|
||||
return str_replace( '<img', '<img onerror="this.src=\'' . $default_url . '\';this.srcset=\'\';this.onerror=\'\';"', $avatar );
|
||||
}
|
||||
add_filter( 'get_avatar', 'fictioneer_avatar_fallback', 1, 2 );
|
||||
|
||||
// =============================================================================
|
||||
// GET CUSTOM AVATAR URL
|
||||
// =============================================================================
|
||||
|
||||
if ( ! function_exists( 'fictioneer_get_custom_avatar_url' ) ) {
|
||||
/**
|
||||
* Get custom avatar URL
|
||||
*
|
||||
* @since 4.0.0
|
||||
*
|
||||
* @param WP_User $user The user to get the avatar for.
|
||||
*
|
||||
* @return string|boolean The custom avatar URL or false.
|
||||
*/
|
||||
|
||||
function fictioneer_get_custom_avatar_url( $user ) {
|
||||
// Override default avatar with external avatar if allowed
|
||||
if ( $user && is_object( $user ) && ! $user->fictioneer_enforce_gravatar ) {
|
||||
$avatar_url = empty( $user->fictioneer_external_avatar_url ) ? null : $user->fictioneer_external_avatar_url;
|
||||
|
||||
if ( ! empty( $avatar_url ) ) {
|
||||
return $avatar_url;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// =============================================================================
|
||||
// GET CUSTOM AVATAR URL
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Filter the avatar URL
|
||||
*
|
||||
* @since 4.0.0
|
||||
*
|
||||
* @param string $url The default URL by WordPress.
|
||||
* @param int|string $id_or_email User ID or email address.
|
||||
* @param WP_User $args Additional arguments.
|
||||
*
|
||||
* @return string The avatar URL.
|
||||
*/
|
||||
|
||||
function fictioneer_get_avatar_url( $url, $id_or_email, $args ) {
|
||||
// Abort conditions...
|
||||
if ( $args['force_default'] ?? false || empty( $id_or_email ) ) {
|
||||
return $url;
|
||||
}
|
||||
|
||||
// Setup
|
||||
$user = fictioneer_get_user_by_id_or_email( $id_or_email );
|
||||
$custom_avatar = fictioneer_get_custom_avatar_url( $user );
|
||||
|
||||
// Check user and permissions
|
||||
if ( $user ) {
|
||||
$user_disabled = $user->fictioneer_disable_avatar;
|
||||
$admin_disabled = $user->fictioneer_admin_disable_avatar;
|
||||
|
||||
if ( $user_disabled || $admin_disabled ) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return $url;
|
||||
}
|
||||
|
||||
// Return custom avatar if set
|
||||
if ( ! empty( $custom_avatar ) ) {
|
||||
return $custom_avatar;
|
||||
}
|
||||
|
||||
// Return default avatar
|
||||
return $url;
|
||||
};
|
||||
add_filter( 'get_avatar_url', 'fictioneer_get_avatar_url', 10, 3 );
|
||||
|
||||
// =============================================================================
|
||||
// GET USER AVATAR URL - AJAX
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Get user avatar URL via AJAX
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @link https://developer.wordpress.org/reference/functions/wp_send_json_success/
|
||||
* @link https://developer.wordpress.org/reference/functions/wp_send_json_error/
|
||||
* @see fictioneer_get_validated_ajax_user()
|
||||
*/
|
||||
|
||||
function fictioneer_ajax_get_avatar() {
|
||||
// Setup and validations
|
||||
$user = fictioneer_get_validated_ajax_user();
|
||||
|
||||
if ( ! $user ) {
|
||||
wp_send_json_error( array( 'error' => __( 'Request did not pass validation.', 'fictioneer' ) ) );
|
||||
}
|
||||
|
||||
// Response
|
||||
wp_send_json_success( array( 'url' => get_avatar_url( $user->ID ) ) );
|
||||
}
|
||||
add_action( 'wp_ajax_fictioneer_ajax_get_avatar', 'fictioneer_ajax_get_avatar' );
|
||||
|
||||
?>
|
||||
@ -23,6 +23,164 @@ function fictioneer_after_logout_cleanup() {
|
||||
}
|
||||
add_action( 'login_form', 'fictioneer_after_logout_cleanup' );
|
||||
|
||||
// =============================================================================
|
||||
// CUSTOM AVATAR
|
||||
// =============================================================================
|
||||
|
||||
if ( ! function_exists( 'fictioneer_get_custom_avatar_url' ) ) {
|
||||
/**
|
||||
* Get custom avatar URL
|
||||
*
|
||||
* @since 4.0.0
|
||||
*
|
||||
* @param WP_User $user The user to get the avatar for.
|
||||
*
|
||||
* @return string|boolean The custom avatar URL or false.
|
||||
*/
|
||||
|
||||
function fictioneer_get_custom_avatar_url( $user ) {
|
||||
// Override default avatar with external avatar if allowed
|
||||
if ( $user && is_object( $user ) && ! $user->fictioneer_enforce_gravatar ) {
|
||||
$avatar_url = empty( $user->fictioneer_external_avatar_url ) ? null : $user->fictioneer_external_avatar_url;
|
||||
|
||||
if ( ! empty( $avatar_url ) ) {
|
||||
return $avatar_url;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Filter the avatar URL
|
||||
*
|
||||
* @since 4.0.0
|
||||
*
|
||||
* @param string $url The default URL by WordPress.
|
||||
* @param int|string $id_or_email User ID or email address.
|
||||
* @param WP_User $args Additional arguments.
|
||||
*
|
||||
* @return string The avatar URL.
|
||||
*/
|
||||
|
||||
function fictioneer_get_avatar_url( $url, $id_or_email, $args ) {
|
||||
// Abort conditions...
|
||||
if ( $args['force_default'] ?? false || empty( $id_or_email ) ) {
|
||||
return $url;
|
||||
}
|
||||
|
||||
// Setup
|
||||
$user = fictioneer_get_user_by_id_or_email( $id_or_email );
|
||||
$custom_avatar = fictioneer_get_custom_avatar_url( $user );
|
||||
|
||||
// Check user and permissions
|
||||
if ( $user ) {
|
||||
$user_disabled = $user->fictioneer_disable_avatar;
|
||||
$admin_disabled = $user->fictioneer_admin_disable_avatar;
|
||||
|
||||
if ( $user_disabled || $admin_disabled ) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return $url;
|
||||
}
|
||||
|
||||
// Return custom avatar if set
|
||||
if ( ! empty( $custom_avatar ) ) {
|
||||
return $custom_avatar;
|
||||
}
|
||||
|
||||
// Return default avatar
|
||||
return $url;
|
||||
};
|
||||
add_filter( 'get_avatar_url', 'fictioneer_get_avatar_url', 10, 3 );
|
||||
|
||||
// =============================================================================
|
||||
// FALLBACK AVATAR
|
||||
// =============================================================================
|
||||
|
||||
if ( ! function_exists( 'fictioneer_get_default_avatar_url' ) ) {
|
||||
/**
|
||||
* Returns the default avatar URL
|
||||
*
|
||||
* @since 5.5.3
|
||||
*
|
||||
* @return string Default avatar URL.
|
||||
*/
|
||||
|
||||
function fictioneer_get_default_avatar_url() {
|
||||
$transient = get_transient( 'fictioneer_default_avatar' );
|
||||
|
||||
// Check Transient
|
||||
if (
|
||||
empty( $transient ) ||
|
||||
! is_array( $transient ) ||
|
||||
$transient['timestamp'] + DAY_IN_SECONDS < time()
|
||||
) {
|
||||
// Get default avatar (and avoid infinite loop)
|
||||
remove_filter( 'get_avatar_url', 'fictioneer_get_avatar_url' );
|
||||
$default_url = get_avatar_url( 'nonexistentemail@example.com' );
|
||||
add_filter( 'get_avatar_url', 'fictioneer_get_avatar_url', 10, 3 );
|
||||
|
||||
$transient = array(
|
||||
'url' => $default_url,
|
||||
'timestamp' => time()
|
||||
);
|
||||
|
||||
set_transient( 'fictioneer_default_avatar', $transient );
|
||||
} else {
|
||||
$default_url = $transient['url'];
|
||||
}
|
||||
|
||||
return $default_url;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add fallback inline script to avatars
|
||||
*
|
||||
* @since 5.0.0
|
||||
*
|
||||
* @param string $avatar HTML for the avatar.
|
||||
* @param string $id_or_email ID or email of the user.
|
||||
*
|
||||
* @return string HTML with fallback script added.
|
||||
*/
|
||||
|
||||
function fictioneer_avatar_fallback( $avatar, $id_or_email ) {
|
||||
$default_url = fictioneer_get_default_avatar_url();
|
||||
|
||||
return str_replace( '<img', '<img onerror="this.src=\'' . $default_url . '\';this.srcset=\'\';this.onerror=\'\';"', $avatar );
|
||||
}
|
||||
add_filter( 'get_avatar', 'fictioneer_avatar_fallback', 1, 2 );
|
||||
|
||||
// =============================================================================
|
||||
// GET USER AVATAR URL - AJAX
|
||||
// =============================================================================
|
||||
|
||||
/**
|
||||
* Get user avatar URL via AJAX
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @link https://developer.wordpress.org/reference/functions/wp_send_json_success/
|
||||
* @link https://developer.wordpress.org/reference/functions/wp_send_json_error/
|
||||
* @see fictioneer_get_validated_ajax_user()
|
||||
*/
|
||||
|
||||
function fictioneer_ajax_get_avatar() {
|
||||
// Setup and validations
|
||||
$user = fictioneer_get_validated_ajax_user();
|
||||
|
||||
if ( ! $user ) {
|
||||
wp_send_json_error( array( 'error' => __( 'Request did not pass validation.', 'fictioneer' ) ) );
|
||||
}
|
||||
|
||||
// Response
|
||||
wp_send_json_success( array( 'url' => get_avatar_url( $user->ID ) ) );
|
||||
}
|
||||
add_action( 'wp_ajax_fictioneer_ajax_get_avatar', 'fictioneer_ajax_get_avatar' );
|
||||
|
||||
// =============================================================================
|
||||
// UPDATE ADMIN USER PROFILE (ADMIN)
|
||||
// =============================================================================
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user