10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- member directory styles;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-09-23 13:34:25 +03:00
parent 912791e5a9
commit cf118d137d
21 changed files with 2039 additions and 1353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-enqueue.php
+3 -1
View File
@@ -135,7 +135,9 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
) );
wp_localize_script( 'um_scripts', 'um_scripts', $localize_data );
wp_register_script('um_members', $this->js_baseurl . 'um-members' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider' ), ultimatemember_version, true );
wp_register_script('um_dropdown', $this->js_baseurl . 'dropdown' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script('um_members', $this->js_baseurl . 'um-members' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown' ), ultimatemember_version, true );
wp_register_script('um_profile', $this->js_baseurl . 'um-profile' . $this->suffix . '.js', array( 'jquery', 'wp-util' ), ultimatemember_version, true );
wp_register_script('um_account', $this->js_baseurl . 'um-account' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
includes/core/class-member-directory.php
+160 -22
View File
@@ -195,13 +195,13 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
// Sort
$this->sort_fields = apply_filters( 'um_members_directory_sort_fields', array(
'user_registered_desc' => __( 'New Users First', 'ultimate-member' ),
'user_registered_asc' => __( 'Old Users First', 'ultimate-member' ),
'user_registered_desc' => __( 'New users first', 'ultimate-member' ),
'user_registered_asc' => __( 'Old users first', 'ultimate-member' ),
'username' => __( 'Username', 'ultimate-member' ),
'first_name' => __( 'First Name', 'ultimate-member' ),
'last_name' => __( 'Last Name', 'ultimate-member' ),
'display_name' => __( 'Display Name', 'ultimate-member' ),
'last_login' => __( 'Last Login', 'ultimate-member' ),
'first_name' => __( 'First name', 'ultimate-member' ),
'last_name' => __( 'Last name', 'ultimate-member' ),
'display_name' => __( 'Display name', 'ultimate-member' ),
'last_login' => __( 'Last login', 'ultimate-member' ),
) );
asort( $this->sort_fields );
@@ -503,7 +503,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
<input type="hidden" id="<?php echo $filter; ?>_min" name="<?php echo $filter; ?>[]" class="um_range_min" />
<input type="hidden" id="<?php echo $filter; ?>_max" name="<?php echo $filter; ?>[]" class="um_range_max" />
<div class="um-slider" data-field_name="<?php echo $filter; ?>" data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"></div>
<div class="um-slider-range" data-placeholder="<?php echo esc_attr( $placeholder ); ?>" data-label="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"></div>
<div class="um-slider-range" data-placeholder="<?php echo esc_attr( $placeholder ); ?>" data-label="<?php echo ( ! empty( $attrs['label'] ) ) ? esc_attr__( stripslashes( $attrs['label'] ), 'ultimate-member' ) : ''; ?>"></div>
<?php }
break;
@@ -516,12 +516,12 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
if ( $range ) { ?>
<input type="text" id="<?php echo $filter; ?>_from" name="<?php echo $filter; ?>_from" class="um-half-filter um-datepicker-filter"
<input type="text" id="<?php echo $filter; ?>_from" name="<?php echo $filter; ?>_from" class="um-datepicker-filter"
placeholder="<?php esc_attr_e( sprintf( '%s From', stripslashes( $label ) ), 'ultimate-member' ); ?>"
data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
data-date_min="<?php echo $range[0] ?>" data-date_max="<?php echo $range[1] ?>"
data-filter_name="<?php echo $filter; ?>" data-range="from" />
<input type="text" id="<?php echo $filter; ?>_to" name="<?php echo $filter; ?>_to" class="um-half-filter um-datepicker-filter"
<input type="text" id="<?php echo $filter; ?>_to" name="<?php echo $filter; ?>_to" class="um-datepicker-filter"
placeholder="<?php esc_attr_e( sprintf( '%s To', stripslashes( $label ) ), 'ultimate-member' ); ?>"
data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
data-date_min="<?php echo $range[0] ?>" data-date_max="<?php echo $range[1] ?>"
@@ -551,13 +551,13 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
if ( $range ) { ?>
<input type="text" id="<?php echo $filter; ?>_from" name="<?php echo $filter; ?>_from" class="um-half-filter um-timepicker-filter"
<input type="text" id="<?php echo $filter; ?>_from" name="<?php echo $filter; ?>_from" class="um-timepicker-filter"
placeholder="<?php esc_attr_e( sprintf( '%s From', stripslashes( $label ) ), 'ultimate-member' ); ?>"
data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"
data-format="<?php echo esc_attr( $js_format ) ?>" data-intervals="<?php echo esc_attr( $attrs['intervals'] ) ?>"
data-filter_name="<?php echo $filter; ?>" data-range="from" />
<input type="text" id="<?php echo $filter; ?>_to" name="<?php echo $filter; ?>_to" class="um-half-filter um-timepicker-filter"
<input type="text" id="<?php echo $filter; ?>_to" name="<?php echo $filter; ?>_to" class="um-timepicker-filter"
placeholder="<?php esc_attr_e( sprintf( '%s To', stripslashes( $label ) ), 'ultimate-member' ); ?>"
data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"
@@ -1159,6 +1159,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
),
);
$meta_query = apply_filters( 'um_member_directory_general_search_meta_query', $meta_query, $_POST['search'] );
$this->query_args['meta_query'][] = $meta_query;
}
}
@@ -1212,7 +1214,9 @@ 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, UM()->member_directory()->core_search_fields, 'both' );
$search_where = preg_replace( '/ AND \((.*?)\)/im', " AND ( $1 )", $search_where );
$replacement = apply_filters( 'um_member_directory_organic_search_replacement', " AND ( $1 )" );
$search_where = preg_replace( '/ AND \((.*?)\)/im', $replacement, $search_where );
$sql['where'] = $sql['where'] . $search_where;
}
@@ -1222,6 +1226,17 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
}
/**
* Use OR in search query if there is only searching, but with filters there will be AND conditional
* @param $replacement
*
* @return string
*/
function organic_replacement( $replacement ) {
return " OR ( $1 )";
}
/**
* Handle filters request
*/
@@ -1236,6 +1251,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
}
if ( empty( $filter_query ) ) {
add_filter( 'um_member_directory_organic_search_replacement', array( &$this, 'organic_replacement' ) );
return;
}
@@ -1505,6 +1521,89 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
}
/**
* @param int $user_id
*
* @return array
*/
function build_user_actions_list( $user_id ) {
$actions = array();
if ( ! is_user_logged_in() ) {
return $actions;
}
if ( get_current_user_id() != $user_id ) {
if ( UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
$actions['um-editprofile'] = array(
'title' => __( 'Edit Profile', 'ultimate-member' ),
'url' => um_edit_profile_url(),
);
}
/**
* UM hook
*
* @type filter
* @title um_admin_user_actions_hook
* @description Extend admin actions for each user
* @input_vars
* [{"var":"$actions","type":"array","desc":"Actions for user"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_admin_user_actions_hook', 'function_name', 10, 1 ); ?>
* @example
* <?php
* add_filter( 'um_admin_user_actions_hook', 'my_admin_user_actions', 10, 1 );
* function my_admin_user_actions( $actions ) {
* // your code here
* return $actions;
* }
* ?>
*/
$admin_actions = apply_filters( 'um_admin_user_actions_hook', null, $user_id );
if ( ! empty( $admin_actions ) ) {
foreach ( $admin_actions as $id => $arr ) {
$url = add_query_arg( array( 'um_action' => $id, 'uid' => $user_id ), um_get_core_page( 'user' ) );
$actions[ $id ] = array(
'title' => $arr['label'],
'url' => $url,
);
}
}
$actions = apply_filters( 'um_member_directory_users_card_actions', $actions, $user_id );
} else {
if ( empty( UM()->user()->cannot_edit ) ) {
$actions['um-editprofile'] = array(
'title' => __( 'Edit Profile', 'ultimate-member' ),
'url' => um_edit_profile_url(),
);
}
$actions['um-myaccount'] = array(
'title' => __( 'My Account', 'ultimate-member' ),
'url' => um_get_core_page( 'account' ),
);
$actions['um-logout'] = array(
'title' => __( 'Logout', 'ultimate-member' ),
'url' => um_get_core_page( 'logout' ),
);
$actions = apply_filters( 'um_member_directory_my_user_card_actions', $actions, $user_id );
}
return $actions;
}
/**
* @param int $user_id
* @param array $directory_data
@@ -1514,17 +1613,10 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
function build_user_card_data( $user_id, $directory_data ) {
um_fetch_user( $user_id );
$can_edit = UM()->roles()->um_current_user_can( 'edit', $user_id ) || UM()->roles()->um_user_can( 'can_edit_everyone' );
$dropdown_actions = $this->build_user_actions_list( $user_id );
$actions = array();
if ( $can_edit ) {
$actions[] = array(
'title' => __( 'Edit profile', 'ultimate-member' ),
'url' => um_edit_profile_url(),
'wrapper_class' => 'um-members-edit-btn',
'class' => 'um-edit-profile-btn um-button um-alt',
);
}
$can_edit = UM()->roles()->um_current_user_can( 'edit', $user_id ) || UM()->roles()->um_user_can( 'can_edit_everyone' );
// Replace hook 'um_members_just_after_name'
ob_start();
@@ -1548,7 +1640,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
'edit_profile_url' => um_edit_profile_url(),
'avatar' => get_avatar( $user_id, $this->avatar_size ),
'display_name_html' => um_user( 'display_name', 'html' ),
'actions' => $actions,
'dropdown_actions' => $dropdown_actions,
'hook_just_after_name' => preg_replace( '/^\s+/im', '', $hook_just_after_name ),
'hook_after_user_name' => preg_replace( '/^\s+/im', '', $hook_after_user_name ),
);
@@ -1726,6 +1818,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
$user_query = new \WP_User_Query( $this->query_args );
//var_dump( $user_query->request );
remove_filter( 'get_meta_sql', array( &$this, 'change_meta_sql' ), 10 );
/**
@@ -1802,5 +1896,49 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
wp_send_json_success( array( 'pagination' => $pagination_data, 'users' => $users, 'args' => $data_args ) );
}
/**
* New menu
*
* @param string $element
* @param string $trigger
* @param array $items
*/
function dropdown_menu( $element, $trigger, $items = array() ) {
?>
<div class="um-new-dropdown" data-element="<?php echo $element; ?>" data-trigger="<?php echo $trigger; ?>">
<ul>
<?php foreach ( $items as $k => $v ) { ?>
<li><?php echo $v; ?></li>
<?php } ?>
</ul>
</div>
<?php
}
/**
* New menu JS
*
* @param string $element
* @param string $trigger
* @param string $item
*/
function dropdown_menu_js( $element, $trigger, $item ) {
?>
<div class="um-new-dropdown" data-element="<?php echo $element; ?>" data-trigger="<?php echo $trigger; ?>">
<ul>
<# _.each( <?php echo $item; ?>.dropdown_actions, function( action, key, list ) { #>
<li><a href="<# if ( typeof action.url != 'undefined' ) { #>{{{action.url}}}<# } else { #>javascript:void(0);<# }#>" class="{{{key}}}">{{{action.title}}}</a></li>
<# }); #>
</ul>
</div>
<?php
}
}
}
includes/core/class-profile.php
+8 -3
View File
@@ -418,11 +418,16 @@ if ( ! class_exists( 'um\core\Profile' ) ) {
* @param string $element
* @param string $trigger
* @param array $items
* @param array $args
*/
function new_ui( $position, $element, $trigger, $items ) {
?>
function new_ui( $position, $element, $trigger, $items, $args = array() ) {
<div class="um-dropdown" data-element="<?php echo esc_attr( $element ); ?>" data-position="<?php echo esc_attr( $position ); ?>" data-trigger="<?php echo esc_attr( $trigger ); ?>">
$additional_data = '';
foreach ( $args as $key => $value ) {
$additional_data .= " data-{$key}=\"{$value}\"";
} ?>
<div class="um-dropdown" data-element="<?php echo esc_attr( $element ); ?>" data-position="<?php echo esc_attr( $position ); ?>" data-trigger="<?php echo esc_attr( $trigger ); ?>"<?php echo $additional_data ?>>
<div class="um-dropdown-b">
<div class="um-dropdown-arr"><i class=""></i></div>
<ul>
includes/core/class-user.php
+1 -2
View File
@@ -1494,7 +1494,6 @@ if ( ! class_exists( 'um\core\User' ) ) {
*/
function get_admin_actions() {
$items = array();
$actions = array();
/**
* UM hook
@@ -1517,7 +1516,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
* }
* ?>
*/
$actions = apply_filters( 'um_admin_user_actions_hook', $actions );
$actions = apply_filters( 'um_admin_user_actions_hook', null, um_profile_id() );
if ( ! isset( $actions ) || empty( $actions ) ) {
return false;
}
includes/core/um-filters-user.php
+7 -6
View File
@@ -4,16 +4,17 @@
/**
* Main admin user actions
*
* @param $actions
* @param array $actions
* @param int $user_id
*
* @return null
*/
function um_admin_user_actions_hook( $actions ) {
function um_admin_user_actions_hook( $actions, $user_id ) {
$actions = null;
um_fetch_user( um_profile_id() );
um_fetch_user( $user_id );
//if ( UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) {
//if ( UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
if ( current_user_can( 'manage_options' ) ) {
if ( um_user( 'account_status' ) == 'awaiting_admin_review' ) {
@@ -43,7 +44,7 @@ function um_admin_user_actions_hook( $actions ) {
}
if ( UM()->roles()->um_current_user_can( 'delete', um_profile_id() ) ) {
if ( UM()->roles()->um_current_user_can( 'delete', $user_id ) ) {
$actions['um_delete'] = array( 'label' => __( 'Delete this user', 'ultimate-member' ) );
}
@@ -53,7 +54,7 @@ function um_admin_user_actions_hook( $actions ) {
return $actions;
}
add_filter( 'um_admin_user_actions_hook', 'um_admin_user_actions_hook', 1 );
add_filter( 'um_admin_user_actions_hook', 'um_admin_user_actions_hook', 10, 2 );
/**