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

Merge branch 'allow_roles_edit_and_delete_members' of https://github.com/ultimatemember/ultimatemember into release/2.0.18

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-06-03 17:46:40 +03:00
parent 142a163fa2 011b6d6013
commit 9fa2964281
6 changed files with 187 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-roles-capabilities.php
+7 -3
View File
@@ -571,21 +571,25 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
* @return bool|int
*/
function um_current_user_can( $cap, $user_id ) {
if ( ! is_user_logged_in() )
if ( ! is_user_logged_in() ) {
return false;
}
$return = 1;
um_fetch_user( get_current_user_id() );
$current_user_roles = UM()->roles()->get_all_user_roles( $user_id );
switch( $cap ) {
case 'edit':
if ( get_current_user_id() == $user_id && um_user( 'can_edit_profile' ) )
$return = 1;
elseif ( ! um_user( 'can_edit_everyone' ) )
elseif ( get_current_user_id() == $user_id && ! um_user( 'can_edit_profile' ) )
$return = 0;
elseif ( get_current_user_id() == $user_id && ! um_user( 'can_edit_profile') )
elseif ( um_user( 'can_edit_everyone' ) )
$return = 1;
elseif ( ! um_user( 'can_edit_everyone' ) )
$return = 0;
elseif ( um_user( 'can_edit_roles' ) && ( empty( $current_user_roles ) || count( array_intersect( $current_user_roles, um_user( 'can_edit_roles' ) ) ) <= 0 ) )
$return = 0;
includes/core/class-user.php
+11 -6
View File
@@ -1467,6 +1467,7 @@ if ( ! class_exists( 'um\core\User' ) ) {
function get_admin_actions() {
$items = array();
$actions = array();
/**
* UM hook
*
@@ -1488,12 +1489,16 @@ if ( ! class_exists( 'um\core\User' ) ) {
* }
* ?>
*/
$actions = apply_filters('um_admin_user_actions_hook', $actions );
if ( !isset( $actions ) || empty( $actions ) ) return false;
foreach($actions as $id => $arr ) {
$url = add_query_arg('um_action', $id );
$url = add_query_arg('uid', um_profile_id(), $url );
$items[] = '<a href="' . $url .'" class="real_url '.$id.'-item">' . $arr['label'] . '</a>';
$actions = apply_filters( 'um_admin_user_actions_hook', $actions );
if ( ! isset( $actions ) || empty( $actions ) ) {
return false;
}
foreach ( $actions as $id => $arr ) {
$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[] = '<a href="' . $url .'" class="real_url ' . esc_attr( $id ) . '-item">' . $arr['label'] . '</a>';
}
return $items;
}
includes/core/um-actions-core.php
+52 -23
View File
@@ -9,19 +9,22 @@ function um_action_request_process() {
if ( is_admin() ) {
return;
}
if ( ! is_user_logged_in() ) {
return;
}
if ( ! isset( $_REQUEST['um_action'] ) ) {
return;
}
if ( isset( $_REQUEST['uid'] ) && ! UM()->user()->user_exists_by_id( $_REQUEST['uid'] ) ) {
return;
}
if ( isset( $_REQUEST['uid'] ) ) {
if ( is_super_admin( $_REQUEST['uid'] ) ) {
wp_die( __( 'Super administrators can not be modified.','ultimate-member' ) );
wp_die( __( 'Super administrators can not be modified.', 'ultimate-member' ) );
}
}
@@ -32,9 +35,8 @@ function um_action_request_process() {
if ( isset( $_REQUEST['uid'] ) ) {
$uid = $_REQUEST['uid'];
}
switch ( $_REQUEST['um_action'] ) {
default:
$uid = isset( $_REQUEST['uid'] ) ? $_REQUEST['uid'] : 0;
/**
@@ -59,63 +61,90 @@ function um_action_request_process() {
*/
do_action( 'um_action_user_request_hook', $_REQUEST['um_action'], $uid );
break;
case 'edit':
UM()->fields()->editing = true;
if ( !um_can_edit_my_profile() ) {
$url = um_edit_my_profile_cancel_uri();
exit( wp_redirect( $url ) );
if ( ! um_is_myprofile() ) {
if ( ! UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) {
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
}
} else {
if ( ! um_can_edit_my_profile() ) {
$url = um_edit_my_profile_cancel_uri();
exit( wp_redirect( $url ) );
}
}
break;
case 'um_switch_user':
if ( !current_user_can('delete_users') ) {
if ( ! current_user_can( 'delete_users' ) ) {
return;
}
UM()->user()->auto_login( $_REQUEST['uid'] );
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
case 'um_reject_membership':
if ( ! current_user_can( 'manage_options' ) ) {
wp_die( __( 'You do not have permission to make this action.', 'ultimate-member' ) );
}
um_fetch_user( $uid );
UM()->user()->reject();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
case 'um_approve_membership':
case 'um_reenable':
um_fetch_user( $uid );
UM()->user()->approve();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
if ( ! current_user_can( 'manage_options' ) ) {
wp_die( __( 'You do not have permission to make this action.', 'ultimate-member' ) );
}
um_fetch_user( $uid );
UM()->user()->approve();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
case 'um_put_as_pending':
if ( ! current_user_can( 'manage_options' ) ) {
wp_die( __( 'You do not have permission to make this action.', 'ultimate-member' ) );
}
um_fetch_user( $uid );
UM()->user()->pending();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
case 'um_resend_activation':
if ( ! current_user_can( 'manage_options' ) ) {
wp_die( __( 'You do not have permission to make this action.', 'ultimate-member' ) );
}
um_fetch_user( $uid );
UM()->user()->email_pending();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
case 'um_deactivate':
if ( ! current_user_can( 'manage_options' ) ) {
wp_die( __( 'You do not have permission to make this action.', 'ultimate-member' ) );
}
um_fetch_user( $uid );
UM()->user()->deactivate();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
case 'um_delete':
if ( ! UM()->roles()->um_current_user_can( 'delete', $uid ) ) {
wp_die( __('You do not have permission to delete this user.','ultimate-member') );
wp_die( __( 'You do not have permission to delete this user.', 'ultimate-member' ) );
}
um_fetch_user( $uid );
UM()->user()->delete();
exit( wp_redirect( UM()->permalinks()->get_current_url( true ) ) );
break;
}
}
add_action( 'init', 'um_action_request_process', 10 );
add_action( 'template_redirect', 'um_action_request_process', 10000 );
includes/core/um-actions-profile.php
+96 -105
View File
@@ -1064,113 +1064,104 @@ add_action( 'um_pre_profile_shortcode', 'um_pre_profile_shortcode' );
* @param $args
*/
function um_add_edit_icon( $args ) {
$output = '';
if (!is_user_logged_in()) return; // not allowed for guests
// do not proceed if user cannot edit
if (UM()->fields()->editing == true) {
?>
<div class="um-profile-edit um-profile-headericon">
<a href="#" class="um-profile-edit-a um-profile-save"><i class="um-faicon-check"></i></a>
</div>
<?php
} else {
if (!um_is_myprofile() && ( UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) || UM()->roles()->um_current_user_can( 'delete', um_profile_id() ) ) ) {
?>
<div class="um-profile-edit um-profile-headericon">
<a href="#" class="um-profile-edit-a"><i class="um-faicon-cog"></i></a>
<?php
$items = UM()->user()->get_admin_actions();
if ( UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) {
$items['editprofile'] = '<a href="' . um_edit_profile_url() . '" class="real_url">' . __( 'Edit Profile', 'ultimate-member' ) . '</a>';
}
/**
* UM hook
*
* @type filter
* @title um_profile_edit_menu_items
* @description Edit menu items on profile page
* @input_vars
* [{"var":"$items","type":"array","desc":"User Menu"},
* {"var":"$user_id","type":"int","desc":"Profile ID"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_profile_edit_menu_items', 'function_name', 10, 2 ); ?>
* @example
* <?php
* add_filter( 'um_profile_edit_menu_items', 'my_profile_edit_menu_items', 10, 2 );
* function my_profile_edit_menu_items( $items, $user_id ) {
* // your code here
* return $items;
* }
* ?>
*/
$items = apply_filters( 'um_profile_edit_menu_items', $items, um_profile_id() );
$items['cancel'] = '<a href="#" class="um-dropdown-hide">' . __( 'Cancel', 'ultimate-member' ) . '</a>';
} else {
if (isset( UM()->user()->cannot_edit ) && UM()->user()->cannot_edit == 1) return;
?>
<div class="um-profile-edit um-profile-headericon">
<a href="#" class="um-profile-edit-a"><i class="um-faicon-cog"></i></a>
<?php
$items = array(
'editprofile' => '<a href="' . um_edit_profile_url() . '" class="real_url">' . __( 'Edit Profile', 'ultimate-member' ) . '</a>',
'myaccount' => '<a href="' . um_get_core_page( 'account' ) . '" class="real_url">' . __( 'My Account', 'ultimate-member' ) . '</a>',
'logout' => '<a href="' . um_get_core_page( 'logout' ) . '" class="real_url">' . __( 'Logout', 'ultimate-member' ) . '</a>',
'cancel' => '<a href="#" class="um-dropdown-hide">' . __( 'Cancel', 'ultimate-member' ) . '</a>',
);
/**
* UM hook
*
* @type filter
* @title um_myprofile_edit_menu_items
* @description Edit menu items on my profile page
* @input_vars
* [{"var":"$items","type":"array","desc":"User Menu"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_myprofile_edit_menu_items', 'function_name', 10, 1 ); ?>
* @example
* <?php
* add_filter( 'um_myprofile_edit_menu_items', 'my_myprofile_edit_menu_items', 10, 1 );
* function my_myprofile_edit_menu_items( $items ) {
* // your code here
* return $items;
* }
* ?>
*/
$items = apply_filters( 'um_myprofile_edit_menu_items', $items );
}
UM()->profile()->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
?>
</div>
<?php
if ( ! is_user_logged_in() ) {
// not allowed for guests
return;
}
// do not proceed if user cannot edit
if ( UM()->fields()->editing == true ) { ?>
<div class="um-profile-edit um-profile-headericon">
<a href="#" class="um-profile-edit-a um-profile-save"><i class="um-faicon-check"></i></a>
</div>
<?php return;
}
if ( ! um_is_myprofile() ) {
if ( ! UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) && ! UM()->roles()->um_current_user_can( 'delete', um_profile_id() ) ) {
return;
}
$items = UM()->user()->get_admin_actions();
if ( UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) {
$items['editprofile'] = '<a href="' . um_edit_profile_url() . '" class="real_url">' . __( 'Edit Profile', 'ultimate-member' ) . '</a>';
}
/**
* UM hook
*
* @type filter
* @title um_profile_edit_menu_items
* @description Edit menu items on profile page
* @input_vars
* [{"var":"$items","type":"array","desc":"User Menu"},
* {"var":"$user_id","type":"int","desc":"Profile ID"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_profile_edit_menu_items', 'function_name', 10, 2 ); ?>
* @example
* <?php
* add_filter( 'um_profile_edit_menu_items', 'my_profile_edit_menu_items', 10, 2 );
* function my_profile_edit_menu_items( $items, $user_id ) {
* // your code here
* return $items;
* }
* ?>
*/
$items = apply_filters( 'um_profile_edit_menu_items', $items, um_profile_id() );
$items['cancel'] = '<a href="#" class="um-dropdown-hide">' . __( 'Cancel', 'ultimate-member' ) . '</a>';
} else {
$items = array(
'editprofile' => '<a href="' . um_edit_profile_url() . '" class="real_url">' . __( 'Edit Profile', 'ultimate-member' ) . '</a>',
'myaccount' => '<a href="' . um_get_core_page( 'account' ) . '" class="real_url">' . __( 'My Account', 'ultimate-member' ) . '</a>',
'logout' => '<a href="' . um_get_core_page( 'logout' ) . '" class="real_url">' . __( 'Logout', 'ultimate-member' ) . '</a>',
'cancel' => '<a href="#" class="um-dropdown-hide">' . __( 'Cancel', 'ultimate-member' ) . '</a>',
);
if ( ! empty( UM()->user()->cannot_edit ) ) {
unset( $items['editprofile'] );
}
/**
* UM hook
*
* @type filter
* @title um_myprofile_edit_menu_items
* @description Edit menu items on my profile page
* @input_vars
* [{"var":"$items","type":"array","desc":"User Menu"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_myprofile_edit_menu_items', 'function_name', 10, 1 ); ?>
* @example
* <?php
* add_filter( 'um_myprofile_edit_menu_items', 'my_myprofile_edit_menu_items', 10, 1 );
* function my_myprofile_edit_menu_items( $items ) {
* // your code here
* return $items;
* }
* ?>
*/
$items = apply_filters( 'um_myprofile_edit_menu_items', $items );
} ?>
<div class="um-profile-edit um-profile-headericon">
<a href="#" class="um-profile-edit-a"><i class="um-faicon-cog"></i></a>
<?php UM()->profile()->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items ); ?>
</div>
<?php
}
add_action( 'um_pre_header_editprofile', 'um_add_edit_icon' );
includes/core/um-filters-user.php
+18 -20
View File
@@ -9,50 +9,48 @@
* @return null
*/
function um_admin_user_actions_hook( $actions ) {
$actions = null;
um_fetch_user( um_profile_id() );
if ( UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) {
//if ( UM()->roles()->um_current_user_can( 'edit', um_profile_id() ) ) {
if ( current_user_can( 'manage_options' ) ) {
if ( um_user('account_status') == 'awaiting_admin_review' ){
$actions['um_approve_membership'] = array( 'label' => __('Approve Membership','ultimate-member') );
$actions['um_reject_membership'] = array( 'label' => __('Reject Membership','ultimate-member') );
if ( um_user( 'account_status' ) == 'awaiting_admin_review' ) {
$actions['um_approve_membership'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) );
$actions['um_reject_membership'] = array( 'label' => __( 'Reject Membership', 'ultimate-member' ) );
}
if ( um_user('account_status') == 'rejected' ) {
$actions['um_approve_membership'] = array( 'label' => __('Approve Membership','ultimate-member') );
if ( um_user( 'account_status' ) == 'rejected' ) {
$actions['um_approve_membership'] = array( 'label' => __( 'Approve Membership', 'ultimate-member' ) );
}
if ( um_user('account_status') == 'approved' ) {
$actions['um_put_as_pending'] = array( 'label' => __('Put as Pending Review','ultimate-member') );
if ( um_user( 'account_status' ) == 'approved' ) {
$actions['um_put_as_pending'] = array( 'label' => __( 'Put as Pending Review', 'ultimate-member' ) );
}
if ( um_user('account_status') == 'awaiting_email_confirmation' ) {
$actions['um_resend_activation'] = array( 'label' => __('Resend Activation E-mail','ultimate-member') );
if ( um_user( 'account_status' ) == 'awaiting_email_confirmation' ) {
$actions['um_resend_activation'] = array( 'label' => __( 'Resend Activation E-mail', 'ultimate-member' ) );
}
if ( um_user('account_status') != 'inactive' ) {
$actions['um_deactivate'] = array( 'label' => __('Deactivate this account','ultimate-member') );
if ( um_user( 'account_status' ) != 'inactive' ) {
$actions['um_deactivate'] = array( 'label' => __( 'Deactivate this account', 'ultimate-member' ) );
}
if ( um_user('account_status') == 'inactive' ) {
$actions['um_reenable'] = array( 'label' => __('Reactivate this account','ultimate-member') );
if ( um_user( 'account_status' ) == 'inactive' ) {
$actions['um_reenable'] = array( 'label' => __( 'Reactivate this account', 'ultimate-member' ) );
}
}
if ( UM()->roles()->um_current_user_can( 'delete', um_profile_id() ) ) {
$actions['um_delete'] = array( 'label' => __('Delete this user','ultimate-member') );
$actions['um_delete'] = array( 'label' => __( 'Delete this user', 'ultimate-member' ) );
}
if ( current_user_can('delete_users') ) {
$actions['um_switch_user'] = array( 'label' => __('Login as this user','ultimate-member') );
if ( current_user_can( 'delete_users' ) ) {
$actions['um_switch_user'] = array( 'label' => __( 'Login as this user', 'ultimate-member' ) );
}
return $actions;
}
add_filter( 'um_admin_user_actions_hook', 'um_admin_user_actions_hook', 1 );
includes/um-short-functions.php
+3 -2
View File
@@ -705,10 +705,11 @@ function um_filtered_value( $key, $data = false ) {
* @return bool|int|null
*/
function um_profile_id() {
$requested_user = um_get_requested_user();
if ( um_get_requested_user() ) {
if ( $requested_user ) {
return um_get_requested_user();
} else if (is_user_logged_in() && get_current_user_id()) {
} elseif ( is_user_logged_in() && get_current_user_id() ) {
return get_current_user_id();
}