>
+
- id = $user_id;
+ $this->id = $user_id;
$this->usermeta = get_user_meta( $user_id );
- $this->data = get_userdata( $this->id );
+ $this->data = get_userdata( $this->id );
} elseif ( is_user_logged_in() && $clean == false ) {
- $this->id = get_current_user_id();
- $this->usermeta = get_user_meta($this->id);
- $this->data = get_userdata($this->id);
+ $this->id = get_current_user_id();
+ $this->usermeta = get_user_meta( $this->id );
+ $this->data = get_userdata( $this->id );
} else {
- $this->id = 0;
+ $this->id = 0;
$this->usermeta = null;
- $this->data = null;
+ $this->data = null;
}
@@ -1203,54 +1247,54 @@ if ( ! class_exists( 'um\core\User' ) ) {
// add user data
$this->data = $this->toArray( $this->data );
- foreach ( $this->data as $k=>$v ) {
- if ( $k == 'roles') {
- $this->profile['wp_roles'] = implode(',',$v);
- } else if ( is_array( $v ) ) {
- foreach($v as $k2 => $v2){
- $this->profile[$k2] = $v2;
+ foreach ( $this->data as $k => $v ) {
+ if ( $k == 'roles' ) {
+ $this->profile['wp_roles'] = implode( ',', $v );
+ } elseif ( is_array( $v ) ) {
+ foreach ( $v as $k2 => $v2 ) {
+ $this->profile[ $k2 ] = $v2;
}
} else {
- $this->profile[$k] = $v;
+ $this->profile[ $k ] = $v;
}
}
// add account status
- if ( !isset( $this->usermeta['account_status'][0] ) ) {
+ if ( ! isset( $this->usermeta['account_status'][0] ) ) {
$this->usermeta['account_status'][0] = 'approved';
}
if ( $this->usermeta['account_status'][0] == 'approved' ) {
- $this->usermeta['account_status_name'][0] = __('Approved','ultimate-member');
+ $this->usermeta['account_status_name'][0] = __( 'Approved', 'ultimate-member' );
}
if ( $this->usermeta['account_status'][0] == 'awaiting_email_confirmation' ) {
- $this->usermeta['account_status_name'][0] = __('Awaiting E-mail Confirmation','ultimate-member');
+ $this->usermeta['account_status_name'][0] = __( 'Awaiting E-mail Confirmation', 'ultimate-member' );
}
if ( $this->usermeta['account_status'][0] == 'awaiting_admin_review' ) {
- $this->usermeta['account_status_name'][0] = __('Pending Review','ultimate-member');
+ $this->usermeta['account_status_name'][0] = __( 'Pending Review', 'ultimate-member' );
}
if ( $this->usermeta['account_status'][0] == 'rejected' ) {
- $this->usermeta['account_status_name'][0] = __('Membership Rejected','ultimate-member');
+ $this->usermeta['account_status_name'][0] = __( 'Membership Rejected', 'ultimate-member' );
}
if ( $this->usermeta['account_status'][0] == 'inactive' ) {
- $this->usermeta['account_status_name'][0] = __('Membership Inactive','ultimate-member');
+ $this->usermeta['account_status_name'][0] = __( 'Membership Inactive', 'ultimate-member' );
}
// add user meta
foreach ( $this->usermeta as $k => $v ) {
- if ( $k == 'display_name') {
+ if ( $k == 'display_name' ) {
continue;
}
$this->profile[ $k ] = $v[0];
}
// add permissions
- $user_role = UM()->roles()->get_priority_user_role( $this->id );
- $this->profile['role'] = $user_role;
+ $user_role = UM()->roles()->get_priority_user_role( $this->id );
+ $this->profile['role'] = $user_role;
$this->profile['roles'] = UM()->roles()->get_all_user_roles( $this->id );
$role_meta = UM()->roles()->role_data( $user_role );
@@ -1285,7 +1329,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
return array( $key => $item );
}, array_keys( $role_meta ), $role_meta );*/
- $this->profile = array_merge( $this->profile, (array)$role_meta );
+ $this->profile = array_merge( $this->profile, (array) $role_meta );
$this->profile['super_admin'] = ( is_super_admin( $this->id ) ) ? 1 : 0;
@@ -1296,7 +1340,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
$this->setup_cache( $this->id, $this->profile );
}
-
}
}
@@ -1307,8 +1350,8 @@ if ( ! class_exists( 'um\core\User' ) ) {
*
* @param bool $clean
*/
- function reset( $clean = false ){
- $this->set(0, $clean);
+ function reset( $clean = false ) {
+ $this->set( 0, $clean );
}
/**
@@ -1645,7 +1688,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
*
*/
function approve( $repeat = true ) {
- $user_id = um_user('ID');
+ $user_id = um_user( 'ID' );
if ( ! $repeat ) {
$status = get_user_meta( $user_id, 'account_status', true );
@@ -1828,7 +1871,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
if ( is_multisite() ) {
if ( ! function_exists( 'wpmu_delete_user' ) ) {
- require_once( ABSPATH . 'wp-admin/includes/ms.php' );
+ require_once ABSPATH . 'wp-admin/includes/ms.php';
}
wpmu_delete_user( $this->id );
@@ -1836,7 +1879,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
} else {
if ( ! function_exists( 'wp_delete_user' ) ) {
- require_once( ABSPATH . 'wp-admin/includes/user.php' );
+ require_once ABSPATH . 'wp-admin/includes/user.php';
}
wp_delete_user( $this->id );
@@ -1951,10 +1994,15 @@ if ( ! class_exists( 'um\core\User' ) ) {
}
foreach ( $actions as $id => $arr ) {
- $url = add_query_arg( array( 'um_action' => $id, 'uid' => um_profile_id() ) );
+ $url = add_query_arg(
+ array(
+ 'um_action' => $id,
+ 'uid' => um_profile_id(),
+ )
+ );
/*$url = add_query_arg( 'um_action', $id );
$url = add_query_arg( 'uid', um_profile_id(), $url );*/
- $items[] = '
' . esc_html( $arr['label'] ) . '';
+ $items[] = '
' . esc_html( $arr['label'] ) . '';
}
return $items;
}
@@ -2202,19 +2250,25 @@ if ( ! class_exists( 'um\core\User' ) ) {
$value = UM()->validation()->safe_name_in_url( $value );
- $ids = get_users( array( 'fields' => 'ID', 'meta_key' => $key, 'meta_value' => $value, 'meta_compare' => '=' ) );
+ $ids = get_users(
+ array(
+ 'fields' => 'ID',
+ 'meta_key' => $key,
+ 'meta_value' => $value,
+ 'meta_compare' => '=',
+ )
+ );
if ( ! isset( $ids ) || empty( $ids ) ) {
return false;
}
foreach ( $ids as $k => $id ) {
- if ( $id == um_user('ID') ) {
+ if ( $id == um_user( 'ID' ) ) {
unset( $ids[ $k ] );
} else {
$duplicates[] = $id;
}
-
}
if ( ! empty( $duplicates ) ) {
@@ -2231,29 +2285,28 @@ if ( ! class_exists( 'um\core\User' ) ) {
*
* @return bool
*/
- function user_exists_by_name( $value ) {
+ public function user_exists_by_name( $value ) {
// Permalink base
$permalink_base = UM()->options()->get( 'permalink_base' );
$raw_value = $value;
- $value = UM()->validation()->safe_name_in_url( $value );
- $value = um_clean_user_basename( $value );
+ $value = UM()->validation()->safe_name_in_url( $value );
+ $value = um_clean_user_basename( $value );
// Search by Profile Slug
$args = array(
- 'fields' => array( 'ID' ),
+ 'fields' => array( 'ID' ),
'meta_query' => array(
'relation' => 'OR',
array(
- 'key' => 'um_user_profile_url_slug_' . $permalink_base,
- 'value' => strtolower( $raw_value ),
- 'compare' => '=',
+ 'key' => 'um_user_profile_url_slug_' . $permalink_base,
+ 'value' => strtolower( $raw_value ),
+ 'compare' => '=',
),
),
);
-
$ids = new \WP_User_Query( $args );
if ( $ids->total_users > 0 ) {
@@ -2263,9 +2316,9 @@ if ( ! class_exists( 'um\core\User' ) ) {
// Search by Display Name or ID
$args = array(
- 'fields' => array( 'ID' ),
- 'search' => $value,
- 'search_columns' => array( 'display_name', 'ID' ),
+ 'fields' => array( 'ID' ),
+ 'search' => $value,
+ 'search_columns' => array( 'display_name', 'ID' ),
);
$ids = new \WP_User_Query( $args );
@@ -2275,17 +2328,15 @@ if ( ! class_exists( 'um\core\User' ) ) {
return $um_user_query->ID;
}
-
// Search By User Login
- $value = str_replace( ".", "_", $value );
- $value = str_replace( " ", "", $value );
+ $value = str_replace( array( '.', ' ' ), array( '_', '' ), $value );
$args = array(
- 'fields' => array( 'ID' ),
- 'search' => $value,
- 'search_columns' => array(
+ 'fields' => array( 'ID' ),
+ 'search' => $value,
+ 'search_columns' => array(
'user_login',
- )
+ ),
);
$ids = new \WP_User_Query( $args );
@@ -2321,7 +2372,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
*
*/
- function user_exists_by_id( $user_id ) {
+ public function user_exists_by_id( $user_id ) {
$aux = get_userdata( absint( $user_id ) );
if ( $aux == false ) {
return false;
@@ -2330,6 +2381,84 @@ if ( ! class_exists( 'um\core\User' ) ) {
}
}
+ /**
+ * @param string $hash
+ *
+ * @return bool|int
+ */
+ public function user_exists_by_hash( $hash ) {
+ // Permalink base
+ $permalink_base = UM()->options()->get( 'permalink_base' );
+ $raw_value = $hash;
+
+ // Search by Profile Slug
+ $args = array(
+ 'fields' => array( 'ID' ),
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => 'um_user_profile_url_slug_' . $permalink_base,
+ 'value' => strtolower( $raw_value ),
+ 'compare' => '=',
+ ),
+ ),
+ );
+
+ $ids = new \WP_User_Query( $args );
+
+ if ( $ids->total_users > 0 ) {
+ $um_user_query = current( $ids->get_results() );
+ return $um_user_query->ID;
+ }
+
+ return false;
+ }
+
+ /**
+ * @param string $slug
+ *
+ * @return bool|int
+ */
+ public function user_exists_by_custom_meta( $slug ) {
+ $permalink_base = UM()->options()->get( 'permalink_base' );
+ $custom_meta = UM()->options()->get( 'permalink_base_custom_meta' );
+ if ( empty( $custom_meta ) ) {
+ // Set default permalink base if custom meta is empty.
+ $permalink_base = 'user_login';
+ $meta_key = 'um_user_profile_url_slug_' . $permalink_base;
+ } else {
+ $meta_key = $custom_meta;
+ }
+
+ $raw_value = $slug;
+
+ // Search by Profile Slug
+ $args = array(
+ 'fields' => array( 'ID' ),
+ 'meta_query' => array(
+ 'relation' => 'OR',
+ array(
+ 'key' => $meta_key,
+ 'value' => strtolower( $raw_value ),
+ 'compare' => '=',
+ ),
+ array(
+ 'key' => 'um_user_profile_url_slug_' . $permalink_base,
+ 'value' => strtolower( $raw_value ),
+ 'compare' => '=',
+ ),
+ ),
+ );
+
+ $ids = new \WP_User_Query( $args );
+
+ if ( $ids->total_users > 0 ) {
+ $um_user_query = current( $ids->get_results() );
+ return $um_user_query->ID;
+ }
+
+ return false;
+ }
/**
* This method checks if a user exists or not in your site based on the user email as username
@@ -2355,7 +2484,12 @@ if ( ! class_exists( 'um\core\User' ) ) {
$user_id = false;
- $ids = get_users( array( 'fields' => 'ID', 'meta_key' => 'um_email_as_username_' . $slug ) );
+ $ids = get_users(
+ array(
+ 'fields' => 'ID',
+ 'meta_key' => 'um_email_as_username_' . $slug,
+ )
+ );
if ( ! empty( $ids[0] ) ) {
$user_id = $ids[0];
}
@@ -2373,11 +2507,11 @@ if ( ! class_exists( 'um\core\User' ) ) {
function set_gravatar( $user_id ) {
um_fetch_user( $user_id );
- $email_address = um_user( 'user_email' );
+ $email_address = um_user( 'user_email' );
$hash_email_address = '';
if ( $email_address ) {
- $hash_email_address = md5( $email_address );
+ $hash_email_address = md5( $email_address );
$this->profile['synced_gravatar_hashed_id'] = $hash_email_address;
$this->update_usermeta_info( 'synced_gravatar_hashed_id' );
}
diff --git a/includes/core/um-filters-user.php b/includes/core/um-filters-user.php
index 6d8bfe8a..455651ca 100644
--- a/includes/core/um-filters-user.php
+++ b/includes/core/um-filters-user.php
@@ -1,47 +1,49 @@
-roles()->get_priority_user_role( get_current_user_id() ) );
- $can_edit_users = current_user_can( 'edit_users' ) && $role->has_cap( 'edit_users' );
+ $can_edit_users = null !== $role && current_user_can( 'edit_users' ) && $role->has_cap( 'edit_users' );
if ( $can_edit_users ) {
+ $account_status = um_user( 'account_status' );
- if ( um_user( 'account_status' ) == 'awaiting_admin_review' ) {
+ if ( 'awaiting_admin_review' === $account_status ) {
$actions['um_approve_membership'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) );
- $actions['um_reject_membership'] = array( 'label' => __( 'Reject Membership', 'ultimate-member' ) );
+ $actions['um_reject_membership'] = array( 'label' => __( 'Reject Membership', 'ultimate-member' ) );
}
- if ( um_user( 'account_status' ) == 'rejected' ) {
+ if ( 'rejected' === $account_status ) {
$actions['um_approve_membership'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) );
}
- if ( um_user( 'account_status' ) == 'approved' ) {
+ if ( 'approved' === $account_status ) {
$actions['um_put_as_pending'] = array( 'label' => __( 'Put as Pending Review', 'ultimate-member' ) );
}
- if ( um_user( 'account_status' ) == 'awaiting_email_confirmation' ) {
+ if ( 'awaiting_email_confirmation' === $account_status ) {
$actions['um_resend_activation'] = array( 'label' => __( 'Resend Activation E-mail', 'ultimate-member' ) );
}
- if ( um_user( 'account_status' ) != 'inactive' ) {
+ if ( 'inactive' !== $account_status ) {
$actions['um_deactivate'] = array( 'label' => __( 'Deactivate this account', 'ultimate-member' ) );
}
- if ( um_user( 'account_status' ) == 'inactive' ) {
+ if ( 'inactive' === $account_status ) {
$actions['um_reenable'] = array( 'label' => __( 'Reactivate this account', 'ultimate-member' ) );
}
-
}
if ( UM()->roles()->um_current_user_can( 'delete', $user_id ) ) {
@@ -56,226 +58,150 @@ function um_admin_user_actions_hook( $actions, $user_id ) {
}
add_filter( 'um_admin_user_actions_hook', 'um_admin_user_actions_hook', 10, 2 );
-
/**
- * Filter user basename
+ * Filter user basename.
+ *
* @param string $value
+ *
* @return string
- * @hook_filter: um_clean_user_basename_filter
*/
-function um_clean_user_basename_filter( $value, $raw ){
+function um_clean_user_basename_filter( $value, $raw ) {
$permalink_base = UM()->options()->get( 'permalink_base' );
$user_query = new WP_User_Query(
array(
- 'meta_query' => array(
- 'relation' => 'AND',
+ 'meta_query' => array(
+ 'relation' => 'AND',
array(
- 'key' => 'um_user_profile_url_slug_'.$permalink_base,
+ 'key' => 'um_user_profile_url_slug_' . $permalink_base,
'value' => $raw,
- 'compare' => '='
- )
+ 'compare' => '=',
+ ),
),
- 'fields' => array('ID')
+ 'fields' => array( 'ID' ),
)
-
);
- if( $user_query->total_users > 0 ){
-
+ if ( $user_query->total_users > 0 ) {
$result = current( $user_query->get_results() );
- $slugname = '';
-
- if( isset( $result->ID ) ){
- $slugname = get_user_meta( $result->ID, 'um_user_profile_url_slug_'.$permalink_base, true );
- $value = $slugname;
+ if ( isset( $result->ID ) ) {
+ $value = get_user_meta( $result->ID, 'um_user_profile_url_slug_' . $permalink_base, true );
}
}
/**
- * UM hook
+ * Filters the base user permalink value before cleaning.
*
- * @type filter
- * @title um_permalink_base_before_filter
- * @description Base permalink before
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- * Change base permalink before cleaning.
* function my_permalink_base_before( $permalink ) {
* // your code here
* return $permalink;
* }
- * ?>
+ * add_filter( 'um_permalink_base_before_filter', 'my_permalink_base_before' );
*/
- $value = apply_filters( "um_permalink_base_before_filter", $value );
- $raw_value = $value;
+ $value = apply_filters( 'um_permalink_base_before_filter', $value );
+ $raw_value = $value;
+ $filter_slug = '';
- switch( $permalink_base ) {
+ switch ( $permalink_base ) {
case 'name':
-
-
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '_' ) > -1 ) {
$value = str_replace( '_', '. ', $value );
}
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '_' ) > -1 ) {
$value = str_replace( '_', '-', $value );
}
- if( ! empty( $value ) && strrpos( $value ,".") > -1 && strrpos( $raw_value ,"_" ) <= -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '.' ) > -1 && strrpos( $raw_value, '_' ) <= -1 ) {
$value = str_replace( '.', ' ', $value );
}
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter_name
- * @description Base permalink after if permalink is username
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter_name", $value, $raw_value );
-
+ $filter_slug = '_' . $permalink_base;
break;
-
case 'name_dash':
-
- if( ! empty( $value ) && strrpos( $value ,"-") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '-' ) > -1 ) {
$value = str_replace( '-', ' ', $value );
}
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '_' ) > -1 ) {
$value = str_replace( '_', '-', $value );
}
// Checks if last name has a dash
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '_' ) > -1 ) {
$value = str_replace( '_', '-', $value );
}
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter_name_dash
- * @description Base permalink after if permalink is first name - last name
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter_name_dash", $value, $raw_value );
-
+ $filter_slug = '_' . $permalink_base;
break;
-
-
case 'name_plus':
-
- if( ! empty( $value ) && strrpos( $value ,"+") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '+' ) > -1 ) {
$value = str_replace( '+', ' ', $value );
}
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 ){
+ if ( ! empty( $value ) && strrpos( $value, '_' ) > -1 ) {
$value = str_replace( '_', '+', $value );
}
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter_name_plus
- * @description Base permalink after if permalink is first name + last name
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter_name_plus", $value, $raw_value );
-
+ $filter_slug = '_' . $permalink_base;
break;
-
default:
-
// Checks if last name has a dash
- if( ! empty( $value ) && strrpos( $value ,"_") > -1 && substr( $value , "_") == 1 ){
+ if ( ! empty( $value ) && strrpos( $value, '_' ) > -1 ) {
$value = str_replace( '_', '-', $value );
}
-
- /**
- * UM hook
- *
- * @type filter
- * @title um_permalink_base_after_filter
- * @description Base permalink after for default permalink
- * @input_vars
- * [{"var":"$permalink","type":"string","desc":"User Permalink"},
- * {"var":"$raw_permalink","type":"string","desc":"RAW User Permalink"}]
- * @change_log
- * ["Since: 2.0"]
- * @usage
- *
- * @example
- *
- */
- $value = apply_filters("um_permalink_base_after_filter", $value, $raw_value );
-
break;
}
- return $value;
-
+ /**
+ * Filters the base user permalink value after cleaning.
+ * $filter_slug - can be empty '' or equals 'name', 'name_dash', 'name_plus'
+ *
+ * @param {string} $permalink User Profile permalink.
+ * @param {string} $raw_value The base user permalink value before cleaning.
+ *
+ * @return {string} User Profile permalink.
+ *
+ * @since 1.3.x
+ * @hook um_permalink_base_after_filter{$filter_slug}
+ *
+ * @example
Change base permalink after cleaning if permalink settings isn't connected with user first or last name.
+ * function my_permalink_base_after_filter( $permalink, $raw_permalink ) {
+ * // your code here
+ * return $permalink;
+ * }
+ * add_filter( 'um_permalink_base_after_filter', 'my_permalink_base_after_filter', 10, 2 );
+ * @example
Change base permalink after cleaning if permalink settings is a full name.
+ * function my_permalink_base_after_filter_name( $permalink, $raw_permalink ) {
+ * // your code here
+ * return $permalink;
+ * }
+ * add_filter( 'um_permalink_base_after_filter_name', 'my_permalink_base_after_filter_name', 10, 2 );
+ * @example
Change base permalink after cleaning if permalink settings is a full name connected by dash.
+ * function my_permalink_base_after_filter_name_dash( $permalink, $raw_permalink ) {
+ * // your code here
+ * return $permalink;
+ * }
+ * add_filter( 'um_permalink_base_after_filter_name_dash', 'my_permalink_base_after_filter_name_dash', 10, 2 );
+ * @example
Change base permalink after cleaning if permalink settings is a full name connected by plus.
+ * function my_permalink_base_after_filter_name_plus( $permalink, $raw_permalink ) {
+ * // your code here
+ * return $permalink;
+ * }
+ * add_filter( 'um_permalink_base_after_filter_name_plus', 'my_permalink_base_after_filter_name_plus', 10, 2 );
+ */
+ return apply_filters( "um_permalink_base_after_filter{$filter_slug}", $value, $raw_value );
}
add_filter( 'um_clean_user_basename_filter', 'um_clean_user_basename_filter', 2, 10 );
-
/**
* Filter before update profile to force utf8 strings
*
@@ -296,4 +222,4 @@ function um_before_update_profile( $changes, $user_id ) {
return $changes;
}
-add_filter( 'um_before_update_profile','um_before_update_profile', 10, 2 );
+add_filter( 'um_before_update_profile', 'um_before_update_profile', 10, 2 );