From 4dd1be344e867b54d072cab5358a6b6801426e0c Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Wed, 29 Jan 2025 16:01:02 +0200 Subject: [PATCH] * backward compatibility; * update dropdown items texts on profile photo change/remove; * added escapers; * WPCS; --- assets/js/um-modal.js | 14 +++++++++++++- assets/js/um-modal.min.js | 2 +- assets/js/um-profile.js | 18 +++++++++++------- assets/js/um-profile.min.js | 2 +- includes/core/um-actions-profile.php | 26 ++++++++++++++------------ 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/assets/js/um-modal.js b/assets/js/um-modal.js index a6fc3de1..37d8e46e 100644 --- a/assets/js/um-modal.js +++ b/assets/js/um-modal.js @@ -108,8 +108,11 @@ jQuery(document).ready(function() { var mode = ''; if ( jQuery('div.um-field-image[data-key="' + key + '"]').length === 1 ) { let $formWrapper = jQuery('div.um-field-image[data-key="' + key + '"]').closest('.um-form'); - form_id = $formWrapper.data('form_id'); + form_id = $formWrapper.data('form_id') || $formWrapper.find('input[name="form_id"]').val(); // 'input[name="form_id"]' is a backward compatibility. mode = $formWrapper.data('mode'); + } else { + console.warn( wp.i18n.__( 'UM Warning: No field associated with image uploader.', 'ultimate-member' ) ); + return; } if ( jQuery('.cropper-hidden').length > 0 && UM.frontend.cropper.obj ) { @@ -140,6 +143,15 @@ jQuery(document).ready(function() { if ( key === 'profile_photo' ) { jQuery('.um-profile-photo-img img').attr('src', response.data.image.source_url + "?"+d.getTime()); + + let $dropdown = jQuery('.um-profile-photo .um-dropdown'); + if ( ! $dropdown.find('.um-reset-profile-photo').hasClass('um-is-visible') ) { + let $dropdownItem = $dropdown.find('.um-manual-trigger[data-parent=".um-profile-photo"]'); + let altText = $dropdownItem.data('alt_text'); + $dropdownItem.data( 'alt_text', $dropdownItem.text() ).text( altText ); + + $dropdown.find('.um-reset-profile-photo').addClass('um-is-visible').show(); + } } else if ( key === 'cover_photo' ) { jQuery('.um-cover-e').empty().html(''); if ( jQuery('.um').hasClass('um-editing') ) { diff --git a/assets/js/um-modal.min.js b/assets/js/um-modal.min.js index c2898478..9f97c0b0 100644 --- a/assets/js/um-modal.min.js +++ b/assets/js/um-modal.min.js @@ -1 +1 @@ -jQuery(document).ready(function(){jQuery(document).on("click",".um-popup-overlay",function(){remove_Modal()}),jQuery(document).on("click",'.um-modal-overlay, a[data-action="um_remove_modal"]',function(){um_remove_modal()}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal:not(:has(.um-form)) a',function(e){return e.preventDefault(),!1}),jQuery(document).on("click",".um-finish-upload.file:not(.disabled)",function(){var e=jQuery(this).attr("data-key"),a=jQuery(this).parents(".um-modal-body").find(".um-single-file-preview").html(),a=(um_remove_modal(),jQuery(".um-single-file-preview[data-key="+e+"]").fadeIn().html(a),jQuery(".um-field[data-key="+e+"]").find(".um-single-fileinfo a").data("file"));jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find(".um-btn-auto-width").html(jQuery(this).attr("data-change")),jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find('input[type="hidden"]').val(a)}),jQuery(document).on("click",".um-finish-upload.image:not(.disabled)",function(){var a,e,t=jQuery(this),r=jQuery(this).attr("data-key"),i=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview"),u=i.find("img").attr("src"),i=i.find("img").data("file"),d=0,m=(jQuery(this).parents("#um_upload_single").data("user_id")&&(d=jQuery(this).parents("#um_upload_single").data("user_id")),0),n="";1===jQuery('div.um-field-image[data-key="'+r+'"]').length&&(m=(e=jQuery('div.um-field-image[data-key="'+r+'"]').closest(".um-form")).data("form_id"),n=e.data("mode")),0'),jQuery(".um").hasClass("um-editing"))&&jQuery(".um-cover-overlay").show(),jQuery(".um-single-image-preview[data-key="+r+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+a.getTime()),um_remove_modal(),jQuery("img.cropper-invisible").remove(),jQuery(".um-single-image-preview[data-key="+r+"]").parents(".um-field").find(".um-btn-auto-width").html(t.attr("data-change")),jQuery(".um-single-image-preview[data-key="+r+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(a=new Date,jQuery(".um-single-image-preview[data-key="+r+"]").fadeIn().find("img").attr("src",u+"?"+a.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+r+"]").parents(".um-field").find(".um-btn-auto-width").html(t.attr("data-change")),jQuery(".um-single-image-preview[data-key="+r+"]").parents(".um-field").find("input[type=hidden]").val(i))}),jQuery(document.body).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";jQuery(this).data("modal-size")&&(t=jQuery(this).data("modal-size")),jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0'),jQuery(".um").hasClass("um-editing"))&&jQuery(".um-cover-overlay").show(),jQuery(".um-single-image-preview[data-key="+d+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+r.getTime()),um_remove_modal(),jQuery("img.cropper-invisible").remove(),jQuery(".um-single-image-preview[data-key="+d+"]").parents(".um-field").find(".um-btn-auto-width").html(u.attr("data-change")),jQuery(".um-single-image-preview[data-key="+d+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(r=new Date,jQuery(".um-single-image-preview[data-key="+d+"]").fadeIn().find("img").attr("src",t+"?"+r.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+d+"]").parents(".um-field").find(".um-btn-auto-width").html(u.attr("data-change")),jQuery(".um-single-image-preview[data-key="+d+"]").parents(".um-field").find("input[type=hidden]").val(a)))}),jQuery(document.body).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";jQuery(this).data("modal-size")&&(t=jQuery(this).data("modal-size")),jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0'),um_responsive(),user_id=jQuery(this).attr("data-user_id"),metakey="cover_photo",jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_cover_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce},success:function(e){t.hide()}}),UM.dropdown.hideAll(),!1}),jQuery(document.body).on("change keyup","#um-meta-bio",function(){if(void 0!==jQuery(this).val()){var t=jQuery(this).data("character-limit"),r=jQuery(this).data("html");let e=t-jQuery(this).val().length;e=(e=1===parseInt(r)?t-jQuery(this).val().replace(/(<([^>]+)>)/gi,"").length:e)<0?0:e,jQuery("span.um-meta-bio-character span.um-bio-limit").text(e);r=e<5?"red":"";jQuery("span.um-meta-bio-character").css("color",r)}}),jQuery("#um-meta-bio").trigger("change"),jQuery(".um-profile form").each(function(){let t=jQuery(this).data("description_key");jQuery(this).find('textarea[name="'+t+'"]').length&&jQuery(document.body).on("change input",'textarea[name="'+t+'"]',function(e){jQuery(this).parents("form").find('textarea[name="'+t+'"]').each(function(){jQuery(this).val(e.currentTarget.value),jQuery("#um-meta-bio")[0]!==e.currentTarget&&jQuery("#um-meta-bio")[0]===jQuery(this)[0]&&jQuery(this).trigger("change")})})}),jQuery(".um-profile-edit a.um_delete-item").on("click",function(e){if(e.preventDefault(),!confirm(wp.i18n.__("Are you sure that you want to delete this user?","ultimate-member")))return!1}),jQuery(".um-profile-nav a").on("touchend",function(e){jQuery(e.currentTarget).trigger("click")})}); \ No newline at end of file +jQuery(document).ready(function(){jQuery(".um-profile.um-viewing .um-profile-body .um-row").each(function(){var e=jQuery(this);0==e.find(".um-field").length&&(e.prev(".um-row-heading").remove(),e.remove())}),jQuery(".um-profile.um-viewing .um-profile-body").length&&0==jQuery(".um-profile.um-viewing .um-profile-body").find(".um-field").length&&(jQuery(".um-profile.um-viewing .um-profile-body").find(".um-row-heading,.um-row").remove(),jQuery(".um-profile-note").show()),jQuery(document.body).on("click",".um-profile-save",function(e){return e.preventDefault(),jQuery(this).parents(".um.um-profile.um-editing").find("form").trigger("submit"),!1}),jQuery(document.body).on("click",".um-profile-edit-a",function(e){jQuery(this).addClass("active")}),jQuery(document.body).on("click",".um-cover a.um-cover-add, .um-photo a",function(e){e.preventDefault()}),jQuery(document.body).on("click",".um-photo-modal",function(e){e.preventDefault();e=jQuery(this).attr("data-src");return um_new_modal("um_view_photo","fit",!0,e),!1}),jQuery(document.body).on("click",".um-reset-profile-photo",function(e){let t=jQuery(this);var r=t.data("user_id"),u=t.parents("ul").find('.um-manual-trigger[data-parent=".um-profile-photo"]'),i=u.data("alt_text");return u.data("alt_text",u.text()).text(i),jQuery(".um-profile-photo-img img").attr("src",t.data("default_src")),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:"profile_photo",user_id:r,nonce:um_scripts.nonce},success:function(){t.removeClass("um-is-visible").hide()}}),UM.dropdown.hideAll(),!1}),jQuery(document.body).on("click",".um-reset-cover-photo",function(e){var t=jQuery(this);return jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html(''),um_responsive(),user_id=jQuery(this).attr("data-user_id"),metakey="cover_photo",jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_cover_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce},success:function(e){t.hide()}}),UM.dropdown.hideAll(),!1}),jQuery(document.body).on("change keyup","#um-meta-bio",function(){if(void 0!==jQuery(this).val()){var t=jQuery(this).data("character-limit"),r=jQuery(this).data("html");let e=t-jQuery(this).val().length;e=(e=1===parseInt(r)?t-jQuery(this).val().replace(/(<([^>]+)>)/gi,"").length:e)<0?0:e,jQuery("span.um-meta-bio-character span.um-bio-limit").text(e);r=e<5?"red":"";jQuery("span.um-meta-bio-character").css("color",r)}}),jQuery("#um-meta-bio").trigger("change"),jQuery(".um-profile form").each(function(){let t=jQuery(this).data("description_key");jQuery(this).find('textarea[name="'+t+'"]').length&&jQuery(document.body).on("change input",'textarea[name="'+t+'"]',function(e){jQuery(this).parents("form").find('textarea[name="'+t+'"]').each(function(){jQuery(this).val(e.currentTarget.value),jQuery("#um-meta-bio")[0]!==e.currentTarget&&jQuery("#um-meta-bio")[0]===jQuery(this)[0]&&jQuery(this).trigger("change")})})}),jQuery(".um-profile-edit a.um_delete-item").on("click",function(e){if(e.preventDefault(),!confirm(wp.i18n.__("Are you sure that you want to delete this user?","ultimate-member")))return!1}),jQuery(".um-profile-nav a").on("touchend",function(e){jQuery(e.currentTarget).trigger("click")})}); \ No newline at end of file diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php index dea06397..03d01c23 100644 --- a/includes/core/um-actions-profile.php +++ b/includes/core/um-actions-profile.php @@ -883,14 +883,15 @@ function um_profile_header_cover_area( $args ) { do_action( 'um_cover_area_content', um_profile_id() ); if ( true === UM()->fields()->editing ) { - $hide_remove = um_user( 'cover_photo' ) ? false : ' style="display:none;"'; + $hide_remove = um_user( 'cover_photo' ) ? '' : ' style="display:none;"'; - $text = ! um_user( 'cover_photo' ) ? __( 'Upload a cover photo', 'ultimate-member' ) : __( 'Change cover photo', 'ultimate-member' ) ; + $text = ! um_user( 'cover_photo' ) ? __( 'Upload a cover photo', 'ultimate-member' ) : __( 'Change cover photo', 'ultimate-member' ) ; + $alt_text = um_user( 'cover_photo' ) ? __( 'Upload a cover photo', 'ultimate-member' ) : __( 'Change cover photo', 'ultimate-member' ) ; $items = array( - '' . $text . '', - '' . __( 'Remove', 'ultimate-member' ) . '', - '' . __( 'Cancel', 'ultimate-member' ) . '', + '' . esc_html( $text ) . '', + '' . esc_html__( 'Remove cover photo', 'ultimate-member' ) . '', + '' . esc_html__( 'Cancel', 'ultimate-member' ) . '', ); $items = apply_filters( 'um_cover_area_content_dropdown_items', $items, um_profile_id() ); @@ -901,8 +902,8 @@ function um_profile_header_cover_area( $args ) { if ( ! isset( UM()->user()->cannot_edit ) && ! um_user( 'cover_photo' ) ) { $items = array( - '' . __( 'Upload a cover photo', 'ultimate-member' ) . '', - '' . __( 'Cancel', 'ultimate-member' ) . '', + '' . esc_html__( 'Upload a cover photo', 'ultimate-member' ) . '', + '' . esc_html__( 'Cancel', 'ultimate-member' ) . '', ); $items = apply_filters( 'um_cover_area_content_dropdown_items', $items, um_profile_id() ); @@ -1086,8 +1087,9 @@ function um_profile_header( $args ) { if ( ! um_profile( 'profile_photo' ) ) { // has profile photo $items = array( - '' . __( 'Upload photo', 'ultimate-member' ) . '', - '' . __( 'Cancel', 'ultimate-member' ) . '', + '' . esc_html__( 'Upload photo', 'ultimate-member' ) . '', + '', + '' . esc_html__( 'Cancel', 'ultimate-member' ) . '', ); /** @@ -1118,9 +1120,9 @@ function um_profile_header( $args ) { } elseif ( true === UM()->fields()->editing ) { $items = array( - '' . __( 'Change photo', 'ultimate-member' ) . '', - '' . __( 'Remove photo', 'ultimate-member' ) . '', - '' . __( 'Cancel', 'ultimate-member' ) . '', + '' . esc_html__( 'Change photo', 'ultimate-member' ) . '', + '' . esc_html__( 'Remove photo', 'ultimate-member' ) . '', + '' . esc_html__( 'Cancel', 'ultimate-member' ) . '', ); /**