10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 19:56:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1264 from ultimatemember/development/2.6.10

Browse Source 
Version 2.6.10
This commit is contained in:
Mykyta Synelnikov
2023-08-17 12:15:24 +03:00
committed by GitHub
parent 064b3298ab 8bbcc4479a
commit 5c3155bfd8
24 changed files with 712 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -44,7 +44,7 @@ GNU Version 2 or Any Later Version
### IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION
[Official Release Version: 2.6.9](https://github.com/ultimatemember/ultimatemember/releases/tag/2.6.9).
[Official Release Version: 2.6.10](https://github.com/ultimatemember/ultimatemember/releases/tag/2.6.10).
## Changelog
assets/js/um-modal.js
+28 -28
View File
@@ -1,10 +1,10 @@
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();
});
@@ -13,7 +13,7 @@ jQuery(document).ready(function() {
e.preventDefault();
return false;
});
jQuery(document).on('click', '.um-modal .um-single-file-preview a.cancel', function(e){
e.preventDefault();
@@ -37,10 +37,10 @@ jQuery(document).ready(function() {
um_modal_responsive();
}
});
return false;
});
jQuery(document).on('click', '.um-modal .um-single-image-preview a.cancel', function(e){
e.preventDefault();
@@ -67,30 +67,30 @@ jQuery(document).ready(function() {
um_modal_responsive();
}
});
return false;
});
jQuery(document).on('click', '.um-finish-upload.file:not(.disabled)', function(){
var key = jQuery(this).attr('data-key');
var preview = jQuery(this).parents('.um-modal-body').find('.um-single-file-preview').html();
um_remove_modal();
jQuery('.um-single-file-preview[data-key='+key+']').fadeIn().html( preview );
var file = jQuery('.um-field[data-key='+key+']').find('.um-single-fileinfo a').data('file');
jQuery('.um-single-file-preview[data-key='+key+']').parents('.um-field').find('.um-btn-auto-width').html( jQuery(this).attr('data-change') );
jQuery('.um-single-file-preview[data-key='+key+']').parents('.um-field').find('input[type="hidden"]').val( file );
});
jQuery(document).on('click', '.um-finish-upload.image:not(.disabled)', function(){
var elem = jQuery(this);
var key = jQuery(this).attr('data-key');
var img_c = jQuery(this).parents('.um-modal-body').find('.um-single-image-preview');
@@ -112,7 +112,7 @@ jQuery(document).ready(function() {
}
if ( coord ) {
jQuery(this).html( jQuery(this).attr('data-processing') ).addClass('disabled');
jQuery.ajax({
@@ -157,23 +157,23 @@ jQuery(document).ready(function() {
}
});
} else {
d = new Date();
jQuery('.um-single-image-preview[data-key='+key+']').fadeIn().find('img').attr('src', src + "?"+d.getTime());
um_remove_modal();
jQuery('.um-single-image-preview[data-key='+key+']').parents('.um-field').find('.um-btn-auto-width').html( elem.attr('data-change') );
jQuery('.um-single-image-preview[data-key='+key+']').parents('.um-field').find('input[type=hidden]').val( file );
}
});
jQuery(document.body).on('click', 'a[data-modal^="um_"], span[data-modal^="um_"]', function(e){
var modal_id = jQuery(this).attr('data-modal');
@@ -183,19 +183,19 @@ jQuery(document).ready(function() {
if ( jQuery(this).data('modal-size') ) {
size = jQuery(this).data('modal-size');
}
if ( jQuery(this).data('modal-copy') ) {
jQuery('#' + modal_id).html( jQuery(this).parents('.um-field').find('.um-modal-hidden-content').html() );
if ( jQuery(this).parents('.um-profile-photo').attr('data-user_id') ) {
jQuery('#' + modal_id).attr('data-user_id', jQuery(this).parents('.um-profile-photo').attr('data-user_id') );
}
if ( jQuery(this).parents('.um-cover').attr('data-ratio') ) {
jQuery('#' + modal_id).attr('data-ratio', jQuery(this).parents('.um-cover').attr('data-ratio') );
}
if ( jQuery(this).parents('.um-cover').attr('data-user_id') ) {
jQuery('#' + modal_id).attr('data-user_id', jQuery(this).parents('.um-cover').attr('data-user_id') );
}
@@ -209,4 +209,4 @@ jQuery(document).ready(function() {
um_new_modal( modal_id, size );
});
});
});
assets/js/um-profile.js
+11 -26
View File
@@ -88,36 +88,22 @@ jQuery(document).ready(function() {
return false;
});
/*function um_update_bio_countdown() {
//
jQuery(this)
if ( typeof jQuery('textarea[id="um-meta-bio"]').val() !== 'undefined' ){
var um_bio_limit = jQuery('textarea[id="um-meta-bio"]').attr( "data-character-limit" );
var remaining = um_bio_limit - jQuery('textarea[id="um-meta-bio"]').val().length;
jQuery('span.um-meta-bio-character span.um-bio-limit').text( remaining );
if ( remaining < 5 ) {
jQuery('span.um-meta-bio-character').css('color','red');
} else {
jQuery('span.um-meta-bio-character').css('color','');
}
}
}*/
//um_update_bio_countdown();
//jQuery( 'textarea[id="um-meta-bio"]' ).on('change', um_update_bio_countdown ).keyup( um_update_bio_countdown ).trigger('change');
// Bio characters limit
jQuery( document.body ).on( 'change keyup', '#um-meta-bio', function() {
if ( typeof jQuery(this).val() !== 'undefined' ) {
var um_bio_limit = jQuery(this).data( 'character-limit' );
var remaining = um_bio_limit - jQuery(this).val().length;
let um_bio_limit = jQuery(this).data( 'character-limit' );
let bio_html = jQuery(this).data( 'html' );
let remaining = um_bio_limit - jQuery(this).val().length;
if ( parseInt( bio_html ) === 1 ) {
remaining = um_bio_limit - jQuery(this).val().replace(/(<([^>]+)>)/ig,'').length;
}
remaining = remaining < 0 ? 0 : remaining;
jQuery( 'span.um-meta-bio-character span.um-bio-limit' ).text( remaining );
if ( remaining < 5 ) {
jQuery('span.um-meta-bio-character').css('color','red');
} else {
jQuery('span.um-meta-bio-character').css('color','');
}
let color = remaining < 5 ? 'red' : '';
jQuery('span.um-meta-bio-character').css( 'color', color );
}
});
jQuery( '#um-meta-bio' ).trigger('change');
@@ -153,5 +139,4 @@ jQuery(document).ready(function() {
jQuery( '.um-profile-nav a' ).on( 'touchend', function(e) {
jQuery( e.currentTarget).trigger( "click" );
});
});
assets/js/um-profile.min.js
Vendored
+1 -1
View File
@@ -1 +1 @@
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").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){return jQuery(".um-profile-photo-img img").attr("src",jQuery(this).attr("data-default_src")),user_id=jQuery(this).attr("data-user_id"),metakey="profile_photo",UM.dropdown.hideAll(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce}}),jQuery(this).parents("li").hide(),!1}),jQuery(document.body).on("click",".um-reset-cover-photo",function(e){var r=jQuery(this);return jQuery(".um-cover-overlay").hide(),jQuery(".um-cover-e").html('<a href="javascript:void(0);" class="um-cover-add" style="height: 370px;"><span class="um-cover-add-i"><i class="um-icon-plus um-tip-n" original-title="Upload a cover photo"></i></span></a>'),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){r.hide()}}),UM.dropdown.hideAll(),!1}),jQuery(document.body).on("change keyup","#um-meta-bio",function(){var e;void 0!==jQuery(this).val()&&(e=jQuery(this).data("character-limit")-jQuery(this).val().length,jQuery("span.um-meta-bio-character span.um-bio-limit").text(e),e<5?jQuery("span.um-meta-bio-character").css("color","red"):jQuery("span.um-meta-bio-character").css("color",""))}),jQuery("#um-meta-bio").trigger("change"),jQuery(".um-profile form").each(function(){let r=jQuery(this).data("description_key");jQuery(this).find('textarea[name="'+r+'"]').length&&jQuery(document.body).on("change input",'textarea[name="'+r+'"]',function(e){jQuery(this).parents("form").find('textarea[name="'+r+'"]').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")})});
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").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){return jQuery(".um-profile-photo-img img").attr("src",jQuery(this).attr("data-default_src")),user_id=jQuery(this).attr("data-user_id"),metakey="profile_photo",UM.dropdown.hideAll(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_delete_profile_photo",metakey:metakey,user_id:user_id,nonce:um_scripts.nonce}}),jQuery(this).parents("li").hide(),!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('<a href="javascript:void(0);" class="um-cover-add" style="height: 370px;"><span class="um-cover-add-i"><i class="um-icon-plus um-tip-n" original-title="Upload a cover photo"></i></span></a>'),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")})});
includes/admin/assets/js/um-admin-modal.js
+2 -2
View File
@@ -199,7 +199,7 @@ function um_admin_remove_modal() {
jQuery('.um_tiny_placeholder').replaceWith( jQuery( $um_tiny_editor ).html() );
}
if ( 'undefined' !== typeof window.UM.admin.allTooltips && window.UM.admin.allTooltips.length > 0 ) {
if ( 'undefined' !== typeof window.UM.admin.allTooltips && window.UM.admin.allTooltips.length > 0 && 'function' === typeof window.UM.admin.allTooltips.tooltip ) {
window.UM.admin.allTooltips.tooltip('close');
}
jQuery('.tipsy').hide();
@@ -234,7 +234,7 @@ jQuery(document).ready(function() {
/**
disable link
**/
jQuery(document.body).on('click', '.um-admin-builder a, .um-admin-modal a', function(e){
jQuery(document.body).on('click', '.um-admin-builder a, .um-admin-modal a:not(.um-preview-upload)', function(e){
e.preventDefault();
return false;
});
includes/admin/class-secure.php
+22 -19
View File
@@ -73,28 +73,20 @@ if ( ! class_exists( 'um\admin\Secure' ) ) {
*/
public function filter_users_by_date_registered( $query ) {
global $pagenow;
if ( is_admin() && 'users.php' === $pagenow ) {
if ( 'users.php' === $pagenow && is_admin() ) {
// phpcs:disable WordPress.Security.NonceVerification
$date_from = isset( $_GET['um_secure_date_from'] ) ? $_GET['um_secure_date_from'] : null;
$date_to = isset( $_GET['um_secure_date_to'] ) ? $_GET['um_secure_date_to'] : null;
// phpcs:enable WordPress.Security.NonceVerification
if ( ! $date_to ) {
$query->set(
'date_query',
array(
'after' => human_time_diff( $date_from, strtotime( current_time( 'mysql' ) ) ) . ' ago',
'inclusive' => true,
)
);
} elseif ( $date_from && $date_to ) {
$query->set(
'date_query',
array(
'after' => human_time_diff( $date_from, strtotime( current_time( 'mysql' ) ) ) . ' ago',
'before' => human_time_diff( $date_to, strtotime( current_time( 'mysql' ) ) ) . ' ago',
'inclusive' => true,
)
if ( $date_from ) {
$date_query_attr = array(
'after' => human_time_diff( $date_from, strtotime( current_time( 'mysql' ) ) ) . ' ago',
'inclusive' => true,
);
if ( $date_to ) {
$date_query_attr['before'] = human_time_diff( $date_to, strtotime( current_time( 'mysql' ) ) ) . ' ago';
}
$query->set( 'date_query', $date_query_attr );
}
}
@@ -123,13 +115,24 @@ if ( ! class_exists( 'um\admin\Secure' ) ) {
/**
* Destroy all user sessions except the current logged-in user.
*/
$wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->usermeta . ' WHERE meta_key="session_tokens" AND user_id != %d', get_current_user_id() ) );
$wpdb->query(
$wpdb->prepare(
"DELETE
FROM {$wpdb->usermeta}
WHERE meta_key='session_tokens' AND
user_id != %d",
get_current_user_id()
)
);
if ( UM()->options()->get( 'display_login_form_notice' ) ) {
global $wpdb;
$wpdb->query(
$wpdb->prepare(
"DELETE FROM {$wpdb->usermeta} WHERE user_id != %d AND ( meta_key = 'um_secure_has_reset_password' OR meta_key = 'um_secure_has_reset_password__timestamp' )",
"DELETE
FROM {$wpdb->usermeta}
WHERE user_id != %d AND
( meta_key = 'um_secure_has_reset_password' OR meta_key = 'um_secure_has_reset_password__timestamp' )",
get_current_user_id()
)
);
includes/admin/core/class-admin-notices.php
+35
View File
@@ -53,6 +53,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
$this->template_version();
$this->child_theme_required();
// removed for now to avoid the bad reviews
//$this->reviews_notice();
@@ -801,6 +803,39 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
}
}
/**
* Check if there isn't installed child-theme. Child theme is required for safely saved customizations.
*/
public function child_theme_required() {
if ( ! is_child_theme() ) {
if ( ! is_dir( get_stylesheet_directory() . DIRECTORY_SEPARATOR . 'ultimate-member' ) ) {
return;
}
ob_start();
?>
<p>
<?php
// translators: %s child-theme article link.
echo wp_kses( sprintf( __( 'We highly recommend using a <a href="%s">child-theme</a> for Ultimate Member customization, which hasn\'t dependencies with the official themes repo, so your custom files cannot be rewritten after a theme upgrade.<br />Otherwise, the customization files may be deleted after every theme upgrade.', 'ultimate-member' ), 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ), UM()->get_allowed_html( 'admin_notice' ) );
?>
</p>
<?php
$message = ob_get_clean();
UM()->admin()->notices()->add_notice(
'um_is_not_child_theme',
array(
'class' => 'notice-warning',
'message' => $message,
'dismissible' => true,
),
10
);
}
}
/**
* First time installed Secure settings.
*/
includes/class-config.php
+22 -24
View File
@@ -95,38 +95,36 @@ if ( ! class_exists( 'um\Config' ) ) {
'members',
);
/**
* UM hook
* Filters Ultimate Member predefined pages.
*
* @type filter
* @title um_core_pages
* @description Extend UM core pages
* @input_vars
* [{"var":"$pages","type":"array","desc":"UM core pages"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_core_pages', 'function_name', 10, 1 ); ?>
* @example
* <?php
* add_filter( 'um_core_pages', 'my_core_pages', 10, 1 );
* @param {array} $pages Predefined pages.
*
* @return {array} Predefined pages.
*
* @since 1.3.x
* @hook um_core_pages
*
* @example <caption>Extend UM core pages.</caption>
* function my_core_pages( $pages ) {
* // your code here
* $pages['my_page_key'] = array( 'title' => __( 'My Page Title', 'my-translate-key' ) );
* return $pages;
* }
* ?>
* add_filter( 'um_core_pages', 'my_core_pages' );
*/
$this->core_pages = apply_filters( 'um_core_pages', array(
'user' => array( 'title' => __( 'User', 'ultimate-member' ) ),
'login' => array( 'title' => __( 'Login', 'ultimate-member' ) ),
'register' => array( 'title' => __( 'Register', 'ultimate-member' ) ),
'members' => array( 'title' => __( 'Members', 'ultimate-member' ) ),
'logout' => array( 'title' => __( 'Logout', 'ultimate-member' ) ),
'account' => array( 'title' => __( 'Account', 'ultimate-member' ) ),
'password-reset' => array( 'title' => __( 'Password Reset', 'ultimate-member' ) ),
) );
$this->core_pages = apply_filters(
'um_core_pages',
array(
'user' => array( 'title' => __( 'User', 'ultimate-member' ) ),
'login' => array( 'title' => __( 'Login', 'ultimate-member' ) ),
'register' => array( 'title' => __( 'Register', 'ultimate-member' ) ),
'members' => array( 'title' => __( 'Members', 'ultimate-member' ) ),
'logout' => array( 'title' => __( 'Logout', 'ultimate-member' ) ),
'account' => array( 'title' => __( 'Account', 'ultimate-member' ) ),
'password-reset' => array( 'title' => __( 'Password Reset', 'ultimate-member' ) ),
)
);
$this->core_directory_meta['members'] = array(
'_um_core' => 'members',
includes/core/class-access.php
+5 -1
View File
@@ -1843,12 +1843,16 @@ if ( ! class_exists( 'um\core\Access' ) ) {
* @param \WP_Post|int $post Post ID or object
* @return bool|array
*/
function get_post_privacy_settings( $post ) {
public function get_post_privacy_settings( $post ) {
// break for incorrect post
if ( empty( $post ) ) {
return false;
}
if ( ! is_numeric( $post ) && ! is_a( $post, \WP_Post::class ) ) {
return false;
}
static $cache = array();
$cache_key = is_numeric( $post ) ? $post : $post->ID;
includes/core/class-account.php
+2 -2
View File
@@ -908,11 +908,11 @@ if ( ! class_exists( 'um\core\Account' ) ) {
$classes .= ' um-in-admin';
}
if ( UM()->fields()->editing == true ) {
if ( true === UM()->fields()->editing ) {
$classes .= ' um-editing';
}
if ( UM()->fields()->viewing == true ) {
if ( true === UM()->fields()->viewing ) {
$classes .= ' um-viewing';
}
includes/core/class-fields.php
+101 -44
View File
@@ -625,11 +625,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output = null;
$output .= '<div class="um-field-label">';
if ( isset( $data['icon'] ) && $data['icon'] != '' && isset( $this->field_icons ) && $this->field_icons != 'off' && ( $this->field_icons == 'label' || $this->viewing == true ) ) {
if ( isset( $data['icon'] ) && $data['icon'] != '' && isset( $this->field_icons ) && $this->field_icons != 'off' && ( $this->field_icons == 'label' || true === $this->viewing ) ) {
$output .= '<div class="um-field-label-icon"><i class="' . esc_attr( $data['icon'] ) . '" aria-label="' . esc_attr( $label ) . '"></i></div>';
}
if ( $this->viewing == true ) {
if ( true === $this->viewing ) {
/**
* UM hook
*
@@ -705,7 +705,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= '<label' . $for_attr . '>' . __( $label, 'ultimate-member' ) . '</label>';
if ( ! empty( $data['help'] ) && $this->viewing == false && ! strstr( $key, 'confirm_user_pass' ) ) {
if ( ! empty( $data['help'] ) && false === $this->viewing && ! strstr( $key, 'confirm_user_pass' ) ) {
if ( ! UM()->mobile()->isMobile() ) {
if ( false === $this->disable_tooltips ) {
$output .= '<span class="um-tip um-tip-' . ( is_rtl() ? 'e' : 'w' ) . '" title="' . esc_attr__( $data['help'], 'ultimate-member' ) . '"><i class="um-icon-help-circled"></i></span>';
@@ -836,7 +836,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
return stripslashes_deep( UM()->form()->post_form[ $key ] );
} elseif ( um_user( $key ) && $this->editing == true ) {
} elseif ( um_user( $key ) && true === $this->editing ) {
//show empty value for password fields
if ( strstr( $key, 'user_pass' ) || $type == 'password' ) {
@@ -889,7 +889,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
*/
$value = apply_filters( "um_edit_{$type}_field_value", $value, $key );
} elseif ( ( um_user( $key ) || isset( $data['show_anyway'] ) ) && $this->viewing == true ) {
} elseif ( ( um_user( $key ) || isset( $data['show_anyway'] ) ) && true === $this->viewing ) {
return um_filtered_value( $key, $data );
@@ -993,7 +993,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
// Default Value for Registration Form and Profile Form editing
if ( ! isset( $value ) && ( $this->set_mode == 'register' || $this->editing == true ) ) {
if ( ! isset( $value ) && ( $this->set_mode == 'register' || true === $this->editing ) ) {
/**
* UM hook
@@ -1173,7 +1173,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
*/
$data = apply_filters( 'um_is_selected_filter_data', $data, $key, $field_value );
if ( ! $this->editing || 'custom' == $this->set_mode ) {
if ( false === $this->editing || 'custom' === $this->set_mode ) {
// show default on register screen if there is default
if ( isset( $data['default'] ) ) {
@@ -1258,7 +1258,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
} else {
if ( $this->editing && 'custom' !== $this->set_mode ) {
if ( true === $this->editing && 'custom' !== $this->set_mode ) {
if ( um_user( $key ) ) {
$um_user_value = um_user( $key );
@@ -1544,38 +1544,35 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
return __( 'Custom Field', 'ultimate-member' );
}
/**
* Get form fields
*
* @return array
*/
function get_fields() {
/**
* UM hook
*
* @type filter
* @title um_get_form_fields
* @description Extend form fields
* @input_vars
* [{"var":"$fields","type":"array","desc":"Selected filter value"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_get_form_fields', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_get_form_fields', 'my_form_fields', 10, 1 );
* function my_form_fields( $fields ) {
* // your code here
* return $fields;
* }
* ?>
*/
$this->fields = apply_filters( 'um_get_form_fields', array() );
public function get_fields() {
if ( empty( $this->fields ) ) {
/**
* Filters the form fields.
*
* @param {array} $fields Form fields.
*
* @return {array} Form fields.
*
* @since 1.3.x
* @hook um_get_form_fields
*
* @example <caption>Extend form fields.</caption>
* function my_form_fields( $fields ) {
* // your code here
* return $fields;
* }
* add_filter( 'um_get_form_fields', 'my_form_fields' );
*/
$this->fields = apply_filters( 'um_get_form_fields', $this->fields );
}
return $this->fields;
}
/**
* Get specific field
*
@@ -1611,7 +1608,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$array['default'] = null;
}
if ( isset( $array['conditions'] ) && is_array( $array['conditions'] ) && ! $this->viewing ) {
if ( isset( $array['conditions'] ) && is_array( $array['conditions'] ) && false === $this->viewing ) {
$array['conditional'] = '';
foreach ( $array['conditions'] as $cond_id => $cond ) {
@@ -2178,7 +2175,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
}
}
if ( ! empty( $this->editing ) && 'profile' === $this->set_mode ) {
if ( true === $this->editing && 'profile' === $this->set_mode ) {
if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) ) {
if ( empty( $data['editable'] ) ) {
$disabled = ' disabled="disabled" ';
@@ -2716,10 +2713,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$field_name = $key;
$field_value = $this->field_value( $key, $default, $data );
$bio_key = UM()->profile()->get_show_bio_key( $this->global_args );
$output .= '<div class="um-field-area">';
if ( isset( $data['html'] ) && 0 !== $data['html'] && 'description' !== $key ) {
if ( ! empty( $data['html'] ) && $bio_key !== $key ) {
$textarea_settings = array(
'media_buttons' => false,
'wpautop' => false,
@@ -2761,13 +2759,44 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
// echo the editor to the buffer
wp_editor( $field_value, $key, $textarea_settings );
// add the contents of the buffer to the output variable
// Add the contents of the buffer to the output variable.
$output .= ob_get_clean();
$output .= '<br /><span class="description">' . esc_html( $placeholder ) . '</span>';
} else {
// User 'description' field uses `<textarea>` block everytime.
$textarea_field_value = '';
if ( ! empty( $field_value ) ) {
$textarea_field_value = ! empty( $data['html'] ) ? $field_value : wp_strip_all_tags( $field_value );
$show_bio = false;
$bio_html = false;
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
if ( 'profile' === $this->global_args['mode'] ) {
if ( ! empty( $this->global_args['use_custom_settings'] ) ) {
if ( ! empty( $this->global_args['show_bio'] ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
} else {
$global_show_bio = UM()->options()->get( 'profile_show_bio' );
if ( ! empty( $global_show_bio ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
}
}
if ( $show_bio ) {
if ( true === $bio_html && ! empty( $data['html'] ) ) {
$textarea_field_value = $field_value;
} else {
$textarea_field_value = wp_strip_all_tags( $field_value );
}
} else {
if ( ! empty( $data['html'] ) ) {
$textarea_field_value = $field_value;
} else {
$textarea_field_value = wp_strip_all_tags( $field_value );
}
}
}
$output .= '<textarea ' . $disabled . ' style="height: ' . esc_attr( $data['height'] ) . ';" class="' . esc_attr( $this->get_class( $key, $data ) ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_id ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . esc_textarea( $textarea_field_value ) . '</textarea>';
}
@@ -3597,7 +3626,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$class = 'um-icon-android-radio-button-off';
}
if ( isset( $data['editable'] ) && 0 === $data['editable'] ) {
if ( empty( $data['editable'] ) ) {
$col_class .= ' um-field-radio-state-disabled';
}
@@ -3716,7 +3745,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$class = 'um-icon-android-checkbox-outline-blank';
}
if ( isset( $data['editable'] ) && 0 === $data['editable'] ) {
if ( empty( $data['editable'] ) ) {
$col_class .= ' um-field-radio-state-disabled';
}
@@ -4255,11 +4284,39 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if ( ! empty( $res ) ) {
$res = stripslashes( $res );
}
if ( 'description' === $data['metakey'] ) {
if ( UM()->options()->get( 'profile_show_html_bio' ) ) {
$res = make_clickable( wpautop( wp_kses_post( $res ) ) );
$bio_key = UM()->profile()->get_show_bio_key( $this->global_args );
if ( $bio_key === $data['metakey'] ) {
$show_bio = false;
$bio_html = false;
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
if ( 'profile' === $this->global_args['mode'] ) {
if ( ! empty( $this->global_args['use_custom_settings'] ) ) {
if ( ! empty( $this->global_args['show_bio'] ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
} else {
$global_show_bio = UM()->options()->get( 'profile_show_bio' );
if ( ! empty( $global_show_bio ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
}
}
if ( $show_bio ) {
if ( true === $bio_html && ! empty( $data['html'] ) ) {
$res = wp_kses_post( make_clickable( wpautop( $res ) ) );
} else {
$res = esc_html( $res );
}
} else {
$res = esc_html( $res );
if ( ! empty( $data['html'] ) ) {
$res = wp_kses_post( make_clickable( wpautop( $res ) ) );
} else {
$res = esc_html( $res );
}
}
$res = nl2br( $res );
includes/core/class-form.php
+102 -1
View File
@@ -733,7 +733,6 @@ if ( ! class_exists( 'um\core\Form' ) ) {
* @return array $form
*/
public function sanitize( $form ) {
if ( isset( $form['form_id'] ) ) {
if ( isset( $this->form_data['custom_fields'] ) ) {
$custom_fields = maybe_unserialize( $this->form_data['custom_fields'] );
@@ -771,6 +770,7 @@ if ( ! class_exists( 'um\core\Form' ) ) {
);
}
$form[ $k ] = wp_kses( $form[ $k ], $allowed_html );
add_filter( 'wp_kses_allowed_html', array( &$this, 'wp_kses_user_desc' ), 10, 2 );
} else {
$form[ $k ] = sanitize_textarea_field( $form[ $k ] );
}
@@ -862,11 +862,112 @@ if ( ! class_exists( 'um\core\Form' ) ) {
}
}
}
$show_bio = false;
$bio_html = false;
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
if ( ! empty( $form_data['use_custom_settings'] ) ) {
if ( ! empty( $form_data['show_bio'] ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
} else {
$global_show_bio = UM()->options()->get( 'profile_show_bio' );
if ( ! empty( $global_show_bio ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
}
$description_key = UM()->profile()->get_show_bio_key( $this->form_data );
if ( $show_bio && ! empty( $form[ $description_key ] ) ) {
$field_exists = false;
if ( ! empty( $this->form_data['custom_fields'] ) ) {
$custom_fields = maybe_unserialize( $this->form_data['custom_fields'] );
if ( array_key_exists( $description_key, $custom_fields ) ) {
$field_exists = true;
if ( ! empty( $custom_fields[ $description_key ]['html'] ) && $bio_html ) {
$allowed_html = UM()->get_allowed_html( 'templates' );
if ( empty( $allowed_html['iframe'] ) ) {
$allowed_html['iframe'] = array(
'allow' => true,
'frameborder' => true,
'loading' => true,
'name' => true,
'referrerpolicy' => true,
'sandbox' => true,
'src' => true,
'srcdoc' => true,
'title' => true,
'width' => true,
'height' => true,
'allowfullscreen' => true,
);
}
$form[ $description_key ] = wp_kses( $form[ $description_key ], $allowed_html );
add_filter( 'wp_kses_allowed_html', array( &$this, 'wp_kses_user_desc' ), 10, 2 );
} else {
$form[ $description_key ] = sanitize_textarea_field( $form[ $description_key ] );
}
}
}
if ( ! $field_exists ) {
if ( $bio_html ) {
$allowed_html = UM()->get_allowed_html( 'templates' );
if ( empty( $allowed_html['iframe'] ) ) {
$allowed_html['iframe'] = array(
'allow' => true,
'frameborder' => true,
'loading' => true,
'name' => true,
'referrerpolicy' => true,
'sandbox' => true,
'src' => true,
'srcdoc' => true,
'title' => true,
'width' => true,
'height' => true,
'allowfullscreen' => true,
);
}
$form[ $description_key ] = wp_kses( $form[ $description_key ], $allowed_html );
add_filter( 'wp_kses_allowed_html', array( &$this, 'wp_kses_user_desc' ), 10, 2 );
} else {
$form[ $description_key ] = sanitize_textarea_field( $form[ $description_key ] );
}
}
}
}
return $form;
}
public function wp_kses_user_desc( $tags, $context ) {
if ( 'user_description' === $context || 'pre_user_description' === $context ) {
$allowed_html = UM()->get_allowed_html( 'templates' );
if ( empty( $allowed_html['iframe'] ) ) {
$allowed_html['iframe'] = array(
'allow' => true,
'frameborder' => true,
'loading' => true,
'name' => true,
'referrerpolicy' => true,
'sandbox' => true,
'src' => true,
'srcdoc' => true,
'title' => true,
'width' => true,
'height' => true,
'allowfullscreen' => true,
);
}
$tags = $allowed_html;
}
return $tags;
}
/**
* Display form type as Title
includes/core/class-member-directory.php
+30 -4
View File
@@ -95,12 +95,38 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
/**
* Member_Directory constructor.
*/
function __construct() {
public function __construct() {
add_filter( 'init', array( &$this, 'init_variables' ) );
add_action( 'template_redirect', array( &$this, 'access_members' ), 555 );
}
/**
* Get the WordPress core searching fields in wp_users query.
* @return array
*/
private function get_core_search_fields() {
/**
* Filters the WordPress core searching fields in wp_users query for UM Member directory query.
*
* @param {array} $core_search_fields Core search fields in wp_users query.
*
* @return {array} Core search fields in wp_users query.
*
* @since 2.6.10
* @hook um_member_directory_core_search_fields
*
* @example <caption>Extends or remove wp_users core search fields.</caption>
* function my_um_member_directory_core_search_fields( $core_search_fields ) {
* $core_search_fields = array_flip( $core_search_fields );
* unset( $core_search_fields['user_email'] );
* $core_search_fields = array_flip( $core_search_fields );
* return $core_search_fields;
* }
* add_filter( 'um_member_directory_core_search_fields', 'my_um_member_directory_core_search_fields' );
*/
return apply_filters( 'um_member_directory_core_search_fields', $this->core_search_fields );
}
/**
* @return bool
@@ -587,8 +613,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
$filter_from_url = ! empty( $_GET[ 'filter_' . $filter . '_' . $unique_hash ] ) ? sanitize_text_field( $_GET[ 'filter_' . $filter . '_' . $unique_hash ] ) : $default_value; ?>
<input type="text" autocomplete="off" id="<?php echo $filter; ?>" name="<?php echo $filter; ?>"
placeholder="<?php esc_attr_e( stripslashes( $label ), 'ultimate-member' ); ?>"
value="<?php echo esc_attr( $filter_from_url ) ?>" class="um-form-field"
aria-label="<?php esc_attr_e( stripslashes( $label ), 'ultimate-member' ); ?>" />
value="<?php echo esc_attr( $filter_from_url ) ?>" class="um-form-field"
aria-label="<?php esc_attr_e( stripslashes( $label ), 'ultimate-member' ); ?>" />
<?php
break;
}
@@ -1697,7 +1723,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
}
// Add OR instead AND to search in WP core fields user_email, user_login, user_display_name
$search_where = $context->get_search_sql( $search, $this->core_search_fields, 'both' );
$search_where = $context->get_search_sql( $search, $this->get_core_search_fields(), 'both' );
$search_where = preg_replace( '/ AND \((.*?)\)/im', "$1 OR", $search_where );
includes/core/class-password.php
+2 -2
View File
@@ -75,11 +75,11 @@ if ( ! class_exists( 'um\core\Password' ) ) {
$classes .= ' um-in-admin';
}
if ( UM()->fields()->editing == true ) {
if ( true === UM()->fields()->editing ) {
$classes .= ' um-editing';
}
if ( UM()->fields()->viewing == true ) {
if ( true === UM()->fields()->viewing ) {
$classes .= ' um-viewing';
}
includes/core/class-profile.php
+19 -6
View File
@@ -404,14 +404,13 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
return $this->active_subnav;
}
/**
* Show meta in profile
*
* @param array $array Meta Array
* @return string
*/
function show_meta( $array ) {
public function show_meta( $array, $args ) {
$output = '';
$fields_without_metakey = UM()->builtin()->get_fields_without_metakey();
@@ -427,16 +426,30 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
$data['in_profile_meta'] = true;
$value = um_filtered_value( $key, $data );
if ( 'description' === $key ) {
if ( UM()->options()->get( 'profile_show_html_bio' ) ) {
$res = make_clickable( wpautop( wp_kses_post( $value ) ) );
$description_key = UM()->profile()->get_show_bio_key( $args );
if ( $description_key === $key ) {
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
$bio_html = ! empty( $global_setting );
if ( ! empty( $args['custom_fields'][ $description_key ] ) ) {
if ( empty( $args['custom_fields'][ $description_key ]['html'] ) ) {
$bio_html = false;
}
}
if ( $bio_html ) {
$data['html'] = true;
$value = um_filtered_value( $key, $data );
$res = wp_kses_post( make_clickable( wpautop( $value ) ) );
} else {
$res = esc_html( $value );
}
$value = nl2br( $res );
}
if ( ! $value && ( ! array_key_exists( 'type', $data ) || ! in_array( $data['type'], $fields_without_metakey ) ) ) {
if ( ! $value && ( ! array_key_exists( 'type', $data ) || ! in_array( $data['type'], $fields_without_metakey, true ) ) ) {
continue;
}
includes/core/class-setup.php
+35 -14
View File
@@ -177,12 +177,12 @@ KEY meta_value_indx (um_value(191))
/**
* Install Pre-defined pages with shortcodes
*/
function install_default_pages() {
public function install_default_pages() {
if ( ! current_user_can( 'manage_options' ) ) {
return;
}
$core_forms = get_option( 'um_core_forms', array() );
$core_forms = get_option( 'um_core_forms', array() );
$core_directories = get_option( 'um_core_directories', array() );
$setup_shortcodes = array_merge( $core_forms, $core_directories );
@@ -198,28 +198,49 @@ KEY meta_value_indx (um_value(191))
}
//If page does not exist - create it
if ( $slug == 'logout' ) {
if ( 'logout' === $slug ) {
$content = '';
} elseif ( $slug == 'account' ) {
} elseif ( 'account' === $slug ) {
$content = '[ultimatemember_account]';
} elseif ( $slug == 'password-reset' ) {
} elseif ( 'password-reset' === $slug ) {
$content = '[ultimatemember_password]';
} elseif ( $slug == 'user' ) {
} elseif ( 'user' === $slug ) {
$content = '[ultimatemember form_id="' . $setup_shortcodes['profile'] . '"]';
} else {
$content = '[ultimatemember form_id="' . $setup_shortcodes[ $slug ] . '"]';
}
/**
* Filters Ultimate Member predefined pages content when set up the predefined page.
*
* @param {string} $content Predefined page content.
* @param {string} $slug Predefined page slug (key).
*
* @return {string} Predefined page content.
*
* @since 2.1.0
* @hook um_setup_predefined_page_content
*
* @example <caption>Set Ultimate Member predefined pages content with key = 'my_page_key'.</caption>
* function my_um_setup_predefined_page_content( $content, $slug ) {
* // your code here
* if ( 'my_page_key' === $slug ) {
* $content = __( 'My Page content', 'my-translate-key' );
* }
* return $pages;
* }
* add_filter( 'um_setup_predefined_page_content', 'my_um_setup_predefined_page_content' );
*/
$content = apply_filters( 'um_setup_predefined_page_content', $content, $slug );
$user_page = array(
'post_title' => $array['title'],
'post_content' => $content,
'post_name' => $slug,
'post_type' => 'page',
'post_status' => 'publish',
'post_author' => get_current_user_id(),
'comment_status' => 'closed'
'post_title' => $array['title'],
'post_content' => $content,
'post_name' => $slug,
'post_type' => 'page',
'post_status' => 'publish',
'post_author' => get_current_user_id(),
'comment_status' => 'closed',
);
$post_id = wp_insert_post( $user_page );
@@ -231,7 +252,7 @@ KEY meta_value_indx (um_value(191))
$options = get_option( 'um_options', array() );
foreach ( $core_pages as $slug => $page_id ) {
$key = UM()->options()->get_core_page_id( $slug );
$key = UM()->options()->get_core_page_id( $slug );
$options[ $key ] = $page_id;
}
includes/core/class-shortcodes.php
+2 -2
View File
@@ -355,11 +355,11 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
$classes .= ' um-err';
}
if (UM()->fields()->editing == true) {
if ( true === UM()->fields()->editing ) {
$classes .= ' um-editing';
}
if (UM()->fields()->viewing == true) {
if ( true === UM()->fields()->viewing ) {
$classes .= ' um-viewing';
}
includes/core/um-actions-form.php
+124 -16
View File
@@ -573,9 +573,14 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
}
if ( isset( $array['max_words'] ) && $array['max_words'] > 0 ) {
// count words without html tags
$without_tags = wp_strip_all_tags( $submitted_data[ $key ] );
if ( str_word_count( $without_tags, 0, 'éèàôù' ) > $array['max_words'] ) {
if ( ! empty( $array['html'] ) ) {
// Count words without html tags when HTML is enabled.
$text_value = wp_strip_all_tags( $submitted_data[ $key ] );
} else {
$text_value = $submitted_data[ $key ];
}
if ( str_word_count( $text_value, 0, '0123456789éèàôù' ) > $array['max_words'] ) {
// translators: %s: max words.
UM()->form()->add_error( $key, sprintf( __( 'You are only allowed to enter a maximum of %s words', 'ultimate-member' ), $array['max_words'] ) );
}
@@ -593,8 +598,15 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
}
}
if ( isset( $array['max_chars'] ) && $array['max_chars'] > 0 ) {
if ( $submitted_data[ $key ] && mb_strlen( $submitted_data[ $key ] ) > $array['max_chars'] ) {
if ( ! empty( $array['max_chars'] ) && UM()->profile()->get_show_bio_key( $submitted_data ) !== $key ) {
if ( ! empty( $array['html'] ) ) {
// Count words without html tags when HTML is enabled.
$text_value = wp_strip_all_tags( $submitted_data[ $key ] );
} else {
$text_value = $submitted_data[ $key ];
}
if ( ! empty( $text_value ) && mb_strlen( $text_value ) > $array['max_chars'] ) {
if ( empty( $array['label'] ) ) {
// translators: %s: max chars.
UM()->form()->add_error( $key, sprintf( __( 'This field must contain less than %s characters', 'ultimate-member' ), $array['max_chars'] ) );
@@ -605,9 +617,9 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
}
}
if ( isset( $array['type'] ) && $array['type'] == 'textarea' && UM()->profile()->get_show_bio_key( $submitted_data ) !== $key ) {
if ( ! isset( $array['html'] ) || $array['html'] == 0 ) {
if ( wp_strip_all_tags( $submitted_data[ $key ] ) != trim( $submitted_data[ $key ] ) ) {
if ( isset( $array['type'] ) && 'textarea' === $array['type'] && UM()->profile()->get_show_bio_key( $submitted_data ) !== $key ) {
if ( empty( $array['html'] ) ) {
if ( wp_strip_all_tags( $submitted_data[ $key ] ) !== trim( $submitted_data[ $key ] ) ) {
UM()->form()->add_error( $key, __( 'You can not use HTML tags here', 'ultimate-member' ) );
}
}
@@ -668,6 +680,66 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
}
}
$description_key = UM()->profile()->get_show_bio_key( $form_data );
if ( isset( $form_data['mode'] ) && 'profile' === $form_data['mode'] && $description_key === $key ) {
$show_bio = false;
$bio_html = false;
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
if ( ! empty( $form_data['use_custom_settings'] ) ) {
if ( ! empty( $form_data['show_bio'] ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
} else {
$global_show_bio = UM()->options()->get( 'profile_show_bio' );
if ( ! empty( $global_show_bio ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
}
if ( $show_bio ) {
$max_chars = UM()->options()->get( 'profile_bio_maxchars' );
}
$field_exists = false;
if ( ! empty( $form_data['custom_fields'] ) ) {
$custom_fields = maybe_unserialize( $form_data['custom_fields'] );
if ( array_key_exists( $description_key, $custom_fields ) ) {
$field_exists = true;
if ( ! empty( $array['max_chars'] ) ) {
$max_chars = $array['max_chars'];
}
if ( $show_bio ) {
if ( ! empty( $array['html'] ) && $bio_html ) {
$description_value = wp_strip_all_tags( $submitted_data[ $description_key ] );
} else {
$description_value = $submitted_data[ $description_key ];
}
} else {
if ( ! empty( $array['html'] ) ) {
$description_value = wp_strip_all_tags( $submitted_data[ $description_key ] );
} else {
$description_value = $submitted_data[ $description_key ];
}
}
}
}
if ( ! $field_exists && $show_bio ) {
if ( $bio_html ) {
$description_value = wp_strip_all_tags( $submitted_data[ $description_key ] );
} else {
$description_value = $submitted_data[ $description_key ];
}
}
if ( ! empty( $description_value ) && ! empty( $max_chars ) && mb_strlen( str_replace( array( "\r\n", "\n", "\r\t", "\t" ), ' ', $description_value ) ) > $max_chars ) {
// translators: %s: max chars.
UM()->form()->add_error( $description_key, sprintf( __( 'Your user description must contain less than %s characters', 'ultimate-member' ), $max_chars ) );
}
}
if ( empty( $array['validate'] ) ) {
continue;
}
@@ -932,19 +1004,55 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
break;
}
} // end if ( isset in args array )
if ( isset( $submitted_data['description'] ) ) {
$max_chars = UM()->options()->get( 'profile_bio_maxchars' );
$profile_show_bio = UM()->options()->get( 'profile_show_bio' );
// Description in header
if ( isset( $form_data['mode'] ) && 'profile' === $form_data['mode'] ) {
$description_key = UM()->profile()->get_show_bio_key( $form_data );
if ( ! UM()->form()->has_error( $description_key ) ) {
if ( ! empty( $submitted_data[ $description_key ] ) ) {
$field_exists = false;
if ( ! empty( $form_data['custom_fields'] ) ) {
$custom_fields = maybe_unserialize( $form_data['custom_fields'] );
if ( array_key_exists( $description_key, $custom_fields ) ) {
$field_exists = true;
}
}
if ( $profile_show_bio ) {
if ( mb_strlen( str_replace( array( "\r\n", "\n", "\r\t", "\t" ), ' ', $submitted_data['description'] ) ) > $max_chars && $max_chars ) {
// translators: %s: max chars.
UM()->form()->add_error( 'description', sprintf( __( 'Your user description must contain less than %s characters', 'ultimate-member' ), $max_chars ) );
if ( ! $field_exists ) {
$show_bio = false;
$bio_html = false;
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
if ( ! empty( $form_data['use_custom_settings'] ) ) {
if ( ! empty( $form_data['show_bio'] ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
} else {
$global_show_bio = UM()->options()->get( 'profile_show_bio' );
if ( ! empty( $global_show_bio ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
}
if ( $show_bio ) {
$max_chars = UM()->options()->get( 'profile_bio_maxchars' );
if ( $bio_html ) {
$description_value = wp_strip_all_tags( $submitted_data[ $description_key ] );
} else {
$description_value = $submitted_data[ $description_key ];
}
}
if ( ! empty( $description_value ) && ! empty( $max_chars ) && mb_strlen( str_replace( array( "\r\n", "\n", "\r\t", "\t" ), ' ', $description_value ) ) > $max_chars ) {
// translators: %s: max chars.
UM()->form()->add_error( $description_key, sprintf( __( 'Your user description must contain less than %s characters', 'ultimate-member' ), $max_chars ) );
}
}
}
}
} // end if ( isset in args array )
}
}
add_action( 'um_submit_form_errors_hook_', 'um_submit_form_errors_hook_', 10, 2 );
includes/core/um-actions-profile.php
+81 -40
View File
@@ -590,7 +590,7 @@ add_action( 'um_after_user_updated', 'um_restore_default_roles', 10, 3 );
* @param $args
*/
function um_editing_user_id_input( $args ) {
if ( UM()->fields()->editing == 1 && UM()->fields()->set_mode == 'profile' && UM()->user()->target_id ) { ?>
if ( true === UM()->fields()->editing && 'profile' === UM()->fields()->set_mode && UM()->user()->target_id ) { ?>
<input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr( UM()->user()->target_id ); ?>" />
<input type="hidden" name="profile_nonce" id="profile_nonce" value="<?php echo esc_attr( UM()->form()->nonce ); ?>" />
@@ -838,7 +838,7 @@ function um_profile_header_cover_area( $args ) {
* ?>
*/
do_action( 'um_cover_area_content', um_profile_id() );
if ( UM()->fields()->editing ) {
if ( true === UM()->fields()->editing ) {
$hide_remove = um_user( 'cover_photo' ) ? false : ' style="display:none;"';
@@ -1075,7 +1075,7 @@ function um_profile_header( $args ) {
UM()->profile()->new_ui( 'bc', 'div.um-profile-photo', 'click', $items );
} elseif ( UM()->fields()->editing == true ) {
} elseif ( true === UM()->fields()->editing ) {
$items = array(
'<a href="javascript:void(0);" class="um-manual-trigger" data-parent=".um-profile-photo" data-child=".um-btn-auto-width">' . __( 'Change photo', 'ultimate-member' ) . '</a>',
@@ -1217,49 +1217,90 @@ function um_profile_header( $args ) {
<?php if ( ! empty( $args['metafields'] ) ) { ?>
<div class="um-meta">
<?php echo UM()->profile()->show_meta( $args['metafields'] ); ?>
<?php echo UM()->profile()->show_meta( $args['metafields'], $args ); ?>
</div>
<?php }
<?php
}
$description_key = UM()->profile()->get_show_bio_key( $args );
$show_bio = false;
$bio_html = false;
$global_setting = UM()->options()->get( 'profile_show_html_bio' );
if ( ! empty( $args['use_custom_settings'] ) ) {
if ( ! empty( $args['show_bio'] ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
} else {
$global_show_bio = UM()->options()->get( 'profile_show_bio' );
if ( ! empty( $global_show_bio ) ) {
$show_bio = true;
$bio_html = ! empty( $global_setting );
}
}
if ( UM()->fields()->viewing == true && um_user( $description_key ) && $args['show_bio'] ) { ?>
if ( $show_bio ) {
$description_key = UM()->profile()->get_show_bio_key( $args );
<div class="um-meta-text">
<?php $description = get_user_meta( um_user( 'ID' ), $description_key, true );
if ( true === UM()->fields()->viewing && um_user( $description_key ) ) {
?>
<div class="um-meta-text">
<?php
$description = get_user_meta( um_user( 'ID' ), $description_key, true );
if ( UM()->options()->get( 'profile_show_html_bio' ) ) {
echo make_clickable( wpautop( wp_kses_post( $description ) ) );
if ( $bio_html ) {
echo wp_kses_post( nl2br( make_clickable( wpautop( $description ) ) ) );
} else {
echo nl2br( esc_html( $description ) );
}
?>
</div>
<?php
} elseif ( true === UM()->fields()->editing ) {
if ( ! empty( $args['custom_fields'][ $description_key ] ) ) {
if ( ! empty( $args['custom_fields'][ $description_key ]['html'] ) && $bio_html ) {
$description_value = UM()->fields()->field_value( $description_key );
} else {
$description_value = wp_strip_all_tags( UM()->fields()->field_value( $description_key ) );
}
} else {
echo esc_html( $description );
} ?>
</div>
if ( $bio_html ) {
$description_value = UM()->fields()->field_value( $description_key );
} else {
$description_value = wp_strip_all_tags( UM()->fields()->field_value( $description_key ) );
}
}
<?php } elseif ( UM()->fields()->editing == true && $args['show_bio'] ) { ?>
if ( ! empty( $args['custom_fields'][ $description_key ]['max_chars'] ) ) {
$limit = $args['custom_fields'][ $description_key ]['max_chars'];
} else {
$limit = UM()->options()->get( 'profile_bio_maxchars' );
}
?>
<div class="um-meta-text">
<textarea id="um-meta-bio"
data-character-limit="<?php echo esc_attr( UM()->options()->get( 'profile_bio_maxchars' ) ); ?>"
placeholder="<?php esc_attr_e( 'Tell us a bit about yourself...', 'ultimate-member' ); ?>"
name="<?php echo esc_attr( $description_key ); ?>"><?php echo UM()->fields()->field_value( $description_key ) ?></textarea>
<span class="um-meta-bio-character um-right"><span
class="um-bio-limit"><?php echo UM()->options()->get( 'profile_bio_maxchars' ); ?></span></span>
<?php if ( UM()->fields()->is_error( $description_key ) ) {
echo UM()->fields()->field_error( UM()->fields()->show_error( $description_key ), true );
} ?>
</div>
<?php } ?>
<div class="um-meta-text">
<textarea id="um-meta-bio" data-html="<?php echo esc_attr( $bio_html ); ?>"
data-character-limit="<?php echo esc_attr( $limit ); ?>"
placeholder="<?php esc_attr_e( 'Tell us a bit about yourself...', 'ultimate-member' ); ?>"
name="<?php echo esc_attr( $description_key ); ?>"><?php echo esc_textarea( $description_value ); ?></textarea>
<span class="um-meta-bio-character um-right">
<span class="um-bio-limit"><?php echo esc_html( $limit ); ?></span>
</span>
<?php
if ( UM()->fields()->is_error( $description_key ) ) {
echo UM()->fields()->field_error( UM()->fields()->show_error( $description_key ), true );
}
?>
</div>
<?php
}
}
?>
<div class="um-profile-status <?php echo esc_attr( um_user( 'account_status' ) ); ?>">
<span>
<?php
// translators: %s: profile status.
printf( __( 'This user account status is %s', 'ultimate-member' ), um_user( 'account_status_name' ) );
echo esc_html( sprintf( __( 'This user account status is %s', 'ultimate-member' ), um_user( 'account_status_name' ) ) );
?>
</span>
</div>
@@ -1285,8 +1326,8 @@ function um_profile_header( $args ) {
* }
* ?>
*/
do_action( 'um_after_header_meta', um_user( 'ID' ), $args ); ?>
do_action( 'um_after_header_meta', um_user( 'ID' ), $args );
?>
</div>
<div class="um-clear"></div>
@@ -1333,7 +1374,7 @@ function um_pre_profile_shortcode( $args ) {
return;
}
if ( UM()->fields()->editing ) {
if ( true === UM()->fields()->editing ) {
if ( um_get_requested_user() ) {
if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {
um_redirect_home( um_get_requested_user(), um_is_myprofile() );
@@ -1341,7 +1382,7 @@ function um_pre_profile_shortcode( $args ) {
um_fetch_user( um_get_requested_user() );
}
} else {
UM()->fields()->viewing = 1;
UM()->fields()->viewing = true;
if ( um_get_requested_user() ) {
if ( ! um_is_myprofile() && ! um_can_view_profile( um_get_requested_user() ) ) {
@@ -1379,7 +1420,7 @@ function um_add_edit_icon( $args ) {
// do not proceed if user cannot edit
if ( UM()->fields()->editing == true ) { ?>
if ( true === UM()->fields()->editing ) { ?>
<div class="um-profile-edit um-profile-headericon">
<a href="javascript:void(0);" class="um-profile-edit-a um-profile-save"><i class="um-faicon-check"></i></a>
@@ -1480,7 +1521,7 @@ add_action( 'um_pre_header_editprofile', 'um_add_edit_icon' );
* @param $args
*/
function um_add_profile_fields( $args ) {
if ( UM()->fields()->editing == true ) {
if ( true === UM()->fields()->editing ) {
echo UM()->fields()->display( 'profile', $args );
@@ -1548,7 +1589,7 @@ function um_add_submit_button_to_profile( $args ) {
}
// only when editing
if ( UM()->fields()->editing == false ) {
if ( false === UM()->fields()->editing ) {
return;
}
includes/core/um-actions-register.php
+8
View File
@@ -494,6 +494,14 @@ function um_submit_form_register( $args, $form_data ) {
$user_id = wp_insert_user( $userdata );
if ( is_wp_error( $user_id ) ) {
// Default WordPress validation if there aren't any Ultimate Member native for the registration fields.
if ( 'existing_user_login' === $user_id->get_error_code() ) {
UM()->form()->add_error( 'user_login', $user_id->get_error_message() );
} elseif ( 'existing_user_email' === $user_id->get_error_code() ) {
UM()->form()->add_error( 'user_email', $user_id->get_error_message() );
} else {
UM()->form()->add_error( 'user_login', $user_id->get_error_message() );
}
return;
}
includes/core/um-filters-fields.php
+6 -4
View File
@@ -248,16 +248,18 @@ function um_profile_field_filter_hook__textarea( $value, $data ) {
if ( ! $value ) {
return '';
}
if ( isset( $data['html'] ) && $data['html'] == 1 ) {
if ( ! empty( $data['html'] ) ) {
return $value;
}
$description_key = UM()->profile()->get_show_bio_key( UM()->fields()->global_args );
$value = wp_kses( $value, 'strip' );
$value = html_entity_decode( $value );
$value = preg_replace('$(https?://[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', ' <a href="$1" target="_blank">$1</a> ', $value." ");
$value = preg_replace('$(www\.[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', '<a target="_blank" href="http://$1">$1</a> ', $value." ");
$value = preg_replace( '$(https?://[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', ' <a href="$1" target="_blank">$1</a> ', $value . ' ' );
$value = preg_replace( '$(www\.[a-z0-9_./?=&#-]+)(?![^<>]*>)$i', '<a target="_blank" href="http://$1">$1</a> ', $value . ' ' );
if ( ! ( isset( $data['metakey'] ) && 'description' === $data['metakey'] ) ) {
if ( ! ( isset( $data['metakey'] ) && $description_key === $data['metakey'] ) ) {
$value = wpautop( $value );
}
includes/um-short-functions.php
+48 -44
View File
@@ -709,7 +709,7 @@ function um_user_submitted_registration_formatted( $style = false ) {
UM()->fields()->get_fields = $fields;
foreach ( $fields as $key => $array ) {
if ( isset( $array['type'] ) && $array['type'] == 'row' ) {
if ( isset( $array['type'] ) && 'row' === $array['type'] ) {
$rows[ $key ] = $array;
unset( UM()->fields()->get_fields[ $key ] ); // not needed now
}
@@ -747,7 +747,6 @@ function um_user_submitted_registration_formatted( $style = false ) {
$cols_num = $col_split[ $c ];
// sub row fields
$subrow_fields = null;
$subrow_fields = UM()->fields()->get_fields_in_subrow( $row_fields, $c );
if ( is_array( $subrow_fields ) ) {
@@ -766,7 +765,6 @@ function um_user_submitted_registration_formatted( $style = false ) {
$output .= um_user_submited_display( $key, $data['title'] );
}
}
} elseif ( $cols_num == 2 ) {
$col1_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 1 );
@@ -782,7 +780,6 @@ function um_user_submitted_registration_formatted( $style = false ) {
$output .= um_user_submited_display( $key, $data['title'] );
}
}
} else {
$col1_fields = UM()->fields()->get_fields_in_column( $subrow_fields, 1 );
@@ -805,29 +802,19 @@ function um_user_submitted_registration_formatted( $style = false ) {
$output .= um_user_submited_display( $key, $data['title'] );
}
}
}
}
}
}
} // endfor
}
}
if ( $style ) {
$output .= '</div>';
}
return $output;
}
/**
@@ -882,7 +869,7 @@ function um_user_submited_display( $k, $title, $data = array(), $style = true )
}
if ( ! empty( $filedata['original_name'] ) ) {
$v = '<a href="' . esc_attr( $baseurl . um_user( 'ID' ) . '/' . $file ) . '">' . esc_html( $filedata['original_name'] ) . '</a>';
$v = '<a class="um-preview-upload" target="_blank" href="' . esc_attr( $baseurl . um_user( 'ID' ) . '/' . $file ) . '">' . esc_html( $filedata['original_name'] ) . '</a>';
} else {
$v = $baseurl . um_user( 'ID' ) . '/' . $file;
}
@@ -1592,50 +1579,67 @@ function um_can_view_field( $data ) {
return apply_filters( 'um_can_view_field', $can_view, $data );
}
/**
* Checks if user can view profile
*
* @param $user_id
* @param int $user_id
*
* @return bool
*/
function um_can_view_profile( $user_id ) {
$can_view = true;
$user_id = absint( $user_id );
if ( ! is_user_logged_in() ) {
return ! UM()->user()->is_private_profile( $user_id );
}
$can_view = ! UM()->user()->is_private_profile( $user_id );
} else {
$temp_id = um_user( 'ID' );
um_fetch_user( get_current_user_id() );
$temp_id = um_user('ID');
um_fetch_user( get_current_user_id() );
if ( get_current_user_id() !== $user_id ) {
if ( ! um_user( 'can_view_all' ) ) {
um_fetch_user( $temp_id );
$can_view = false;
} elseif ( ! um_user( 'can_access_private_profile' ) && UM()->user()->is_private_profile( $user_id ) ) {
um_fetch_user( $temp_id );
$can_view = false;
} elseif ( um_user( 'can_view_roles' ) ) {
$can_view_roles = um_user( 'can_view_roles' );
if ( ! um_user( 'can_view_all' ) && $user_id != get_current_user_id() && is_user_logged_in() ) {
um_fetch_user( $temp_id );
return false;
}
if ( ! is_array( $can_view_roles ) ) {
$can_view_roles = array();
}
if ( ! um_user( 'can_access_private_profile' ) && UM()->user()->is_private_profile( $user_id ) ) {
um_fetch_user( $temp_id );
return false;
}
if ( um_user( 'can_view_roles' ) && $user_id != get_current_user_id() ) {
$can_view_roles = um_user( 'can_view_roles' );
if ( ! is_array( $can_view_roles ) ) {
$can_view_roles = array();
if ( count( $can_view_roles ) && count( array_intersect( UM()->roles()->get_all_user_roles( $user_id ), $can_view_roles ) ) <= 0 ) {
um_fetch_user( $temp_id );
$can_view = false;
}
}
}
if ( count( $can_view_roles ) && count( array_intersect( UM()->roles()->get_all_user_roles( $user_id ), $can_view_roles ) ) <= 0 ) {
um_fetch_user( $temp_id );
return false;
}
um_fetch_user( $temp_id );
}
um_fetch_user( $temp_id );
return true;
/**
* Filters the marker for user capabilities to view other profile
*
* @param {bool} $can_view Can view profile marker.
* @param {int} $user_id User ID requested from profile page.
*
* @return {bool} Can view profile marker.
*
* @since 2.6.10
* @hook um_can_view_profile
*
* @example <caption>Set that only user with ID=5 can be viewed on Profile page.</caption>
* function my_um_can_view_profile( $can_view, $user_id ) {
* $can_view = 5 === $user_id;
* return $can_view;
* }
* add_filter( 'um_can_view_profile', 'my_um_can_view_profile', 10, 2 );
*/
return apply_filters( 'um_can_view_profile', $can_view, $user_id );
}
/**
* boolean check for not same user
*
@@ -1658,12 +1662,12 @@ function um_is_user_himself() {
function um_can_edit_field( $data ) {
$can_edit = true;
if ( ! empty( UM()->fields()->editing ) && isset( UM()->fields()->set_mode ) && UM()->fields()->set_mode == 'profile' ) {
if ( true === UM()->fields()->editing && isset( UM()->fields()->set_mode ) && UM()->fields()->set_mode == 'profile' ) {
if ( ! is_user_logged_in() ) {
$can_edit = false;
} else {
if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) ) {
if ( isset( $data['editable'] ) && $data['editable'] == 0 ) {
if ( empty( $data['editable'] ) ) {
$can_edit = false;
} else {
if ( ! um_is_user_himself() ) {
readme.txt
+24 -2
View File
@@ -6,8 +6,8 @@ Donate link:
Tags: community, member, membership, user-profile, user-registration
Requires PHP: 5.6
Requires at least: 5.5
Tested up to: 6.2
Stable tag: 2.6.9
Tested up to: 6.3
Stable tag: 2.6.10
License: GNU Version 2 or Any Later Version
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
@@ -166,6 +166,28 @@ No specific extensions are needed. But we highly recommended keep active these P
IMPORTANT: PLEASE UPDATE THE PLUGIN TO AT LEAST VERSION 2.6.7 IMMEDIATELY. VERSION 2.6.7 PATCHES SECURITY PRIVILEGE ESCALATION VULNERABILITY. PLEASE SEE [THIS ARTICLE](https://docs.ultimatemember.com/article/1866-security-incident-update-and-recommended-actions) FOR MORE INFORMATION
= 2.6.10: August 17, 2023 =
* Enhancements:
- Added: 'um_can_view_profile' hook to operate with profile privacy
- Added: 'um_member_directory_core_search_fields' hook to operate with core searching fields in member directory search
- Tweak: Standardize the condition for checking not editable fields to `empty( $data['editable'] )`
- Tweak: Unified `UM()->fields()->editing` and `UM()->fields()->viewing` to bool variables use true|false in conditions to make `===` or `!==` comparing
- Updated: [Hooks Documentation v2](https://ultimatemember.github.io/ultimatemember/hooks/)
* Bugfixes:
- Fixed: Restriction settings handler when there isn't a WP_Post in query. PHP notices in some cases when WP query is not canonical
- Fixed: User description (Biography) field conflict with validation (max chars) in both cases when HTML can be used or not. Case when there are 2 biography fields are displayed on the profile (header + form field)
- Fixed: Displaying WordPress native registration errors when unique username|email validation is disabled
- Fixed: Make links clickable in the Registration Details
- Fixed: WP_Users_Query on wp-admin > Users screen
- Fixed: Performance for `um_get_form_fields` hook
- Fixed: Admin Modal JS library conflict with bootstrap.js
* Cached and optimized/minified assets(JS/CSS) must be flushed/re-generated after upgrade
= 2.6.9: July 26, 2023 =
* Enhancements:
ultimate-member.php
+1 -1
View File
@@ -3,7 +3,7 @@
* Plugin Name: Ultimate Member
* Plugin URI: http://ultimatemember.com/
* Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
* Version: 2.6.9
* Version: 2.6.10
* Author: Ultimate Member
* Author URI: http://ultimatemember.com/
* Text Domain: ultimate-member