diff --git a/wp-content/plugins/simple-local-avatars/includes/class-simple-local-avatars.php b/wp-content/plugins/simple-local-avatars/includes/class-simple-local-avatars.php new file mode 100644 index 00000000..d5856284 --- /dev/null +++ b/wp-content/plugins/simple-local-avatars/includes/class-simple-local-avatars.php @@ -0,0 +1,681 @@ +options = (array) get_option( 'simple_local_avatars' ); + $this->avatar_ratings = array( + 'G' => __( 'G — Suitable for all audiences', 'simple-local-avatars' ), + 'PG' => __( 'PG — Possibly offensive, usually for audiences 13 and above', 'simple-local-avatars' ), + 'R' => __( 'R — Intended for adult audiences above 17', 'simple-local-avatars' ), + 'X' => __( 'X — Even more mature than above', 'simple-local-avatars' ), + ); + + $this->add_hooks(); + } + + /** + * Register actions and filters. + */ + public function add_hooks() { + add_filter( 'pre_get_avatar_data', array( $this, 'get_avatar_data' ), 10, 2 ); + + add_action( 'admin_init', array( $this, 'admin_init' ) ); + + add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); + add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) ); + add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) ); + + add_action( 'personal_options_update', array( $this, 'edit_user_profile_update' ) ); + add_action( 'edit_user_profile_update', array( $this, 'edit_user_profile_update' ) ); + add_action( 'admin_action_remove-simple-local-avatar', array( $this, 'action_remove_simple_local_avatar' ) ); + add_action( 'wp_ajax_assign_simple_local_avatar_media', array( $this, 'ajax_assign_simple_local_avatar_media' ) ); + add_action( 'wp_ajax_remove_simple_local_avatar', array( $this, 'action_remove_simple_local_avatar' ) ); + add_action( 'user_edit_form_tag', array( $this, 'user_edit_form_tag' ) ); + + add_action( 'rest_api_init', array( $this, 'register_rest_fields' ) ); + } + + /** + * Retrieve the local avatar for a user who provided a user ID, email address or post/comment object. + * + * @param string $avatar Avatar return by original function + * @param int|string|object $id_or_email A user ID, email address, or post/comment object + * @param int $size Size of the avatar image + * @param string $default URL to a default image to use if no avatar is available + * @param string $alt Alternative text to use in image tag. Defaults to blank + * @param array $args Optional. Extra arguments to retrieve the avatar. + * + * @return string tag for the user's avatar + */ + public function get_avatar( $avatar = '', $id_or_email = '', $size = 96, $default = '', $alt = '', $args = array() ) { + return apply_filters( 'simple_local_avatar', get_avatar( $id_or_email, $size, $default, $alt, $args ) ); + } + + /** + * Filter avatar data early to add avatar url if needed. This filter hooks + * before Gravatar setup to prevent wasted requests. + * + * @since 2.2.0 + * + * @param array $args Arguments passed to get_avatar_data(), after processing. + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user ID, Gravatar MD5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + */ + public function get_avatar_data( $args, $id_or_email ) { + if ( ! empty( $args['force_default'] ) ) { + return $args; + } + + $simple_local_avatar_url = $this->get_simple_local_avatar_url( $id_or_email, $args['size'] ); + if ( $simple_local_avatar_url ) { + $args['url'] = $simple_local_avatar_url; + } + + // Local only mode + if ( ! $simple_local_avatar_url && ! empty( $this->options['only'] ) ) { + $args['url'] = $this->get_default_avatar_url( $args['size'] ); + } + + if ( ! empty( $args['url'] ) ) { + $args['found_avatar'] = true; + } + + return $args; + } + + /** + * Get local avatar url. + * + * @since 2.2.0 + * + * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user ID, Gravatar MD5 hash, + * user email, WP_User object, WP_Post object, or WP_Comment object. + * @param int $size Requested avatar size. + */ + public function get_simple_local_avatar_url( $id_or_email, $size ) { + if ( is_numeric( $id_or_email ) ) { + $user_id = (int) $id_or_email; + } elseif ( is_string( $id_or_email ) && ( $user = get_user_by( 'email', $id_or_email ) ) ) { + $user_id = $user->ID; + } elseif ( is_object( $id_or_email ) && ! empty( $id_or_email->user_id ) ) { + $user_id = (int) $id_or_email->user_id; + } elseif ( $id_or_email instanceof WP_Post && ! empty( $id_or_email->post_author ) ) { + $user_id = (int) $id_or_email->post_author; + } + + if ( empty( $user_id ) ) { + return ''; + } + + // Fetch local avatar from meta and make sure it's properly set. + $local_avatars = get_user_meta( $user_id, 'simple_local_avatar', true ); + if ( empty( $local_avatars['full'] ) ) { + return ''; + } + + // check rating + $avatar_rating = get_user_meta( $user_id, 'simple_local_avatar_rating', true ); + if ( ! empty( $avatar_rating ) && 'G' !== $avatar_rating && ( $site_rating = get_option( 'avatar_rating' ) ) ) { + $ratings = array_keys( $this->avatar_ratings ); + $site_rating_weight = array_search( $site_rating, $ratings ); + $avatar_rating_weight = array_search( $avatar_rating, $ratings ); + if ( false !== $avatar_rating_weight && $avatar_rating_weight > $site_rating_weight ) { + return ''; + } + } + + // handle "real" media + if ( ! empty( $local_avatars['media_id'] ) ) { + // has the media been deleted? + if ( ! $avatar_full_path = get_attached_file( $local_avatars['media_id'] ) ) { + return ''; + } + } + + $size = (int) $size; + + // Generate a new size. + if ( ! array_key_exists( $size, $local_avatars ) ) { + $local_avatars[ $size ] = $local_avatars['full']; // just in case of failure elsewhere + + // allow automatic rescaling to be turned off + if ( apply_filters( 'simple_local_avatars_dynamic_resize', true ) ) : + + $upload_path = wp_upload_dir(); + + // get path for image by converting URL, unless its already been set, thanks to using media library approach + if ( ! isset( $avatar_full_path ) ) { + $avatar_full_path = str_replace( $upload_path['baseurl'], $upload_path['basedir'], $local_avatars['full'] ); + } + + // generate the new size + $editor = wp_get_image_editor( $avatar_full_path ); + if ( ! is_wp_error( $editor ) ) { + $resized = $editor->resize( $size, $size, true ); + if ( ! is_wp_error( $resized ) ) { + $dest_file = $editor->generate_filename(); + $saved = $editor->save( $dest_file ); + if ( ! is_wp_error( $saved ) ) { + $local_avatars[ $size ] = str_replace( $upload_path['basedir'], $upload_path['baseurl'], $dest_file ); + } + } + } + + // save updated avatar sizes + update_user_meta( $user_id, 'simple_local_avatar', $local_avatars ); + + endif; + } + + if ( 'http' !== substr( $local_avatars[ $size ], 0, 4 ) ) { + $local_avatars[ $size ] = home_url( $local_avatars[ $size ] ); + } + + return esc_url( $local_avatars[ $size ] ); + } + + /** + * Get default avatar url + * + * @since 2.2.0 + * + * @param int $size Requested avatar size. + */ + public function get_default_avatar_url( $size ) { + if ( empty( $default ) ) { + $avatar_default = get_option( 'avatar_default' ); + if ( empty( $avatar_default ) ) { + $default = 'mystery'; + } else { + $default = $avatar_default; + } + } + + $host = is_ssl() ? 'https://secure.gravatar.com' : 'http://0.gravatar.com'; + + if ( 'mystery' === $default ) { + $default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') + } elseif ( 'blank' === $default ) { + $default = includes_url( 'images/blank.gif' ); + } elseif ( 'gravatar_default' === $default ) { + $default = "$host/avatar/?s={$size}"; + } else { + $default = "$host/avatar/?d=$default&s={$size}"; + } + + return $default; + } + + /** + * Register admin settings. + */ + public function admin_init() { + // upgrade pre 2.0 option + if ( $old_ops = get_option( 'simple_local_avatars_caps' ) ) { + if ( ! empty( $old_ops['simple_local_avatars_caps'] ) ) { + update_option( 'simple_local_avatars', array( 'caps' => 1 ) ); + } + + delete_option( 'simple_local_avatar_caps' ); + } + + register_setting( 'discussion', 'simple_local_avatars', array( $this, 'sanitize_options' ) ); + add_settings_field( + 'simple-local-avatars-only', + __( 'Local Avatars Only', 'simple-local-avatars' ), + array( $this, 'avatar_settings_field' ), + 'discussion', + 'avatars', + array( + 'key' => 'only', + 'desc' => __( 'Only allow local avatars (still uses Gravatar for default avatars)', 'simple-local-avatars' ), + ) + ); + add_settings_field( + 'simple-local-avatars-caps', + __( 'Local Upload Permissions', 'simple-local-avatars' ), + array( $this, 'avatar_settings_field' ), + 'discussion', + 'avatars', + array( + 'key' => 'caps', + 'desc' => __( 'Only allow users with file upload capabilities to upload local avatars (Authors and above)', 'simple-local-avatars' ), + ) + ); + } + + /** + * Add scripts to the profile editing page + * + * @param string $hook_suffix Page hook + */ + public function admin_enqueue_scripts( $hook_suffix ) { + if ( 'profile.php' !== $hook_suffix && 'user-edit.php' !== $hook_suffix ) { + return; + } + + if ( current_user_can( 'upload_files' ) ) { + wp_enqueue_media(); + } + + $user_id = ( 'profile.php' === $hook_suffix ) ? get_current_user_id() : (int) $_GET['user_id']; + + $this->remove_nonce = wp_create_nonce( 'remove_simple_local_avatar_nonce' ); + + $script_name_append = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '.dev' : ''; + wp_enqueue_script( 'simple-local-avatars', plugins_url( '', dirname( __FILE__ ) ) . '/simple-local-avatars' . $script_name_append . '.js', array( 'jquery' ), false, true ); + wp_localize_script( + 'simple-local-avatars', + 'i10n_SimpleLocalAvatars', + array( + 'user_id' => $user_id, + 'insertMediaTitle' => __( 'Choose an Avatar', 'simple-local-avatars' ), + 'insertIntoPost' => __( 'Set as avatar', 'simple-local-avatars' ), + 'deleteNonce' => $this->remove_nonce, + 'mediaNonce' => wp_create_nonce( 'assign_simple_local_avatar_nonce' ), + ) + ); + } + + /** + * Sanitize new settings field before saving + * + * @param array|string $input Passed input values to sanitize + * @return array|string Sanitized input fields + */ + public function sanitize_options( $input ) { + $new_input['caps'] = empty( $input['caps'] ) ? 0 : 1; + $new_input['only'] = empty( $input['only'] ) ? 0 : 1; + return $new_input; + } + + /** + * Settings field for avatar upload capabilities + * + * @param array $args Field arguments + */ + public function avatar_settings_field( $args ) { + $args = wp_parse_args( + $args, + array( + 'key' => '', + 'desc' => '', + ) + ); + + if ( empty( $this->options[ $args['key'] ] ) ) { + $this->options[ $args['key'] ] = 0; + } + + echo ' + + '; + } + + /** + * Output new Avatar fields to user editing / profile screen + * + * @param object $profileuser User object + */ + public function edit_user_profile( $profileuser ) { + ?> +
+

+ + + + + + + + + + + +
+ ID ); + remove_filter( 'pre_option_avatar_rating', '__return_null' ); + ?> + + options['caps'] ); + } + + if ( $upload_rights ) { + do_action( 'simple_local_avatar_notices' ); + wp_nonce_field( 'simple_local_avatar_nonce', '_simple_local_avatar_nonce', false ); + $remove_url = add_query_arg( + array( + 'action' => 'remove-simple-local-avatar', + 'user_id' => $profileuser->ID, + '_wpnonce' => $this->remove_nonce, + ) + ); + ?> + +

+
+ + +

+ +

+ +   + + simple_local_avatar ) ? ' style="display:none;"' : ''; ?> + > + + +

