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

CSS conflicts fixed

Browse Source
This commit is contained in:
ultimatemember
2015-01-11 19:07:55 +02:00
parent 4a6d8c5df5
commit 49a262fa18
36 changed files with 266 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/um-account.php
+1 -1
View File
@@ -116,7 +116,7 @@ class UM_Account {
switch( $id ) {
case 'privacy' :
$args = 'profile_privacy,show_in_members';
$args = 'profile_privacy,hide_in_members';
break;
case 'delete' :
$args = 'single_user_password';
core/um-actions-account.php
+5
View File
@@ -16,6 +16,11 @@
$changes[ $k ] = $v;
}
}
if ( isset( $changes['hide_in_members'] ) && $changes['hide_in_members'] == 'No' ){
delete_user_meta( um_user('ID'), 'hide_in_members' );
unset( $changes['hide_in_members'] );
}
$ultimatemember->user->update_profile( $changes );
core/um-actions-ajax.php
+2 -2
View File
@@ -27,7 +27,7 @@
global $ultimatemember;
extract($_REQUEST);
if ( !um_can_edit_profile( $user_id ) ) die( __('You can not edit this user') );
if ( !um_current_user_can('edit', $user_id ) ) die( __('You can not edit this user') );
$ultimatemember->files->delete_core_user_photo( $user_id, 'profile_photo' );
@@ -42,7 +42,7 @@
global $ultimatemember;
extract($_REQUEST);
if ( !um_can_edit_profile( $user_id ) ) die( __('You can not edit this user') );
if ( !um_current_user_can('edit', $user_id ) ) die( __('You can not edit this user') );
$ultimatemember->files->delete_core_user_photo( $user_id, 'cover_photo' );
core/um-actions-core.php
+11 -15
View File
@@ -8,20 +8,16 @@
global $ultimatemember;
if ( is_admin() ) return false;
if ( !isset( $_REQUEST['um_action'] ) ) return false;
if ( isset( $_REQUEST['uid'] ) && !$ultimatemember->user->user_exists_by_id( $_REQUEST['uid'] ) ) return false;
if ( isset( $_REQUEST['uid'] ) ) {
if ( is_super_admin( $_REQUEST['uid'] ) )
wp_die('Super administrators can not be modified.');
if ( !current_user_can('edit_users') ){
wp_die('You do not have permissions to do this.');
}
}
if ( isset($_REQUEST['uid'])){
$uid = $_REQUEST['uid'];
}
switch( $_REQUEST['um_action'] ) {
@@ -35,44 +31,44 @@
break;
case 'um_reject_membership':
um_fetch_user( $_REQUEST['uid'] );
um_fetch_user( $uid );
$ultimatemember->user->reject();
exit( wp_redirect( $ultimatemember->permalinks->get_current_url( true ) ) );
break;
case 'um_approve_membership':
case 'um_reenable':
um_fetch_user( $_REQUEST['uid'] );
um_fetch_user( $uid );
$ultimatemember->user->approve();
exit( wp_redirect( $ultimatemember->permalinks->get_current_url( true ) ) );
break;
case 'um_put_as_pending':
um_fetch_user( $_REQUEST['uid'] );
um_fetch_user( $uid );
$ultimatemember->user->pending();
exit( wp_redirect( $ultimatemember->permalinks->get_current_url( true ) ) );
break;
case 'um_resend_activation':
um_fetch_user( $_REQUEST['uid'] );
um_fetch_user( $uid );
$ultimatemember->user->email_pending();
exit( wp_redirect( $ultimatemember->permalinks->get_current_url( true ) ) );
break;
case 'um_deactivate':
um_fetch_user( $_REQUEST['uid'] );
um_fetch_user( $uid );
$ultimatemember->user->deactivate();
exit( wp_redirect( $ultimatemember->permalinks->get_current_url( true ) ) );
break;
case 'um_delete':
um_fetch_user( $_REQUEST['uid'] );
if ( !um_current_user_can( 'delete', $uid ) ) wp_die( __('You do not have permission to delete this user.','ultimatemember') );
um_fetch_user( $uid );
$ultimatemember->user->delete();
exit( wp_redirect( $ultimatemember->permalinks->get_current_url( true ) ) );
break;
}
}
/***
core/um-actions-global.php
-12
View File
@@ -43,18 +43,6 @@
<?php }
/***
*** @debug: load time and queries
***/
add_action('wp_footer', 'um_add_load_time_and_queries_num', 1111 );
function um_add_load_time_and_queries_num() {
if ( um_get_option('load_time') == 1 ) {
echo sprintf(__('%1$s queries made in %2$s seconds','ultimatemember'), get_num_queries(), timer_stop(0) );
}
}
/***
*** @empty the honeypot value
***/
core/um-actions-members.php
+2 -2
View File
@@ -114,7 +114,7 @@
?>
<div class="um-members-pagidrop uimob500-show">
<div class="um-members-pagidrop uimob340-show uimob500-show">
<?php _e('Jump to page:','ultimatemember'); ?>
@@ -126,7 +126,7 @@
</div>
<div class="um-members-pagi uimob500-hide">
<div class="um-members-pagi uimob340-hide uimob500-hide">
<?php if ( um_members('page') != 1 ) { ?>
<a href="<?php echo $ultimatemember->permalinks->add_query( 'members_page', 1 ); ?>" class="pagi pagi-arrow um-tip-n" title="First Page"><i class="um-icon-angle-double-left"></i></a>
core/um-actions-profile.php
+4 -3
View File
@@ -241,7 +241,7 @@
if ( um_get_requested_user() ) {
if ( !um_can_view_profile( um_get_requested_user() ) ) um_redirect_home();
if ( !um_can_edit_profile( um_get_requested_user() ) ) $ultimatemember->user->cannot_edit = 1;
if ( !um_current_user_can('edit', um_get_requested_user() ) ) $ultimatemember->user->cannot_edit = 1;
um_fetch_user( um_get_requested_user() );
} else {
if ( !is_user_logged_in() ) um_redirect_home();
@@ -254,7 +254,7 @@
$ultimatemember->fields->editing = 1;
if ( um_get_requested_user() ) {
if ( !um_can_edit_profile( um_get_requested_user() ) ) um_redirect_home();
if ( !um_current_user_can('edit', um_get_requested_user() ) ) um_redirect_home();
um_fetch_user( um_get_requested_user() );
}
@@ -304,6 +304,7 @@
$actions = $ultimatemember->user->get_admin_actions();
unset( $items['myaccount'] );
unset( $items['cancel'] );
$items = array_merge( $items, $actions );
$items['cancel'] = $cancel;
@@ -339,7 +340,7 @@
$files = null;
if ( isset( $args['user_id'] ) ) {
if ( um_can_edit_profile( $args['user_id'] ) ) {
if ( um_current_user_can('edit', $args['user_id'] ) ) {
$ultimatemember->user->set( $args['user_id'] );
} else {
wp_die( __('You are not allowed to edit this user.','ultimatemember') );
core/um-actions-register.php
+3 -3
View File
@@ -128,6 +128,8 @@
if ( !is_admin() ) {
do_action("track_{$status}_user_registration");
if ( $status == 'approved' ) {
$ultimatemember->user->auto_login($user_id);
@@ -149,9 +151,7 @@
}
}
do_action("track_{$status}_user_registration");
}
}
core/um-builtin.php
+7 -7
View File
@@ -799,17 +799,17 @@ class UM_Builtin {
'required_perm' => 'can_make_private_profile',
),
'show_in_members' => array(
'title' => __('Show me in the Directory','ultimatemember'),
'metakey' => 'show_in_members',
'hide_in_members' => array(
'title' => __('Hide my profile from directory','ultimatemember'),
'metakey' => 'hide_in_members',
'type' => 'radio',
'label' => __('Show me in the Directory','ultimatemember'),
'help' => __('Choose whether you want to appear in public member directories or not','ultimatemember'),
'label' => __('Hide my profile from directory','ultimatemember'),
'help' => __('Here you can hide yourself from appearing in public directory','ultimatemember'),
'required' => 0,
'public' => 1,
'editable' => 1,
'default' => 'Yes',
'options' => array('Yes','No'),
'default' => 'No',
'options' => array('No','Yes'),
'account_only' => true,
'required_opt' => array( 'members_page', 1 ),
),
core/um-filters-members.php
+11 -3
View File
@@ -5,22 +5,30 @@
***/
add_filter('um_prepare_user_query_args', 'um_prepare_user_query_args', 10, 2);
add_filter('um_prepare_user_query_args', 'um_add_search_to_query', 50, 2);
add_filter('um_prepare_user_query_args', 'um_remove_unwanted_users_from_list', 99, 2);
add_filter('um_prepare_user_query_args', 'um_remove_special_users_from_list', 99, 2);
/***
*** @Remove users we do not need to show in directory
***/
function um_remove_unwanted_users_from_list( $query_args, $args ) {
function um_remove_special_users_from_list( $query_args, $args ) {
global $ultimatemember;
extract( $args );
if ( !current_user_can('manage_options') )
if ( !current_user_can('manage_options') ) {
$query_args['meta_query'][] = array(
'key' => 'account_status',
'value' => 'approved',
'compare' => '='
);
}
$query_args['meta_query'][] = array(
'key' => 'hide_in_members',
'value' => '',
'compare' => 'NOT EXISTS'
);
return $query_args;
}
core/um-filters-user.php
+5 -1
View File
@@ -54,9 +54,13 @@
$actions['um_reenable'] = array( 'label' => __('Reactivate this account') );
}
$actions['um_delete'] = array( 'label' => __('Delete this user') );
if ( um_current_user_can( 'delete', um_profile_id() ) ) {
$actions['um_delete'] = array( 'label' => __('Delete this user') );
}
}
um_fetch_user( um_profile_id() );
return $actions;
}
core/um-setup.php
-6
View File
@@ -40,8 +40,6 @@ class UM_Setup {
'_um_show_tagline' => 0,
'_um_search' => 0,
'_um_userinfo_animate' => '1',
'_um_directory_header' => __('{total_users} Members','ultimatemember'),
'_um_directory_no_users' => __('Sorry, we cannot find any users who match your search criteria.','ultimatemember'),
'_um_sortby' => 'user_registered_desc',
'_um_profile_photo' => '1',
'_um_cover_photos' => '1',
@@ -140,8 +138,6 @@ class UM_Setup {
'_um_login_secondary_btn_hover' => '#e5e5e5',
'_um_login_secondary_btn_text' => '#666',
'_um_directory_template' => 'members',
'_um_directory_header' => __('{total_users} Members','ultimatemember'),
'_um_directory_no_users' => __('We are sorry. We cannot find any users who match your search criteria.','ultimatemember'),
);
$this->core_form_meta_all = apply_filters('um_core_form_meta_all', $this->core_form_meta_all );
@@ -176,8 +172,6 @@ class UM_Setup {
'can_delete_everyone' => 1,
'can_delete_roles' => 1,
'can_edit_profile' => 1,
'can_upload_pics' => 1,
'can_upload_files' => 1,
'can_delete_profile' => 1,
'can_view_all' => 1,
'can_make_private_profile' => 1,
core/um-short-functions.php
+41 -48
View File
@@ -244,15 +244,6 @@
$ultimatemember->user->reset();
}
/***
*** @boolean if viewing his own profile
***/
function um_is_my_profile() {
if ( !is_user_logged_in() ) return false;
if ( um_is_core_page('user') && get_current_user_id() == um_get_requested_user() ) return true;
return false;
}
/***
*** @gets the queried user
***/
@@ -353,19 +344,6 @@
}
/***
*** @Tests for current user
***/
function um_user_can( $permission ) {
global $ultimatemember;
$user_id = get_current_user_id();
$role = get_user_meta( $user_id, 'role', true );
$permissions = $ultimatemember->query->role_data( $role );
if ( $permissions[ $permission ] == 1 )
return true;
return false;
}
/***
*** @boolean check for not same user
***/
@@ -395,23 +373,54 @@
}
/***
*** @checks if user can edit profile
*** @User can (role settings )
***/
function um_can_edit_profile( $user_id ){
function um_user_can( $permission ) {
global $ultimatemember;
$user_id = get_current_user_id();
$role = get_user_meta( $user_id, 'role', true );
$permissions = $ultimatemember->query->role_data( $role );
if ( $permissions[ $permission ] == 1 )
return true;
return false;
}
/***
*** @Check if user is in his profile
***/
function um_is_myprofile(){
global $ultimatemember;
if ( get_current_user_id() && get_current_user_id() == um_get_requested_user() )return true;
if ( !um_get_requested_user() && um_is_core_page('user') && get_current_user_id() ) return true;
return false;
}
/***
*** @Current user can
***/
function um_current_user_can( $cap, $user_id ){
global $ultimatemember;
if ( !is_user_logged_in() ) return false;
um_fetch_user( get_current_user_id() );
if ( um_user('can_edit_everyone') ) return true;
if ( get_current_user_id() == $user_id && um_user('can_edit_profile') ) return true;
if ( get_current_user_id() == $user_id && !um_user('can_edit_profile') ) return false;
if ( !um_user('can_edit_everyone') ) return false;
switch($cap) {
case 'edit':
if ( get_current_user_id() == $user_id && um_user('can_edit_profile') ) return true;
if ( !um_user('can_edit_everyone') ) return false;
if ( get_current_user_id() == $user_id && !um_user('can_edit_profile') ) return false;
if ( um_user('can_edit_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_edit_roles') ) ) return false;
break;
case 'delete':
if ( !um_user('can_delete_everyone') ) return false;
if ( um_user('can_delete_roles') && !in_array( $ultimatemember->query->get_role_by_userid( $user_id ), um_user('can_delete_roles') ) ) return false;
break;
}
return true;
}
/***
@@ -419,25 +428,9 @@
***/
function um_can_edit_my_profile(){
global $ultimatemember;
if ( !is_user_logged_in() ) return false;
if ( !um_user('can_edit_profile') ) return false;
return true;
}
/***
*** @quick test if the user's is on his profile
***/
function um_is_myprofile(){
global $ultimatemember;
if ( get_current_user_id() && get_current_user_id() == um_get_requested_user() )return true;
if ( !um_get_requested_user() && um_is_core_page('user') && get_current_user_id() ) return true;
return false;
}
/***
core/um-taxonomies.php
+10 -6
View File
@@ -33,14 +33,14 @@ class UM_Taxonomies {
register_post_type( 'um_role', array(
'labels' => array(
'name' => __( 'Member Levels' ),
'singular_name' => __( 'Member Level' ),
'name' => __( 'User Roles' ),
'singular_name' => __( 'User Role' ),
'add_new' => __( 'Add New' ),
'add_new_item' => __('Add New Member Level' ),
'edit_item' => __('Edit Member Level'),
'not_found' => __('You did not create any member levels yet'),
'add_new_item' => __('Add New User Role' ),
'edit_item' => __('Edit User Role'),
'not_found' => __('You did not create any user roles yet'),
'not_found_in_trash' => __('Nothing found in Trash'),
'search_items' => __('Search Member Levels')
'search_items' => __('Search User Roles')
),
'show_ui' => true,
'show_in_menu' => false,
@@ -49,6 +49,8 @@ class UM_Taxonomies {
)
);
if ( um_get_option('members_page') ){
register_post_type( 'um_directory', array(
'labels' => array(
'name' => __( 'Member Directories' ),
@@ -67,6 +69,8 @@ class UM_Taxonomies {
)
);
}
}
}