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

- wp-admin assets refactoring (in process);

Browse Source
This commit is contained in:
Mykyta Synelnikov
2023-11-03 17:31:18 +02:00
parent ac2d64ff49
commit b40edd26e6
281 changed files with 7279 additions and 11667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-ajax-common.php
+4 -4
View File
@@ -48,13 +48,13 @@ if ( ! class_exists( 'um\core\AJAX_Common' ) ) {
add_action( 'wp_ajax_um_remove_file', array( UM()->files(), 'ajax_remove_file' ) );
add_action( 'wp_ajax_nopriv_um_remove_file', array( UM()->files(), 'ajax_remove_file' ) );
add_action( 'wp_ajax_nopriv_um_fileupload', array( UM()->files(), 'ajax_file_upload' ) );
add_action( 'wp_ajax_um_fileupload', array( UM()->files(), 'ajax_file_upload' ) );
add_action( 'wp_ajax_nopriv_um_imageupload', array( UM()->files(), 'ajax_image_upload' ) );
add_action( 'wp_ajax_um_imageupload', array( UM()->files(), 'ajax_image_upload' ) );
add_action( 'wp_ajax_nopriv_um_resize_image', array( UM()->files(), 'ajax_resize_image' ) );
add_action( 'wp_ajax_um_resize_image', array( UM()->files(), 'ajax_resize_image' ) );
@@ -62,4 +62,4 @@ if ( ! class_exists( 'um\core\AJAX_Common' ) ) {
add_action( 'wp_ajax_um_get_members', array( UM()->member_directory(), 'ajax_get_members' ) );
}
}
}
}
includes/core/class-files.php
+1 -6
View File
@@ -259,11 +259,10 @@ if ( ! class_exists( 'um\core\Files' ) ) {
exit;
}
/**
* Remove file by AJAX
*/
function ajax_remove_file() {
public function ajax_remove_file() {
UM()->check_ajax_nonce();
if ( empty( $_POST['src'] ) ) {
@@ -283,14 +282,11 @@ if ( ! class_exists( 'um\core\Files' ) ) {
$mode = sanitize_key( $_POST['mode'] );
if ( $mode == 'register' || empty( $_POST['user_id'] ) ) {
$is_temp = um_is_temp_upload( $src );
if ( ! $is_temp ) {
wp_send_json_success();
}
} else {
$user_id = absint( $_POST['user_id'] );
if ( ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
@@ -303,7 +299,6 @@ if ( ! class_exists( 'um\core\Files' ) ) {
wp_send_json_success();
}
}
}
if ( $this->delete_file( $src ) ) {
includes/core/class-form.php
+4 -3
View File
@@ -65,11 +65,12 @@ if ( ! class_exists( 'um\core\Form' ) ) {
public $usermeta_whitelist = array();
/**
* Form constructor.
* Hook for singleton
* @since 2.7.1
*/
public function __construct() {
public function hooks() {
add_action( 'template_redirect', array( &$this, 'form_init' ), 2 );
add_action( 'init', array( &$this, 'field_declare' ), 10 );
add_action( 'init', array( &$this, 'field_declare' ) );
}
/**
includes/core/class-roles-capabilities.php
+23 -25
View File
@@ -741,54 +741,52 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
return $return;
}
/**
* User can ( role settings )
* User can (role settings)
*
* @param $permission
* @return bool|mixed
*/
function um_user_can( $permission ) {
if ( ! is_user_logged_in() )
public function um_user_can( $permission ) {
if ( ! is_user_logged_in() ) {
return false;
}
$user_id = get_current_user_id();
$role = UM()->roles()->get_priority_user_role( $user_id );
$role = UM()->roles()->get_priority_user_role( $user_id );
$permissions = $this->role_data( $role );
/**
* UM hook
* Filters User Permissions.
*
* @type filter
* @title um_user_permissions_filter
* @description Change User Permissions
* @input_vars
* [{"var":"$permissions","type":"array","desc":"User Permissions"},
* {"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_user_permissions_filter', 'function_name', 10, 2 ); ?>
* @example
* <?php
* add_filter( 'um_user_permissions_filter', 'my_user_permissions', 10, 2 );
* @param {array} $permissions User Permissions.
* @param {int} $user_id User ID.
*
* @return {array} User Permissions.
*
* @since 2.0
* @hook um_user_permissions_filter
*
* @example <caption>Add custom user permissions.</caption>
* function my_user_permissions( $permissions, $user_id ) {
* // your code here
* return $permissions;
* }
* ?>
* add_filter( 'um_user_permissions_filter', 'my_user_permissions', 10, 2 );
*/
$permissions = apply_filters( 'um_user_permissions_filter', $permissions, $user_id );
if ( isset( $permissions[ $permission ] ) && is_serialized( $permissions[ $permission ] ) )
return unserialize( $permissions[ $permission ] );
if ( isset( $permissions[ $permission ] ) && is_serialized( $permissions[ $permission ] ) ) {
return maybe_unserialize( $permissions[ $permission ] );
}
if ( isset( $permissions[ $permission ] ) && is_array( $permissions[ $permission ] ) )
if ( isset( $permissions[ $permission ] ) && is_array( $permissions[ $permission ] ) ) {
return $permissions[ $permission ];
}
if ( isset( $permissions[ $permission ] ) && $permissions[ $permission ] == 1 )
if ( isset( $permissions[ $permission ] ) && $permissions[ $permission ] == 1 ) {
return true;
}
return false;
}
includes/core/class-shortcodes.php
+6 -6
View File
@@ -242,15 +242,14 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
}
}
/**
* Extend body classes
* Extend body classes.
*
* @param $classes
* @param array $classes
*
* @return array
*/
function body_class( $classes ) {
public function body_class( $classes ) {
$array = UM()->config()->permalinks;
if ( ! $array ) {
return $classes;
@@ -258,7 +257,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
foreach ( $array as $slug => $info ) {
if ( um_is_core_page( $slug ) ) {
$classes[] = 'um';
$classes[] = 'um-page-' . $slug;
if ( is_user_logged_in() ) {
@@ -266,7 +265,6 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
} else {
$classes[] = 'um-page-loggedout';
}
}
}
@@ -673,6 +671,8 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
return '';
}
UM()->fields()->set_id = absint( $this->form_id );
// get data into one global array
$post_data = UM()->query()->post_data( $this->form_id );
$args = array_merge( $args, $post_data );
includes/core/class-user.php
+4 -56
View File
@@ -1164,14 +1164,12 @@ if ( ! class_exists( 'um\core\User' ) ) {
return $new;
}
/**
* @param $user_id
*
* @return mixed|string
*/
function get_cached_data( $user_id ) {
public function get_cached_data( $user_id ) {
$disallow_cache = UM()->options()->get( 'um_profile_object_cache_stop' );
if ( $disallow_cache ) {
return '';
@@ -1180,30 +1178,8 @@ if ( ! class_exists( 'um\core\User' ) ) {
if ( is_numeric( $user_id ) && $user_id > 0 ) {
$find_user = get_option( "um_cache_userdata_{$user_id}" );
if ( $find_user ) {
/**
* UM hook
*
* @type filter
* @title um_user_permissions_filter
* @description Change User Permissions
* @input_vars
* [{"var":"$permissions","type":"array","desc":"User Permissions"},
* {"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_user_permissions_filter', 'function_name', 10, 2 ); ?>
* @example
* <?php
* add_filter( 'um_user_permissions_filter', 'my_user_permissions', 10, 2 );
* function my_user_permissions( $permissions, $user_id ) {
* // your code here
* return $permissions;
* }
* ?>
*/
$find_user = apply_filters( 'um_user_permissions_filter', $find_user, $user_id );
return $find_user;
/** This filter is documented in includes/core/class-roles-capabilities.php */
return apply_filters( 'um_user_permissions_filter', $find_user, $user_id );
}
}
return '';
@@ -1354,37 +1330,9 @@ if ( ! class_exists( 'um\core\User' ) ) {
$this->profile['roles'] = UM()->roles()->get_all_user_roles( $this->id );
$role_meta = UM()->roles()->role_data( $user_role );
/**
* UM hook
*
* @type filter
* @title um_user_permissions_filter
* @description Change User Permissions
* @input_vars
* [{"var":"$permissions","type":"array","desc":"User Permissions"},
* {"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_user_permissions_filter', 'function_name', 10, 2 ); ?>
* @example
* <?php
* add_filter( 'um_user_permissions_filter', 'my_user_permissions', 10, 2 );
* function my_user_permissions( $permissions, $user_id ) {
* // your code here
* return $permissions;
* }
* ?>
*/
/** This filter is documented in includes/core/class-roles-capabilities.php */
$role_meta = apply_filters( 'um_user_permissions_filter', $role_meta, $this->id );
/*$role_meta = array_map( function( $key, $item ) {
if ( strpos( $key, '_um_' ) === 0 )
$key = str_replace( '_um_', '', $key );
return array( $key => $item );
}, array_keys( $role_meta ), $role_meta );*/
$this->profile = array_merge( $this->profile, (array) $role_meta );
$this->profile['super_admin'] = ( is_super_admin( $this->id ) ) ? 1 : 0;
includes/core/um-actions-profile.php
+2
View File
@@ -1411,6 +1411,8 @@ function um_pre_profile_shortcode( $args ) {
}
}
}
UM()->fields()->set_mode = 'profile';
}
add_action( 'um_pre_profile_shortcode', 'um_pre_profile_shortcode' );