+ simple_local_avatar ) ) { + echo '' . esc_html__( 'No local avatar is set. Set up your avatar at Gravatar.com.', 'simple-local-avatars' ) . ''; + } else { + echo '' . esc_html__( 'You do not have media management permissions. To change your local avatar, contact the blog administrator.', 'simple-local-avatars' ) . ''; + } + } + ?> +
+
simple_local_avatar ) ); ?>> + + simple_local_avatar_rating ) || ! array_key_exists( $profileuser->simple_local_avatar_rating, $this->avatar_ratings ) ) { + $profileuser->simple_local_avatar_rating = 'G'; + } + + foreach ( $this->avatar_ratings as $key => $rating ) : + echo "\n\t
"; + endforeach; + ?> +

+
+
+ avatar_delete( $user_id ); // delete old images if successful + + $meta_value = array(); + + // set the new avatar + if ( is_int( $url_or_media_id ) ) { + $meta_value['media_id'] = $url_or_media_id; + $url_or_media_id = wp_get_attachment_url( $url_or_media_id ); + } + + $meta_value['full'] = $url_or_media_id; + + update_user_meta( $user_id, 'simple_local_avatar', $meta_value ); // save user information (overwriting old) + } + + /** + * Save any changes to the user profile + * + * @param int $user_id ID of user being updated + */ + public function edit_user_profile_update( $user_id ) { + // check nonces + if ( empty( $_POST['_simple_local_avatar_nonce'] ) || ! wp_verify_nonce( $_POST['_simple_local_avatar_nonce'], 'simple_local_avatar_nonce' ) ) { + return; + } + + // check for uploaded files + if ( ! empty( $_FILES['simple-local-avatar']['name'] ) ) : + + // need to be more secure since low privelege users can upload + if ( false !== strpos( $_FILES['simple-local-avatar']['name'], '.php' ) ) { + $this->avatar_upload_error = __( 'For security reasons, the extension ".php" cannot be in your file name.', 'simple-local-avatars' ); + add_action( 'user_profile_update_errors', array( $this, 'user_profile_update_errors' ) ); + return; + } + + // front end (theme my profile etc) support + if ( ! function_exists( 'media_handle_upload' ) ) { + include_once ABSPATH . 'wp-admin/includes/media.php'; + } + + // allow developers to override file size upload limit for avatars + add_filter( 'upload_size_limit', array( $this, 'upload_size_limit' ) ); + + $this->user_id_being_edited = $user_id; // make user_id known to unique_filename_callback function + $avatar_id = media_handle_upload( + 'simple-local-avatar', + 0, + array(), + array( + 'mimes' => array( + 'jpg|jpeg|jpe' => 'image/jpeg', + 'gif' => 'image/gif', + 'png' => 'image/png', + ), + 'test_form' => false, + 'unique_filename_callback' => array( $this, 'unique_filename_callback' ), + ) + ); + + remove_filter( 'upload_size_limit', array( $this, 'upload_size_limit' ) ); + + if ( is_wp_error( $avatar_id ) ) { // handle failures. + $this->avatar_upload_error = '' . __( 'There was an error uploading the avatar:', 'simple-local-avatars' ) . ' ' . esc_html( $avatar_id->get_error_message() ); + add_action( 'user_profile_update_errors', array( $this, 'user_profile_update_errors' ) ); + return; + } + + $this->assign_new_user_avatar( $avatar_id, $user_id ); + + endif; + + // Handle ratings + if ( isset( $avatar_id ) || $avatar = get_user_meta( $user_id, 'simple_local_avatar', true ) ) { + if ( empty( $_POST['simple_local_avatar_rating'] ) || ! array_key_exists( $_POST['simple_local_avatar_rating'], $this->avatar_ratings ) ) { + $_POST['simple_local_avatar_rating'] = key( $this->avatar_ratings ); + } + + update_user_meta( $user_id, 'simple_local_avatar_rating', $_POST['simple_local_avatar_rating'] ); + } + } + + /** + * Allow developers to override the maximum allowable file size for avatar uploads + * + * @param int $bytes WordPress default byte size check + * @return int Maximum byte size + */ + public function upload_size_limit( $bytes ) { + return apply_filters( 'simple_local_avatars_upload_limit', $bytes ); + } + + /** + * Runs when a user clicks the Remove button for the avatar + */ + public function action_remove_simple_local_avatar() { + if ( ! empty( $_GET['user_id'] ) && ! empty( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'remove_simple_local_avatar_nonce' ) ) { + $user_id = (int) $_GET['user_id']; + + if ( ! current_user_can( 'edit_user', $user_id ) ) { + wp_die( esc_html__( 'You do not have permission to edit this user.', 'simple-local-avatars' ) ); + } + + $this->avatar_delete( $user_id ); // delete old images if successful + + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { + echo get_simple_local_avatar( $user_id ); + } + } + + if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) { + die; + } + } + + /** + * AJAX callback for assigning media ID fetched from media library to user + */ + public function ajax_assign_simple_local_avatar_media() { + // check required information and permissions + if ( empty( $_POST['user_id'] ) || empty( $_POST['media_id'] ) || ! current_user_can( 'upload_files' ) || ! current_user_can( 'edit_user', $_POST['user_id'] ) || empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'assign_simple_local_avatar_nonce' ) ) { + die; + } + + $media_id = (int) $_POST['media_id']; + $user_id = (int) $_POST['user_id']; + + // ensure the media is real is an image + if ( wp_attachment_is_image( $media_id ) ) { + $this->assign_new_user_avatar( $media_id, $user_id ); + } + + echo get_simple_local_avatar( $user_id ); + + die; + } + + /** + * Delete avatars based on a user_id + * + * @param int $user_id User ID. + */ + public function avatar_delete( $user_id ) { + $old_avatars = (array) get_user_meta( $user_id, 'simple_local_avatar', true ); + + if ( empty( $old_avatars ) ) { + return; + } + + // if it was uploaded media, don't erase the full size or try to erase an the ID + if ( array_key_exists( 'media_id', $old_avatars ) ) { + unset( $old_avatars['media_id'], $old_avatars['full'] ); + } + + if ( ! empty( $old_avatars ) ) { + $upload_path = wp_upload_dir(); + + foreach ( $old_avatars as $old_avatar ) { + // derive the path for the file based on the upload directory + $old_avatar_path = str_replace( $upload_path['baseurl'], $upload_path['basedir'], $old_avatar ); + if ( file_exists( $old_avatar_path ) ) { + unlink( $old_avatar_path ); + } + } + } + + delete_user_meta( $user_id, 'simple_local_avatar' ); + delete_user_meta( $user_id, 'simple_local_avatar_rating' ); + } + + /** + * Creates a unique, meaningful file name for uploaded avatars. + * + * @param string $dir Path for file + * @param string $name Filename + * @param string $ext File extension (e.g. ".jpg") + * @return string Final filename + */ + public function unique_filename_callback( $dir, $name, $ext ) { + $user = get_user_by( 'id', (int) $this->user_id_being_edited ); + $name = $base_name = sanitize_file_name( $user->display_name . '_avatar_' . time() ); + + // ensure no conflicts with existing file names + $number = 1; + while ( file_exists( $dir . "/$name$ext" ) ) { + $name = $base_name . '_' . $number; + $number++; + } + + return $name . $ext; + } + + /** + * Adds errors based on avatar upload problems. + * + * @param WP_Error $errors Error messages for user profile screen. + */ + public function user_profile_update_errors( WP_Error $errors ) { + $errors->add( 'avatar_error', $this->avatar_upload_error ); + } + + /** + * Registers the simple_local_avatar field in the REST API. + */ + public function register_rest_fields() { + register_rest_field( + 'user', + 'simple_local_avatar', + array( + 'get_callback' => array( $this, 'get_avatar_rest' ), + 'update_callback' => array( $this, 'set_avatar_rest' ), + 'schema' => array( + 'description' => 'The users simple local avatar', + 'type' => 'object', + ), + ) + ); + } + + /** + * Returns the simple_local_avatar meta key for the given user. + * + * @param object $user User object + */ + public function get_avatar_rest( $user ) { + $local_avatar = get_user_meta( $user['id'], 'simple_local_avatar', true ); + if ( empty( $local_avatar ) ) { + return; + } + return $local_avatar; + } + + /** + * Updates the simple local avatar from a REST request. + * + * Since we are just adding a field to the existing user endpoint + * we don't need to worry about ensuring the calling user has proper permissions. + * Only the user or an administrator would be able to change the avatar. + * + * @param array $input Input submitted via REST request. + * @param object $user The user making the request. + */ + public function set_avatar_rest( $input, $user ) { + $this->assign_new_user_avatar( $input['media_id'], $user->ID ); + } +} diff --git a/wp-content/plugins/simple-local-avatars/readme.txt b/wp-content/plugins/simple-local-avatars/readme.txt index 64e13669..5c92ee11 100644 --- a/wp-content/plugins/simple-local-avatars/readme.txt +++ b/wp-content/plugins/simple-local-avatars/readme.txt @@ -3,13 +3,14 @@ Contributors: jakemgold, 10up, thinkoomph Donate link: https://10up.com/plugins/simple-local-avatars-wordpress/ Tags: avatar, gravatar, user photos, users, profile Requires at least: 4.6 -Tested up to: 5.2 -Stable tag: 2.1.1 -Text Domain: simple-local-avatars +Tested up to: 5.5 +Requires PHP: 5.3 +Stable tag: 2.2.0 +License: GPLv2 or later +License URI: http://www.gnu.org/licenses/gpl-2.0.html Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar! - == Description == Adds an avatar upload field to user profiles if the current user has media permissions. Generates requested sizes on demand just like Gravatar! Simple and lightweight. @@ -23,7 +24,6 @@ Just edit a user profile, and scroll down to the new "Avatar" field. The plug-in 1. Let's you decide whether lower privilege users (subscribers, contributors) can upload their own avatar 1. Enables rating of local avatars, just like Gravatar - == Installation == 1. Install easily with the WordPress plugin control panel or manually download the plugin and upload the extracted folder to the `/wp-content/plugins/` directory @@ -35,14 +35,28 @@ Use avatars in your theme using WordPress' built in `get_avatar()` function: [ht You can also use `get_simple_local_avatar()` (with the same arguments) to retreive local avatars a bit faster, but this will make your theme dependent on this plug-in. - == Screenshots == 1. Avatar upload field on a user profile page - == Changelog == += 2.2.0 = +* **Added:** `$args` parameter to `get_simple_local_avatar` function (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)) +* **Added:** `Simple_Local_Avatars::get_avatar_data()`, `Simple_Local_Avatars::get_simple_local_avatar_url()`, and `Simple_Local_Avatars::get_default_avatar_url()` methods (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)) +* **Added:** Ability to retrieve avatar with `WP_Post` object (props [@oscarssanchez](https://profiles.wordpress.org/oscarssanchez), [@blobaugh](https://profiles.wordpress.org/blobaugh)) +* **Added:** class and ID to Avatar section on Profile Page to allow easier styling (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)) +* **Added:** [WP Acceptance](https://github.com/10up/wpacceptance/) test coverage (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)) +* **Changed:** Switched to `pre_get_avatar_data` filter (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)) +* **Changed:** `assign_new_user_avatar` function to public (props [@tripflex](https://profiles.wordpress.org/tripflex/)) +* **Changed:** Split the main class into its own file, added unit tests, and set up testing GitHub action (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@helen](https://profiles.wordpress.org/helen/), [@stevegrunwell](https://profiles.wordpress.org/stevegrunwell/)) +* **Changed:** New plugin banner and icon (props [@JackieKjome](https://profiles.wordpress.org/jackiekjome/)) +* **Changed:** Bump WordPress version "tested up to" 5.5 (props [@Waka867](https://github.com/Waka867), [@tmoorewp](https://profiles.wordpress.org/tmoorewp), [@jeffpaul](https://profiles.wordpress.org/jeffpaul), [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/)) +* **Changed:** GitHub Actions from HCL to YAML workflow syntax (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul)) +* **Changed:** Documentation updates (props [@jeffpaul](https://profiles.wordpress.org/jeffpaul)) +* **Fixed:** Initialize `Simple_Local_Avatars` on the `$simple_local_avatars` global, enabling bundling plugin with composer (props [@pauldewouters](https://profiles.wordpress.org/pauldewouters/), [@adamsilverstein](https://profiles.wordpress.org/adamsilverstein)) +* **Removed:** `get_avatar` function that overrides the core function (props [@dinhtungdu](https://profiles.wordpress.org/dinhtungdu/), [@heyjones](https://github.com/heyjones), [@dkotter](https://profiles.wordpress.org/dkotter/), [@sumnercreations](https://github.com/sumnercreations), [@dshanske](https://profiles.wordpress.org/dshanske/)) + = 2.1.1 = * Fixed: Do not delete avatars just because they don't exist on the local filesystem. This was occasionally dumping avatars when WordPress uploads were stored elsewhere, e.g. a cloud service. @@ -72,7 +86,7 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei * Optimization for WordPress 3.2 / 3.3 (substitutes deprecated function) = 1.3 = -* Avatar file name saved as "user-display-name_avatar" (or other image extension) +* Avatar file name saved as "user-display-name_avatar" (or other image extension) * Russian localization added * Assorted minor code optimizations @@ -109,7 +123,6 @@ You can also use `get_simple_local_avatar()` (with the same arguments) to retrei * All users (regardless of capabilities) can upload avatars by default. To limit avatar uploading to users with upload files capabilities (Authors and above), check the applicable option under Settings > Discussion. This was the default behavior in 1.0. * Localization support; German included - == Upgrade Notice == = 2.1 = diff --git a/wp-content/plugins/simple-local-avatars/screenshot-1.png b/wp-content/plugins/simple-local-avatars/screenshot-1.png deleted file mode 100644 index ebd81d0b..00000000 Binary files a/wp-content/plugins/simple-local-avatars/screenshot-1.png and /dev/null differ diff --git a/wp-content/plugins/simple-local-avatars/simple-local-avatars.php b/wp-content/plugins/simple-local-avatars/simple-local-avatars.php index cc1420d6..172b5f97 100644 --- a/wp-content/plugins/simple-local-avatars/simple-local-avatars.php +++ b/wp-content/plugins/simple-local-avatars/simple-local-avatars.php @@ -1,661 +1,60 @@ -options = (array) get_option( 'simple_local_avatars' ); - $this->avatar_ratings = array( - 'G' => __('G — Suitable for all audiences'), - 'PG' => __('PG — Possibly offensive, usually for audiences 13 and above'), - 'R' => __('R — Intended for adult audiences above 17'), - 'X' => __('X — Even more mature than above') - ); - - // supplement remote avatars, but not if inside "local only" mode - if ( empty( $this->options['only'] ) ) - add_filter( 'get_avatar', array( $this, 'get_avatar' ), 10, 5 ); - - add_action( 'admin_init', array( $this, 'admin_init' ) ); - - add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); - add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) ); - add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) ); - - add_action( 'personal_options_update', array( $this, 'edit_user_profile_update' ) ); - add_action( 'edit_user_profile_update', array( $this, 'edit_user_profile_update' ) ); - add_action( 'admin_action_remove-simple-local-avatar', array( $this, 'action_remove_simple_local_avatar' ) ); - add_action( 'wp_ajax_assign_simple_local_avatar_media', array( $this, 'ajax_assign_simple_local_avatar_media' ) ); - add_action( 'wp_ajax_remove_simple_local_avatar', array( $this, 'action_remove_simple_local_avatar' ) ); - add_action( 'user_edit_form_tag', array( $this, 'user_edit_form_tag' ) ); - - add_filter( 'avatar_defaults', array( $this, 'avatar_defaults' ) ); - - add_action( 'rest_api_init', array( $this, 'register_rest_fields' ) ); - } - - /** - * Retrieve the local avatar for a user who provided a user ID or email address. - * - * @param string $avatar Avatar return by original function - * @param int|string|object $id_or_email A user ID, email address, or comment object - * @param int $size Size of the avatar image - * @param string $default URL to a default image to use if no avatar is available - * @param string $alt Alternative text to use in image tag. Defaults to blank - * @return string tag for the user's avatar - */ - public function get_avatar( $avatar = '', $id_or_email = '', $size = 96, $default = '', $alt = '' ) { - if ( is_numeric( $id_or_email ) ) - $user_id = (int) $id_or_email; - elseif ( is_string( $id_or_email ) && ( $user = get_user_by( 'email', $id_or_email ) ) ) - $user_id = $user->ID; - elseif ( is_object( $id_or_email ) && ! empty( $id_or_email->user_id ) ) - $user_id = (int) $id_or_email->user_id; - - if ( empty( $user_id ) ) - return $avatar; - - // fetch local avatar from meta and make sure it's properly ste - $local_avatars = get_user_meta( $user_id, 'simple_local_avatar', true ); - if ( empty( $local_avatars['full'] ) ) - return $avatar; - - // check rating - $avatar_rating = get_user_meta( $user_id, 'simple_local_avatar_rating', true ); - if ( ! empty( $avatar_rating ) && 'G' != $avatar_rating && ( $site_rating = get_option( 'avatar_rating' ) ) ) { - $ratings = array_keys( $this->avatar_ratings ); - $site_rating_weight = array_search( $site_rating, $ratings ); - $avatar_rating_weight = array_search( $avatar_rating, $ratings ); - if ( false !== $avatar_rating_weight && $avatar_rating_weight > $site_rating_weight ) - return $avatar; - } - - // handle "real" media - if ( ! empty( $local_avatars['media_id'] ) ) { - // has the media been deleted? - if ( ! $avatar_full_path = get_attached_file( $local_avatars['media_id'] ) ) { - return $avatar; - } - } - - $size = (int) $size; - - if ( empty( $alt ) ) - $alt = get_the_author_meta( 'display_name', $user_id ); - - // generate a new size - if ( ! array_key_exists( $size, $local_avatars ) ) { - $local_avatars[$size] = $local_avatars['full']; // just in case of failure elsewhere - - // allow automatic rescaling to be turned off - if ( $allow_dynamic_resizing = apply_filters( 'simple_local_avatars_dynamic_resize', true ) ) : - - $upload_path = wp_upload_dir(); - - // get path for image by converting URL, unless its already been set, thanks to using media library approach - if ( ! isset( $avatar_full_path ) ) - $avatar_full_path = str_replace( $upload_path['baseurl'], $upload_path['basedir'], $local_avatars['full'] ); - - // generate the new size - $editor = wp_get_image_editor( $avatar_full_path ); - if ( ! is_wp_error( $editor ) ) { - $resized = $editor->resize( $size, $size, true ); - if ( ! is_wp_error( $resized ) ) { - $dest_file = $editor->generate_filename(); - $saved = $editor->save( $dest_file ); - if ( ! is_wp_error( $saved ) ) - $local_avatars[$size] = str_replace( $upload_path['basedir'], $upload_path['baseurl'], $dest_file ); - } - } - - // save updated avatar sizes - update_user_meta( $user_id, 'simple_local_avatar', $local_avatars ); - - endif; - } - - if ( 'http' != substr( $local_avatars[$size], 0, 4 ) ) - $local_avatars[$size] = home_url( $local_avatars[$size] ); - - $author_class = is_author( $user_id ) ? ' current-author' : '' ; - $avatar = "" . esc_attr( $alt ) . ""; - - return apply_filters( 'simple_local_avatar', $avatar ); - } - - public function admin_init() { - // upgrade pre 2.0 option - if ( $old_ops = get_option( 'simple_local_avatars_caps' ) ) { - if ( ! empty( $old_ops['simple_local_avatars_caps'] ) ) - update_option( 'simple_local_avatars', array( 'caps' => 1 ) ); - - delete_option( 'simple_local_avatar_caps' ); - } - - register_setting( 'discussion', 'simple_local_avatars', array( $this, 'sanitize_options' ) ); - add_settings_field( - 'simple-local-avatars-only', - __('Local Avatars Only','simple-local-avatars'), - array( $this, 'avatar_settings_field' ), - 'discussion', - 'avatars', - array( - 'key' => 'only', - 'desc' => __( 'Only allow local avatars (still uses Gravatar for default avatars)', 'simple-local-avatars' ) - ) - ); - add_settings_field( - 'simple-local-avatars-caps', - __('Local Upload Permissions','simple-local-avatars'), - array( $this, 'avatar_settings_field' ), - 'discussion', - 'avatars', - array( - 'key' => 'caps', - 'desc' => __( 'Only allow users with file upload capabilities to upload local avatars (Authors and above)', 'simple-local-avatars' ) - ) - ); - } - - /** - * Add scripts to the profile editing page - * - * @param string $hook_suffix Page hook - */ - public function admin_enqueue_scripts( $hook_suffix ) { - if ( 'profile.php' != $hook_suffix && 'user-edit.php' != $hook_suffix ) - return; - - if ( current_user_can( 'upload_files' ) ) - wp_enqueue_media(); - - $user_id = ( 'profile.php' == $hook_suffix ) ? get_current_user_id() : (int) $_GET['user_id']; - - $this->remove_nonce = wp_create_nonce( 'remove_simple_local_avatar_nonce' ); - - $script_name_append = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '.dev' : ''; - wp_enqueue_script( 'simple-local-avatars', plugins_url( '', __FILE__ ) . '/simple-local-avatars' . $script_name_append . '.js', array('jquery'), false, true ); - wp_localize_script( 'simple-local-avatars', 'i10n_SimpleLocalAvatars', array( - 'user_id' => $user_id, - 'insertMediaTitle' => __('Choose an Avatar','simple-local-avatars'), - 'insertIntoPost' => __('Set as avatar','simple-local-avatars'), - 'deleteNonce' => $this->remove_nonce, - 'mediaNonce' => wp_create_nonce( 'assign_simple_local_avatar_nonce' ), - ) ); - } - - /** - * Sanitize new settings field before saving - * - * @param array|string $input Passed input values to sanitize - * @return array|string Sanitized input fields - */ - public function sanitize_options( $input ) { - $new_input['caps'] = empty( $input['caps'] ) ? 0 : 1; - $new_input['only'] = empty( $input['only'] ) ? 0 : 1; - return $new_input; - } - - /** - * Settings field for avatar upload capabilities - * - * @param array $args Field arguments - */ - public function avatar_settings_field( $args ) { - $args = wp_parse_args( $args, array( - 'key' => '', - 'desc' => '', - ) ); - - if ( empty( $this->options[$args['key']] ) ) - $this->options[$args['key']] = 0; - - echo ' - - '; - } - - /** - * Output new Avatar fields to user editing / profile screen - * - * @param object $profileuser User object - */ - public function edit_user_profile( $profileuser ) { - ?> -

