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

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into fix/wpml_emails_templates

Browse Source 
Conflicts:
	includes/um-deprecated-functions.php
	includes/um-short-functions.php
This commit is contained in:
nikitozzzzzzz
2017-12-19 14:47:47 +02:00
parent f861de65a8 ef9c06185b
commit b9ecb63cb3
41 changed files with 4928 additions and 4513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-access.php
+81 -42
View File
@@ -126,18 +126,30 @@ if ( ! class_exists( 'Access' ) ) {
$custom_restrict = apply_filters( 'um_custom_restriction', true, $restriction );
if ( ! empty( $restriction['_um_access_roles'] ) )
if ( empty( $restriction['_um_access_roles'] ) ) {
if ( $custom_restrict ) {
$this->allow_access = true;
return;
} else {
//restrict terms page by 404 for logged in users with wrong role
global $wp_query;
$wp_query->set_404();
status_header( 404 );
nocache_headers();
}
} else {
$user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] );
if ( isset( $user_can ) && $user_can && $custom_restrict ) {
$this->allow_access = true;
return;
} else {
//restrict terms page by 404 for logged in users with wrong role
global $wp_query;
$wp_query->set_404();
status_header( 404 );
nocache_headers();
if ( isset( $user_can ) && $user_can && $custom_restrict ) {
$this->allow_access = true;
return;
} else {
//restrict terms page by 404 for logged in users with wrong role
global $wp_query;
$wp_query->set_404();
status_header( 404 );
nocache_headers();
}
}
}
}
@@ -187,6 +199,7 @@ if ( ! class_exists( 'Access' ) ) {
if ( $access == 2 ) {
//global settings for accessible home page
$home_page_accessible = UM()->options()->get( 'home_page_accessible' );
if ( $home_page_accessible == 0 ) {
//get redirect URL if not set get login page by default
$redirect = UM()->options()->get( 'access_redirect' );
@@ -194,6 +207,9 @@ if ( ! class_exists( 'Access' ) ) {
$redirect = um_get_core_page( 'login' );
$this->redirect_handler = $this->set_referer( $redirect, 'global' );
} else {
$this->allow_access = true;
return;
}
}
}
@@ -212,6 +228,9 @@ if ( ! class_exists( 'Access' ) ) {
$redirect = um_get_core_page( 'login' );
$this->redirect_handler = $this->set_referer( $redirect, 'global' );
} else {
$this->allow_access = true;
return;
}
}
}
@@ -223,11 +242,13 @@ if ( ! class_exists( 'Access' ) ) {
//build exclude URLs pages
$redirects = array();
$redirects[] = untrailingslashit( UM()->options()->get( 'access_redirect' ) );
$redirects[] = trim( untrailingslashit( UM()->options()->get( 'access_redirect' ) ) );
$exclude_uris = UM()->options()->get( 'access_exclude_uris' );
if ( ! empty( $exclude_uris ) )
if ( ! empty( $exclude_uris ) ) {
$exclude_uris = array_map( 'trim', $exclude_uris );
$redirects = array_merge( $redirects, $exclude_uris );
}
$redirects = array_unique( $redirects );
@@ -235,16 +256,17 @@ if ( ! class_exists( 'Access' ) ) {
$current_url = untrailingslashit( $current_url );
$current_url_slash = trailingslashit( $current_url );
//get redirect URL if not set get login page by default
$redirect = UM()->options()->get( 'access_redirect' );
if ( ! $redirect )
$redirect = um_get_core_page( 'login' );
if ( ! isset( $post->ID ) || ! ( in_array( $current_url, $redirects ) || in_array( $current_url_slash, $redirects ) ) ) {
if ( ! ( isset( $post->ID ) && ( in_array( $current_url, $redirects ) || in_array( $current_url_slash, $redirects ) ) ) ) {
//if current page not in exclude URLs
//get redirect URL if not set get login page by default
$redirect = UM()->options()->get( 'access_redirect' );
if ( ! $redirect )
$redirect = um_get_core_page( 'login' );
$this->redirect_handler = $this->set_referer( $redirect, 'global' );
} else {
$this->redirect_handler = false;
$this->allow_access = true;
}
}
}
@@ -285,6 +307,11 @@ if ( ! class_exists( 'Access' ) ) {
//check global restrict content options
do_action( 'um_access_check_global_settings' );
/*var_dump($this->allow_access);
var_dump($this->redirect_handler);
var_dump('12345678');
exit;*/
$this->check_access();
}
@@ -475,9 +502,9 @@ if ( ! class_exists( 'Access' ) ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( ! isset( $restriction['_um_restrict_by_custom_message'] ) || '0' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = $restricted_global_message;
$post->post_content = stripslashes( $restricted_global_message );
} elseif ( '1' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? $restriction['_um_restrict_custom_message'] : '';
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? stripslashes( $restriction['_um_restrict_custom_message'] ) : '';
}
}
@@ -492,9 +519,9 @@ if ( ! class_exists( 'Access' ) ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( ! isset( $restriction['_um_restrict_by_custom_message'] ) || '0' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = $restricted_global_message;
$post->post_content = stripslashes( $restricted_global_message );
} elseif ( '1' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? $restriction['_um_restrict_custom_message'] : '';
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? stripslashes( $restriction['_um_restrict_custom_message'] ) : '';
}
$filtered_posts[] = $post;
@@ -531,13 +558,19 @@ if ( ! class_exists( 'Access' ) ) {
$custom_restrict = apply_filters( 'um_custom_restriction', true, $restriction );
if ( ! empty( $restriction['_um_access_roles'] ) )
$user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] );
if ( empty( $restriction['_um_access_roles'] ) ) {
if ( $custom_restrict ) {
$filtered_posts[] = $post;
continue;
}
} else {
$user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] );
if ( isset( $user_can ) && $user_can && $custom_restrict ) {
$filtered_posts[] = $post;
continue;
}
if ( isset( $user_can ) && $user_can && $custom_restrict ) {
$filtered_posts[] = $post;
continue;
}
}
if ( empty( $query->is_singular ) ) {
//if not single query when exclude if set _um_access_hide_from_queries
@@ -546,9 +579,9 @@ if ( ! class_exists( 'Access' ) ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( ! isset( $restriction['_um_restrict_by_custom_message'] ) || '0' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = $restricted_global_message;
$post->post_content = stripslashes( $restricted_global_message );
} elseif ( '1' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? $restriction['_um_restrict_custom_message'] : '';
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? stripslashes( $restriction['_um_restrict_custom_message'] ) : '';
}
}
@@ -563,13 +596,13 @@ if ( ! class_exists( 'Access' ) ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( ! isset( $restriction['_um_restrict_by_custom_message'] ) || '0' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = $restricted_global_message;
$post->post_content = stripslashes( $restricted_global_message );
if ( 'attachment' == $post->post_type ) {
remove_filter( 'the_content', 'prepend_attachment' );
}
} elseif ( '1' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? $restriction['_um_restrict_custom_message'] : '';
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? stripslashes( $restriction['_um_restrict_custom_message'] ) : '';
if ( 'attachment' == $post->post_type ) {
remove_filter( 'the_content', 'prepend_attachment' );
@@ -607,9 +640,9 @@ if ( ! class_exists( 'Access' ) ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( ! isset( $restriction['_um_restrict_by_custom_message'] ) || '0' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = $restricted_global_message;
$post->post_content = stripslashes( $restricted_global_message );
} elseif ( '1' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? $restriction['_um_restrict_custom_message'] : '';
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? stripslashes( $restriction['_um_restrict_custom_message'] ) : '';
}
}
@@ -624,13 +657,13 @@ if ( ! class_exists( 'Access' ) ) {
if ( ! isset( $restriction['_um_noaccess_action'] ) || '0' == $restriction['_um_noaccess_action'] ) {
if ( ! isset( $restriction['_um_restrict_by_custom_message'] ) || '0' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = $restricted_global_message;
$post->post_content = stripslashes( $restricted_global_message );
if ( 'attachment' == $post->post_type ) {
remove_filter( 'the_content', 'prepend_attachment' );
}
} elseif ( '1' == $restriction['_um_restrict_by_custom_message'] ) {
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? $restriction['_um_restrict_custom_message'] : '';
$post->post_content = ! empty( $restriction['_um_restrict_custom_message'] ) ? stripslashes( $restriction['_um_restrict_custom_message'] ) : '';
if ( 'attachment' == $post->post_type ) {
remove_filter( 'the_content', 'prepend_attachment' );
@@ -711,13 +744,19 @@ if ( ! class_exists( 'Access' ) ) {
$custom_restrict = apply_filters( 'um_custom_restriction', true, $restriction );
if ( ! empty( $restriction['_um_access_roles'] ) )
$user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] );
if ( empty( $restriction['_um_access_roles'] ) ) {
if ( $custom_restrict ) {
$filtered_items[] = $menu_item;
continue;
}
} else {
$user_can = $this->user_can( get_current_user_id(), $restriction['_um_access_roles'] );
if ( isset( $user_can ) && $user_can && $custom_restrict ) {
$filtered_items[] = $menu_item;
continue;
}
if ( isset( $user_can ) && $user_can && $custom_restrict ) {
$filtered_items[] = $menu_item;
continue;
}
}
//if not single query when exclude if set _um_access_hide_from_queries
if ( empty( $restriction['_um_access_hide_from_queries'] ) ) {
includes/core/class-ajax-common.php
+2 -19
View File
@@ -30,29 +30,12 @@ if ( ! class_exists( 'AJAX_Common' ) ) {
* Fallback for ajax urls
* @uses action hooks: wp_head, admin_head
*/
add_action( 'wp_head', array( $this, 'ultimatemember_ajax_urls' ) );
add_action( 'admin_head', array( $this, 'ultimatemember_ajax_urls' ) );
//add_action( 'wp_head', array( $this, 'ultimatemember_ajax_urls' ) );
//add_action( 'admin_head', array( $this, 'ultimatemember_ajax_urls' ) );
}
function ultimatemember_ajax_urls() {
$enable_ajax_urls = apply_filters( "um_enable_ajax_urls", true );
if ( $enable_ajax_urls ) { ?>
<script type="text/javascript">
var ultimatemember_image_upload_url = '<?php echo um_url . 'includes/lib/upload/um-image-upload.php'; ?>';
var ultimatemember_file_upload_url = '<?php echo um_url . 'includes/lib/upload/um-file-upload.php'; ?>';
var ultimatemember_ajax_url = '<?php echo admin_url('admin-ajax.php'); ?>';
</script>
<?php }
}
/**
* Router method
*/
includes/core/class-fields.php
+2719 -2718
View File
File diff suppressed because it is too large Load Diff
includes/core/class-roles-capabilities.php
+12
View File
@@ -141,6 +141,18 @@ if ( ! class_exists( 'Roles_Capabilities' ) ) {
}
/**
* Set roles to user (remove all previous roles)
* make user only with $roles roles
*
* @param int $user_id
* @param string|array $roles
*/
function set_roles( $user_id, $roles ) {
}
/**
* Get user one of UM roles if it has it
*
includes/core/um-actions-access.php
+3
View File
@@ -1,5 +1,8 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Profile Access
*
includes/core/um-actions-account.php
+2
View File
@@ -1,4 +1,6 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Validate for errors in account form
includes/core/um-actions-ajax.php
+2
View File
@@ -1,4 +1,6 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Run check if username exists
includes/core/um-actions-core.php
+2
View File
@@ -1,4 +1,6 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Processes the requests of UM actions
includes/core/um-actions-form.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Error handling: blocked emails
includes/core/um-actions-global.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @adds a form identifier to form
includes/core/um-actions-login.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Error procesing hook for login
includes/core/um-actions-members.php
+4
View File
@@ -1,4 +1,8 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Member Directory Search
*/
includes/core/um-actions-misc.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @add a force redirect to from $_get
includes/core/um-actions-password.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @process a new request
includes/core/um-actions-profile.php
+13 -2
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @um_profile_content_{main_tab}
@@ -101,8 +104,16 @@
$to_update['description'] = $args['submitted']['description'];
}
if (!empty( $args['submitted']['role'] )) {
$to_update['role'] = $args['submitted']['role'];
if ( ! empty( $args['submitted']['role'] ) ) {
global $wp_roles;
$role_keys = array_map( function( $item ) {
return 'um_' . $item;
}, get_option( 'um_roles' ) );
$exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
if ( ! in_array( $args['submitted']['role'], $exclude_roles ) ) {
$to_update['role'] = $args['submitted']['role'];
}
}
do_action( 'um_user_pre_updating_profile', $to_update );
includes/core/um-actions-register.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Account automatically approved
includes/core/um-actions-save-profile.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @profile name update
includes/core/um-actions-user.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @sync with WP role
includes/core/um-actions-wpadmin.php
+4 -1
View File
@@ -1,5 +1,8 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @checks if user can access the backend
***/
includes/core/um-filters-account.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
* Account secure fields
includes/core/um-filters-arguments.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @conditional logout form
includes/core/um-filters-avatars.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Do not apply to backend default avatars
includes/core/um-filters-commenting.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Control comment author display
includes/core/um-filters-fields.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @field is required?
includes/core/um-filters-files.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Support multisite
includes/core/um-filters-language.php
+4 -1
View File
@@ -1,4 +1,7 @@
<?php
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
add_filter("um_localize_permalink_filter","um_localize_permalink_filter",10,3);
function um_localize_permalink_filter( $core_pages, $page_id, $profile_url ){
includes/core/um-filters-login.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @filter to allow whitelisted IP to access the wp-admin login
includes/core/um-filters-members.php
+4 -1
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Members Filter Hooks
@@ -305,7 +308,7 @@
add_filter('pre_user_query','um_modify_sortby_randomly');
function um_modify_sortby_randomly( $query ){
if( um_is_session_started() === FALSE ){
if( um_is_session_started() === false ){
@session_start();
}
includes/core/um-filters-misc.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @formats numbers nicely
includes/core/um-filters-navmenu.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @add dynamic profile headers
includes/core/um-filters-profile.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @dynamic profile page title
includes/core/um-filters-user.php
+3 -1
View File
@@ -1,6 +1,8 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Main admin user actions
***/