mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-07-19 06:33:50 +09:00
- fixed unique address of the user's link
This commit is contained in:
Denis Baranov
@@ -157,7 +157,7 @@ if ( ! class_exists( 'User' ) ) {
|
||||
);
|
||||
$args = apply_filters( 'um_admin_pending_queue_filter', $args );
|
||||
$users = new \WP_User_Query( $args );
|
||||
|
||||
|
||||
delete_option( 'um_cached_users_queue' );
|
||||
add_option( 'um_cached_users_queue', $users->get_total(), '', 'no' );
|
||||
|
||||
@@ -166,112 +166,103 @@ if ( ! class_exists( 'User' ) ) {
|
||||
|
||||
|
||||
function get_profile_url( $user_id, $update_slug = false ) {
|
||||
// Permalink base
|
||||
$permalink_base = UM()->options()->get( 'permalink_base' );
|
||||
|
||||
// Permalink base
|
||||
$permalink_base = UM()->options()->get( 'permalink_base' );
|
||||
// Get user slug
|
||||
$profile_slug = get_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", true );
|
||||
$generate_slug = UM()->options()->get( 'um_generate_slug_in_directory' );
|
||||
|
||||
// Get user slug
|
||||
$profile_slug = get_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", true );
|
||||
$generate_slug = UM()->options()->get( 'um_generate_slug_in_directory' );
|
||||
|
||||
// Return existing profile slug
|
||||
if ( $generate_slug && $update_slug == false && $profile_slug )
|
||||
return UM()->permalinks()->profile_permalink( $profile_slug );
|
||||
// Return existing profile slug
|
||||
if ( $generate_slug && $update_slug == false && $profile_slug ) {
|
||||
return UM()->permalinks()->profile_permalink( $profile_slug );
|
||||
}
|
||||
|
||||
|
||||
// Reset cache
|
||||
if ( $update_slug == true ) {
|
||||
delete_option( "um_cache_userdata_{$user_id}" );
|
||||
um_fetch_user( $user_id );
|
||||
}
|
||||
// Reset cache
|
||||
if ( $update_slug == true ) {
|
||||
delete_option( "um_cache_userdata_{$user_id}" );
|
||||
um_fetch_user( $user_id );
|
||||
}
|
||||
|
||||
$userdata = get_userdata( $user_id );
|
||||
$userdata = get_userdata( $user_id );
|
||||
|
||||
if ( empty( $userdata ) )
|
||||
return UM()->permalinks()->profile_permalink( $profile_slug );
|
||||
if ( empty( $userdata ) ) {
|
||||
return UM()->permalinks()->profile_permalink( $profile_slug );
|
||||
}
|
||||
|
||||
$user_in_url = '';
|
||||
// Username
|
||||
if ( $permalink_base == 'user_login' ) {
|
||||
$user_in_url = $userdata->user_login;
|
||||
$user_in_url = '';
|
||||
// Username
|
||||
if ( $permalink_base == 'user_login' ) {
|
||||
$user_in_url = $userdata->user_login;
|
||||
|
||||
if ( is_email( $user_in_url ) ) {
|
||||
$user_email = $user_in_url;
|
||||
$user_in_url = str_replace('@','',$user_in_url);
|
||||
if ( is_email( $user_in_url ) ) {
|
||||
$user_email = $user_in_url;
|
||||
$user_in_url = str_replace( '@', '', $user_in_url );
|
||||
|
||||
if( ( $pos = strrpos( $user_in_url , '.' ) ) !== false ) {
|
||||
$search_length = strlen( '.' );
|
||||
$user_in_url = substr_replace( $user_in_url , '-' , $pos , $search_length );
|
||||
}
|
||||
update_user_meta( $user_id , "um_email_as_username_{$user_in_url}" , $user_email );
|
||||
if ( ( $pos = strrpos( $user_in_url, '.' ) ) !== false ) {
|
||||
$search_length = strlen( '.' );
|
||||
$user_in_url = substr_replace( $user_in_url, '-', $pos, $search_length );
|
||||
}
|
||||
update_user_meta( $user_id, "um_email_as_username_{$user_in_url}", $user_email );
|
||||
|
||||
} else {
|
||||
} else {
|
||||
|
||||
$user_in_url = sanitize_title( $user_in_url );
|
||||
$user_in_url = sanitize_title( $user_in_url );
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// User ID
|
||||
if ( $permalink_base == 'user_id' )
|
||||
$user_in_url = $user_id;
|
||||
// User ID
|
||||
if ( $permalink_base == 'user_id' ) {
|
||||
$user_in_url = $user_id;
|
||||
}
|
||||
|
||||
// Fisrt and Last name
|
||||
$full_name_permalinks = array( 'name', 'name_dash', 'name_plus' );
|
||||
if ( in_array( $permalink_base, $full_name_permalinks ) ) {
|
||||
// Fisrt and Last name
|
||||
$full_name_permalinks = array( 'name', 'name_dash', 'name_plus' );
|
||||
if ( in_array( $permalink_base, $full_name_permalinks ) ) {
|
||||
$separated = array('name' => '.','name_dash' =>'-','name_plus'=>'+');
|
||||
$separate = $separated[$permalink_base];
|
||||
$first_name = $userdata->first_name;
|
||||
$last_name = $userdata->last_name;
|
||||
$full_name = sprintf('%s %s',$first_name,$last_name);
|
||||
|
||||
$first_name = $userdata->first_name;
|
||||
$last_name = $userdata->last_name;
|
||||
$full_name = $userdata->display_name;
|
||||
$full_name = preg_replace( '/\s+/', ' ', $full_name ); // Remove double spaces
|
||||
|
||||
$full_name = preg_replace( '/\s+/', ' ', $full_name ); // Remove double spaces
|
||||
$profile_slug = UM()->permalinks()->profile_slug( $full_name, $first_name, $last_name );
|
||||
|
||||
$profile_slug = UM()->permalinks()->profile_slug( $full_name, $first_name, $last_name );
|
||||
$current_slug = get_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", true );
|
||||
if ( $current_slug ) {
|
||||
$username = $current_slug;
|
||||
} else {
|
||||
|
||||
$duplicate_slug_hash = md5( $profile_slug );
|
||||
$append = 0;
|
||||
$username = $full_name;
|
||||
$_username = $full_name;
|
||||
|
||||
$args = array(
|
||||
'meta_query' => array(
|
||||
'relation' => 'AND',
|
||||
array(
|
||||
'key' => "um_user_profile_url_slug_{$permalink_base}",
|
||||
'value' => $profile_slug,
|
||||
'compare' => '='
|
||||
),
|
||||
),
|
||||
'orderby' => 'registered',
|
||||
'order' => 'ASC',
|
||||
'fields' => array('user_registered','ID'),
|
||||
);
|
||||
while ( 1 ) {
|
||||
|
||||
$user_query = new \WP_User_Query( $args );
|
||||
$username = $_username .(empty($append)?'':" $append" );
|
||||
if(!UM()->permalinks()->exist_url_slug_permalink_base( $permalink_base, $profile_slug . (empty($append)?'':"{$separate}{$append}" ) )){
|
||||
break;
|
||||
}
|
||||
$append++;
|
||||
|
||||
if ( $user_query->get_total() > 1 ) {
|
||||
}
|
||||
}
|
||||
$user_in_url = UM()->permalinks()->profile_slug( $username, $first_name, $last_name );
|
||||
}
|
||||
|
||||
$duplicate_names = $user_query->get_results();
|
||||
update_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", $user_in_url );
|
||||
|
||||
$current = end( $duplicate_names );
|
||||
if ( empty ( $user_in_url ) ) {
|
||||
$user_in_url = $user_id;
|
||||
}
|
||||
|
||||
update_option( "um_duplicate_name_{$duplicate_slug_hash}", $current->ID );
|
||||
return UM()->permalinks()->profile_permalink( $user_in_url );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$duplicate_id = get_option( "um_duplicate_name_{$duplicate_slug_hash}" );
|
||||
|
||||
if ( ! empty( $duplicate_id ) && $duplicate_id != $user_id )
|
||||
$full_name = trim( $full_name . ' ' . $user_id );
|
||||
|
||||
$user_in_url = UM()->permalinks()->profile_slug( $full_name, $first_name, $last_name );
|
||||
}
|
||||
|
||||
update_user_meta( $user_id, "um_user_profile_url_slug_{$permalink_base}", $user_in_url );
|
||||
|
||||
if ( empty ( $user_in_url )) {
|
||||
$user_in_url = $user_id;
|
||||
}
|
||||
|
||||
return UM()->permalinks()->profile_permalink( $user_in_url );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@@ -305,26 +296,37 @@ if ( ! class_exists( 'User' ) ) {
|
||||
* @param int $user_id
|
||||
* @param \WP_User $old_data
|
||||
*/
|
||||
function profile_update( $user_id, $old_data ) {
|
||||
// Bail if no user ID was passed
|
||||
if ( empty( $user_id ) )
|
||||
return;
|
||||
function profile_update( $user_id, $old_data ) {
|
||||
// Bail if no user ID was passed
|
||||
if ( empty( $user_id ) ) {
|
||||
return;
|
||||
}
|
||||
|
||||
$old_roles = $old_data->roles;
|
||||
$userdata = get_userdata( $user_id );
|
||||
$new_roles = $userdata->roles;
|
||||
$old_roles = $old_data->roles;
|
||||
$userdata = get_userdata( $user_id );
|
||||
$new_roles = $userdata->roles;
|
||||
|
||||
if ( ! empty( $_POST['um-role'] ) ) {
|
||||
$new_roles = array_merge( $new_roles, array( $_POST['um-role'] ) );
|
||||
if ( ! user_can( $user_id, $_POST['um-role'] ) ) {
|
||||
UM()->roles()->set_role( $user_id, $_POST['um-role'] );
|
||||
}
|
||||
}
|
||||
if ( ! empty( $_POST['um-role'] ) ) {
|
||||
$new_roles = array_merge( $new_roles, array( $_POST['um-role'] ) );
|
||||
if ( ! user_can( $user_id, $_POST['um-role'] ) ) {
|
||||
UM()->roles()->set_role( $user_id, $_POST['um-role'] );
|
||||
}
|
||||
}
|
||||
|
||||
do_action( 'um_after_member_role_upgrade', $new_roles, $old_roles );
|
||||
do_action( 'um_after_member_role_upgrade', $new_roles, $old_roles );
|
||||
|
||||
$this->remove_cache( $user_id );
|
||||
}
|
||||
//Update permalink
|
||||
$changes = apply_filters( 'um_user_edit_after_updating_profile_array', $_POST );
|
||||
if ( isset( $changes['need_change_permalink'] ) && $changes['need_change_permalink'] == true ) {
|
||||
|
||||
$pre_user_id = um_user( 'ID' );
|
||||
um_fetch_user( $user_id );
|
||||
UM()->permalinks()->profile_url( $changes );
|
||||
um_fetch_user( $pre_user_id );
|
||||
}
|
||||
|
||||
$this->remove_cache( $user_id );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user