- - - - - - - - - - - -
- ID ); - remove_filter( 'pre_option_avatar_rating', '__return_null' ); - ?> - - options['caps'] ); - - if ( $upload_rights ) { - do_action( 'simple_local_avatar_notices' ); - wp_nonce_field( 'simple_local_avatar_nonce', '_simple_local_avatar_nonce', false ); - $remove_url = add_query_arg(array( - 'action' => 'remove-simple-local-avatar', - 'user_id' => $profileuser->ID, - '_wpnonce' => $this->remove_nonce, - ) ); - ?> - -

-
- - -

- -

-   - simple_local_avatar ) ) echo ' style="display:none;"'; ?>> -

- simple_local_avatar ) ) - echo '' . __('No local avatar is set. Set up your avatar at Gravatar.com.','simple-local-avatars') . ''; - else - echo '' . __('You do not have media management permissions. To change your local avatar, contact the blog administrator.','simple-local-avatars') . ''; - } - ?> -
-
simple_local_avatar ) ); ?>> - - simple_local_avatar_rating ) || ! array_key_exists( $profileuser->simple_local_avatar_rating, $this->avatar_ratings ) ) - $profileuser->simple_local_avatar_rating = 'G'; - - foreach ( $this->avatar_ratings as $key => $rating ) : - echo "\n\t
"; - endforeach; - ?> -

-
- avatar_delete( $user_id ); // delete old images if successful - - $meta_value = array(); - - // set the new avatar - if ( is_int( $url_or_media_id ) ) { - $meta_value['media_id'] = $url_or_media_id; - $url_or_media_id = wp_get_attachment_url( $url_or_media_id ); - } - - $meta_value['full'] = $url_or_media_id; - - update_user_meta( $user_id, 'simple_local_avatar', $meta_value ); // save user information (overwriting old) - } - - /** - * Save any changes to the user profile - * - * @param int $user_id ID of user being updated - */ - public function edit_user_profile_update( $user_id ) { - // check nonces - if( empty( $_POST['_simple_local_avatar_nonce'] ) || ! wp_verify_nonce( $_POST['_simple_local_avatar_nonce'], 'simple_local_avatar_nonce' ) ) - return; - - // check for uploaded files - if ( ! empty( $_FILES['simple-local-avatar']['name'] ) ) : - - // need to be more secure since low privelege users can upload - if ( false !== strpos( $_FILES['simple-local-avatar']['name'], '.php' ) ) { - $this->avatar_upload_error = __('For security reasons, the extension ".php" cannot be in your file name.','simple-local-avatars'); - add_action( 'user_profile_update_errors', array( $this, 'user_profile_update_errors' ) ); - return; - } - - // front end (theme my profile etc) support - if ( ! function_exists( 'media_handle_upload' ) ) - require_once( ABSPATH . 'wp-admin/includes/media.php' ); - - // allow developers to override file size upload limit for avatars - add_filter( 'upload_size_limit', array( $this, 'upload_size_limit' ) ); - - $this->user_id_being_edited = $user_id; // make user_id known to unique_filename_callback function - $avatar_id = media_handle_upload( 'simple-local-avatar', 0, array(), array( - 'mimes' => array( - 'jpg|jpeg|jpe' => 'image/jpeg', - 'gif' => 'image/gif', - 'png' => 'image/png', - ), - 'test_form' => false, - 'unique_filename_callback' => array( $this, 'unique_filename_callback' ) - ) ); - - remove_filter( 'upload_size_limit', array( $this, 'upload_size_limit' ) ); - - if ( is_wp_error( $avatar_id ) ) { // handle failures. - $this->avatar_upload_error = '' . __( 'There was an error uploading the avatar:', 'simple-local-avatars' ) . ' ' . esc_html( $avatar_id->get_error_message() ); - add_action( 'user_profile_update_errors', array( $this, 'user_profile_update_errors' ) ); - return; - } - - $this->assign_new_user_avatar( $avatar_id, $user_id ); - - endif; - - // handle rating - if ( isset( $avatar_id ) || $avatar = get_user_meta( $user_id, 'simple_local_avatar', true ) ) { - if ( empty( $_POST['simple_local_avatar_rating'] ) || ! array_key_exists( $_POST['simple_local_avatar_rating'], $this->avatar_ratings ) ) - $_POST['simple_local_avatar_rating'] = key( $this->avatar_ratings ); - - update_user_meta( $user_id, 'simple_local_avatar_rating', $_POST['simple_local_avatar_rating'] ); - } - } - - /** - * Allow developers to override the maximum allowable file size for avatar uploads - * - * @param int $bytes WordPress default byte size check - * @return int Maximum byte size - */ - public function upload_size_limit( $bytes ) { - return apply_filters( 'simple_local_avatars_upload_limit', $bytes ); - } - - /** - * Runs when a user clicks the Remove button for the avatar - */ - public function action_remove_simple_local_avatar() { - if ( ! empty( $_GET['user_id'] ) && ! empty( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'remove_simple_local_avatar_nonce' ) ) { - $user_id = (int) $_GET['user_id']; - - if ( ! current_user_can('edit_user', $user_id) ) - wp_die( __('You do not have permission to edit this user.') ); - - $this->avatar_delete( $user_id ); // delete old images if successful - - if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) - echo get_simple_local_avatar( $user_id ); - } - - if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) - die; - } - - /** - * AJAX callback for assigning media ID fetched from media library to user - */ - public function ajax_assign_simple_local_avatar_media() { - // check required information and permissions - if ( empty( $_POST['user_id'] ) || empty( $_POST['media_id'] ) || ! current_user_can( 'upload_files' ) || ! current_user_can( 'edit_user', $_POST['user_id'] ) || empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'assign_simple_local_avatar_nonce' ) ) - die; - - $media_id = (int) $_POST['media_id']; - $user_id = (int) $_POST['user_id']; - - // ensure the media is real is an image - if ( wp_attachment_is_image( $media_id ) ) - $this->assign_new_user_avatar( $media_id, $user_id ); - - echo get_simple_local_avatar( $user_id ); - - die; - } - - /** - * remove the custom get_avatar hook for the default avatar list output on options-discussion.php - */ - public function avatar_defaults( $avatar_defaults ) { - remove_action( 'get_avatar', array( $this, 'get_avatar' ) ); - return $avatar_defaults; - } - - /** - * Delete avatars based on a user_id - * - * @param int $user_id - */ - public function avatar_delete( $user_id ) { - $old_avatars = (array) get_user_meta( $user_id, 'simple_local_avatar', true ); - - if ( empty( $old_avatars ) ) - return; - - // if it was uploaded media, don't erase the full size or try to erase an the ID - if ( array_key_exists( 'media_id', $old_avatars ) ) - unset( $old_avatars['media_id'], $old_avatars['full'] ); - - if ( ! empty( $old_avatars ) ) { - $upload_path = wp_upload_dir(); - - foreach ($old_avatars as $old_avatar ) { - // derive the path for the file based on the upload directory - $old_avatar_path = str_replace( $upload_path['baseurl'], $upload_path['basedir'], $old_avatar ); - if ( file_exists( $old_avatar_path ) ) - unlink( $old_avatar_path ); - } - } - - delete_user_meta( $user_id, 'simple_local_avatar' ); - delete_user_meta( $user_id, 'simple_local_avatar_rating' ); - } - - /** - * Creates a unique, meaningful file name for uploaded avatars. - * - * @param string $dir Path for file - * @param string $name Filename - * @param string $ext File extension (e.g. ".jpg") - * @return string Final filename - */ - public function unique_filename_callback( $dir, $name, $ext ) { - $user = get_user_by( 'id', (int) $this->user_id_being_edited ); - $name = $base_name = sanitize_file_name( $user->display_name . '_avatar_' . time() ); - - // ensure no conflicts with existing file names - $number = 1; - while ( file_exists( $dir . "/$name$ext" ) ) { - $name = $base_name . '_' . $number; - $number++; - } - - return $name . $ext; - } - - /** - * Adds errors based on avatar upload problems. - * - * @param WP_Error $errors Error messages for user profile screen. - */ - public function user_profile_update_errors( WP_Error $errors ) { - $errors->add( 'avatar_error', $this->avatar_upload_error ); - } - - /** - * Registers the simple_local_avatar field in the REST API. - */ - public function register_rest_fields() { - register_rest_field( 'user', 'simple_local_avatar', array( - 'get_callback' => array( $this, 'get_avatar_rest' ), - 'update_callback' => array( $this, 'set_avatar_rest' ), - 'schema' => array( - 'description' => 'The users simple local avatar', - 'type' => 'object', - ) - )); - } - - /** - * Returns the simple_local_avatar meta key for the given user. - * - * @param object $user User object - */ - public function get_avatar_rest( $user ) { - $local_avatar = get_user_meta( $user['id'], 'simple_local_avatar', true ); - if ( empty( $local_avatar ) ) { - return; - } - return $local_avatar; - } - - /** - * Updates the simple local avatar from a REST request. - * - * Since we are just adding a field to the existing user endpoint - * we don't need to worry about ensuring the calling user has proper permissions. - * Only the user or an administrator would be able to change the avatar. - * - * @param array $input Input submitted via REST request. - * @param object $user The user making the request. - */ - public function set_avatar_rest( $input, $user ) { - $this->assign_new_user_avatar($input['media_id'], $user->ID); - } - -} - -$simple_local_avatars = new Simple_Local_Avatars; - -/** - * more efficient to call simple local avatar directly in theme and avoid gravatar setup - * - * @param int|string|object $id_or_email A user ID, email address, or comment object - * @param int $size Size of the avatar image - * @param string $default URL to a default image to use if no avatar is available - * @param string $alt Alternate text to use in image tag. Defaults to blank - * @return string tag for the user's avatar - */ -function get_simple_local_avatar( $id_or_email, $size = 96, $default = '', $alt = '' ) { - global $simple_local_avatars; - $avatar = $simple_local_avatars->get_avatar( '', $id_or_email, $size, $default, $alt ); - - if ( empty ( $avatar ) ) { - remove_action( 'get_avatar', array( $simple_local_avatars, 'get_avatar' ) ); - $avatar = get_avatar( $id_or_email, $size, $default, $alt ); - add_action( 'get_avatar', array( $simple_local_avatars, 'get_avatar' ), 10, 5 ); - } - - return $avatar; -} - -if ( ! function_exists( 'get_avatar' ) && ( $simple_local_avatars_options = get_option('simple_local_avatars') ) && ! empty( $simple_local_avatars_options['only'] ) ) : - - /** - * Retrieve the avatar for a user who provided a user ID or email address. - * - * @param int|string|object $id_or_email A user ID, email address, or comment object - * @param int $size Size of the avatar image - * @param string $default URL to a default image to use if no avatar is available - * @param string $alt Alternative text to use in image tag. Defaults to blank - * @return string tag for the user's avatar - */ - function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '' ) { - global $simple_local_avatars; - - if ( ! get_option('show_avatars') ) - return false; - - $safe_alt = empty( $alt ) ? '' : esc_attr( $alt ); - - if ( !is_numeric($size) ) - $size = 96; - - if ( ! $avatar = $simple_local_avatars->get_avatar( '', $id_or_email, $size, $default, $alt ) ) : - - if ( empty($default) ) { - $avatar_default = get_option('avatar_default'); - if ( empty($avatar_default) ) - $default = 'mystery'; - else - $default = $avatar_default; - } - - $host = is_ssl() ? 'https://secure.gravatar.com' : 'http://0.gravatar.com'; - - if ( 'mystery' == $default ) - $default = "$host/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') - elseif ( 'blank' == $default ) - $default = includes_url( 'images/blank.gif' ); - elseif ( 'gravatar_default' == $default ) - $default = "$host/avatar/?s={$size}"; - else - $default = "$host/avatar/?d=$default&s={$size}"; - - $avatar = "{$safe_alt}"; - - endif; - - return apply_filters('get_avatar', $avatar, $id_or_email, $size, $default, $alt); - } - -endif; - -/** - * on uninstallation, remove the custom field from the users and delete the local avatars - */ - -register_uninstall_hook( __FILE__, 'simple_local_avatars_uninstall' ); - -function simple_local_avatars_uninstall() { - $simple_local_avatars = new Simple_Local_Avatars; - $users = get_users(array( - 'meta_key' => 'simple_local_avatar', - 'fields' => 'ids', - )); - - foreach ( $users as $user_id ): - $simple_local_avatars->avatar_delete( $user_id ); - endforeach; - - delete_option('simple_local_avatars'); -} + tag for the user's avatar + */ +function get_simple_local_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = array() ) { + return apply_filters( 'simple_local_avatar', get_avatar( $id_or_email, $size, $default, $alt, $args ) ); +} + +register_uninstall_hook( __FILE__, 'simple_local_avatars_uninstall' ); +/** + * On uninstallation, remove the custom field from the users and delete the local avatars + */ +function simple_local_avatars_uninstall() { + $simple_local_avatars = new Simple_Local_Avatars(); + $users = get_users( + array( + 'meta_key' => 'simple_local_avatar', + 'fields' => 'ids', + ) + ); + + foreach ( $users as $user_id ) : + $simple_local_avatars->avatar_delete( $user_id ); + endforeach; + + delete_option( 'simple_local_avatars' ); +}