- fix for registration form;

This commit is contained in:
Mykyta Synelnikov
2023-06-30 21:55:59 +03:00
parent 246de13726
commit 7fafa3a4b3
9 changed files with 373 additions and 403 deletions
+181 -186
View File
@@ -6,124 +6,121 @@ if ( ! defined( 'ABSPATH' ) ) {
/**
* Account automatically approved.
*
* @param int $user_id
* @param array $args
* @param int $user_id
*/
function um_post_registration_approved_hook( $user_id, $args ) {
function um_post_registration_approved_hook( $user_id ) {
um_fetch_user( $user_id );
UM()->user()->approve();
}
add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 2 );
add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook' );
/**
* Account needs email validation.
*
* @param int $user_id
* @param array $args
* @param int $user_id
*/
function um_post_registration_checkmail_hook( $user_id, $args ) {
function um_post_registration_checkmail_hook( $user_id ) {
um_fetch_user( $user_id );
UM()->user()->email_pending();
}
add_action( 'um_post_registration_checkmail_hook', 'um_post_registration_checkmail_hook', 10, 2 );
add_action( 'um_post_registration_checkmail_hook', 'um_post_registration_checkmail_hook' );
/**
* Account needs admin review.
*
* @param int $user_id
* @param array $args
* @param int $user_id
*/
function um_post_registration_pending_hook( $user_id, $args ) {
function um_post_registration_pending_hook( $user_id ) {
um_fetch_user( $user_id );
UM()->user()->pending();
}
add_action( 'um_post_registration_pending_hook', 'um_post_registration_pending_hook', 10, 2 );
add_action( 'um_post_registration_pending_hook', 'um_post_registration_pending_hook' );
/**
* After insert a new user
* run at frontend and backend
* After insert a new user run at frontend and backend.
*
* @param $user_id
* @param $args
* @param int|WP_Error $user_id
* @param array $args
* @param null|array $form_data It's null in case when posted from wp-admin > Add user
*/
function um_after_insert_user( $user_id, $args ) {
if ( empty( $user_id ) || ( is_object( $user_id ) && is_a( $user_id, 'WP_Error' ) ) ) {
function um_after_insert_user( $user_id, $args, $form_data = null ) {
if ( empty( $user_id ) || is_wp_error( $user_id ) ) {
return;
}
// Set usermeta from submission.
um_fetch_user( $user_id );
if ( ! empty( $args['submitted'] ) ) {
UM()->user()->set_registration_details( $args['submitted'], $args );
// It's only frontend case.
UM()->user()->set_registration_details( $args['submitted'], $args, $form_data );
}
// Set user status.
$status = um_user( 'status' );
if ( empty( $status ) ) {
um_fetch_user( $user_id );
$status = um_user( 'status' );
}
/* save user status */
UM()->user()->set_status( $status );
/* create user uploads directory */
// Create user uploads directory.
UM()->uploader()->get_upload_user_base_dir( $user_id, true );
/**
* UM hook
* Fires after insert user to DB and there you can set any extra details.
*
* @type action
* @title um_registration_set_extra_data
* @description Hook that runs after insert user to DB and there you can set any extra details
* @input_vars
* [{"var":"$user_id","type":"int","desc":"User ID"},
* {"var":"$args","type":"array","desc":"Form data"}]
* @change_log
* ["Since: 2.0"]
* @usage add_action( 'um_registration_set_extra_data', 'function_name', 10, 2 );
* @example
* <?php
* add_action( 'um_registration_set_extra_data', 'my_registration_set_extra_data', 10, 2 );
* function my_registration_set_extra_data( $user_id, $args ) {
* Internal Ultimate Member callbacks (Priority -> Callback name -> Excerpt):
* 10 - `um_registration_save_files()` Save registration files.
* 100 - `um_registration_set_profile_full_name()` Set user's full name.
*
* @since 2.0
* @hook um_registration_set_extra_data
*
* @param {int} $user_id User ID.
* @param {array} $submitted_data $_POST Submission array.
* @param {array} $form_data UM form data. Since 2.6.7
*
* @example <caption>Make any custom action after insert user to DB.</caption>
* function my_registration_set_extra_data( $user_id, $submitted_data, $form_data ) {
* // your code here
* }
* ?>
* add_action( 'um_registration_set_extra_data', 'my_registration_set_extra_data', 10, 3 );
*/
do_action( 'um_registration_set_extra_data', $user_id, $args );
do_action( 'um_registration_set_extra_data', $user_id, $args, $form_data );
/**
* UM hook
* Fires after complete UM user registration.
* Note: Native redirects handlers at 100 priority, you can add some info before redirects.
*
* @type action
* @title um_registration_complete
* @description After complete UM user registration. Redirects handlers at 100 priority, you can add some info before redirects
* @input_vars
* [{"var":"$user_id","type":"int","desc":"User ID"},
* {"var":"$args","type":"array","desc":"Form data"}]
* @change_log
* ["Since: 2.0"]
* @usage add_action( 'um_registration_complete', 'function_name', 10, 2 );
* @example
* <?php
* add_action( 'um_registration_complete', 'my_registration_complete', 10, 2 );
* function my_registration_complete( $user_id, $args ) {
* Internal Ultimate Member callbacks (Priority -> Callback name -> Excerpt):
* 10 - `um_send_registration_notification()` Send notifications.
* 100 - `um_check_user_status()` Redirect after registration based on user status.
*
* @since 2.0
* @hook um_registration_complete
*
* @param {int} $user_id User ID.
* @param {array} $submitted_data $_POST Submission array.
* @param {array} $form_data UM form data. Since 2.6.7
*
* @example <caption>Make any common action after complete UM user registration.</caption>
* function my_registration_complete( $user_id, $submitted_data, $form_data ) {
* // your code here
* }
* ?>
* add_action( 'um_registration_complete', 'my_registration_complete', 10, 3 );
*/
do_action( 'um_registration_complete', $user_id, $args );
do_action( 'um_registration_complete', $user_id, $args, $form_data );
}
add_action( 'um_user_register', 'um_after_insert_user', 1, 2 );
add_action( 'um_user_register', 'um_after_insert_user', 1, 3 );
/**
* Send notification about registration
*
* @param $user_id
* @param $args
*/
function um_send_registration_notification( $user_id, $args ) {
function um_send_registration_notification( $user_id ) {
um_fetch_user( $user_id );
$emails = um_multi_admin_email();
@@ -137,17 +134,17 @@ function um_send_registration_notification( $user_id, $args ) {
}
}
}
add_action( 'um_registration_complete', 'um_send_registration_notification', 10, 2 );
add_action( 'um_registration_complete', 'um_send_registration_notification' );
/**
* Check user status and redirect it after registration
*
* @param $user_id
* @param $args
* @param int $user_id
* @param array $args
* @param null|array $form_data
*/
function um_check_user_status( $user_id, $args ) {
function um_check_user_status( $user_id, $args, $form_data = null ) {
$status = um_user( 'account_status' );
/**
* UM hook
*
@@ -170,102 +167,102 @@ function um_check_user_status( $user_id, $args ) {
*/
do_action( "um_post_registration_{$status}_hook", $user_id, $args );
if ( ! is_admin() ) {
if ( is_null( $form_data ) || is_admin() ) {
return;
}
do_action( "track_{$status}_user_registration" );
do_action( "track_{$status}_user_registration" );
if ( $status == 'approved' ) {
// Check if user is logged in because there can be the customized way when through 'um_registration_for_loggedin_users' hook the registration is enabled for the logged in users (e.g. Administrator).
if ( ! is_user_logged_in() ) {
// Custom way if 'um_registration_for_loggedin_users' hook after custom callbacks returns true. Then don't make auto-login because user is already logged-in.
UM()->user()->auto_login( $user_id );
}
UM()->user()->generate_profile_slug( $user_id );
if ( 'approved' === $status ) {
// Check if user is logged in because there can be the customized way when through 'um_registration_for_loggedin_users' hook the registration is enabled for the logged-in users (e.g. Administrator).
if ( ! is_user_logged_in() ) {
// Custom way if 'um_registration_for_loggedin_users' hook after custom callbacks returns true. Then don't make auto-login because user is already logged-in.
UM()->user()->auto_login( $user_id );
}
UM()->user()->generate_profile_slug( $user_id );
/**
* UM hook
*
* @type action
* @title um_registration_after_auto_login
* @description After complete UM user registration and autologin.
* @input_vars
* [{"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
* @usage add_action( 'um_registration_after_auto_login', 'function_name', 10, 1 );
* @example
* <?php
* add_action( 'um_registration_after_auto_login', 'my_registration_after_auto_login', 10, 1 );
* function my_registration_after_auto_login( $user_id ) {
* // your code here
* }
* ?>
*/
do_action( 'um_registration_after_auto_login', $user_id );
// Priority redirect
if ( isset( $args['redirect_to'] ) ) {
wp_safe_redirect( urldecode( $args['redirect_to'] ) );
exit;
}
um_fetch_user( $user_id );
if ( 'redirect_url' === um_user( 'auto_approve_act' ) && '' !== um_user( 'auto_approve_url' ) ) {
wp_safe_redirect( um_user( 'auto_approve_url' ) );
exit;
}
if ( 'redirect_profile' === um_user( 'auto_approve_act' ) ) {
wp_safe_redirect( um_user_profile_url() );
exit;
}
} else {
if ( 'redirect_url' === um_user( $status . '_action' ) && '' !== um_user( $status . '_url' ) ) {
/**
* UM hook
*
* @type action
* @title um_registration_after_auto_login
* @description After complete UM user registration and autologin.
* @type filter
* @title um_registration_pending_user_redirect
* @description Change redirect URL for pending user after registration
* @input_vars
* [{"var":"$user_id","type":"int","desc":"User ID"}]
* [{"var":"$url","type":"string","desc":"Redirect URL"},
* {"var":"$status","type":"string","desc":"User status"},
* {"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
* @usage add_action( 'um_registration_after_auto_login', 'function_name', 10, 1 );
* @usage
* <?php add_filter( 'um_registration_pending_user_redirect', 'function_name', 10, 3 ); ?>
* @example
* <?php
* add_action( 'um_registration_after_auto_login', 'my_registration_after_auto_login', 10, 1 );
* function my_registration_after_auto_login( $user_id ) {
* add_filter( 'um_registration_pending_user_redirect', 'my_registration_pending_user_redirect', 10, 3 );
* function my_registration_pending_user_redirect( $url, $status, $user_id ) {
* // your code here
* return $url;
* }
* ?>
*/
do_action( 'um_registration_after_auto_login', $user_id );
// Priority redirect
if ( isset( $args['redirect_to'] ) ) {
exit( wp_safe_redirect( urldecode( $args['redirect_to'] ) ) );
}
um_fetch_user( $user_id );
if ( um_user( 'auto_approve_act' ) == 'redirect_url' && um_user( 'auto_approve_url' ) !== '' ) {
exit( wp_redirect( um_user( 'auto_approve_url' ) ) );
}
if ( um_user( 'auto_approve_act' ) == 'redirect_profile' ) {
exit( wp_redirect( um_user_profile_url() ) );
}
} else {
if ( um_user( $status . '_action' ) == 'redirect_url' && um_user( $status . '_url' ) != '' ) {
/**
* UM hook
*
* @type filter
* @title um_registration_pending_user_redirect
* @description Change redirect URL for pending user after registration
* @input_vars
* [{"var":"$url","type":"string","desc":"Redirect URL"},
* {"var":"$status","type":"string","desc":"User status"},
* {"var":"$user_id","type":"int","desc":"User ID"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_registration_pending_user_redirect', 'function_name', 10, 3 ); ?>
* @example
* <?php
* add_filter( 'um_registration_pending_user_redirect', 'my_registration_pending_user_redirect', 10, 3 );
* function my_registration_pending_user_redirect( $url, $status, $user_id ) {
* // your code here
* return $url;
* }
* ?>
*/
$redirect_url = apply_filters( 'um_registration_pending_user_redirect', um_user( $status . '_url' ), $status, um_user( 'ID' ) );
exit( wp_redirect( $redirect_url ) );
}
if ( um_user( $status . '_action' ) == 'show_message' && um_user( $status . '_message' ) != '' ) {
$url = UM()->permalinks()->get_current_url();
$url = add_query_arg( 'message', esc_attr( $status ), $url );
//add only priority role to URL
$url = add_query_arg( 'um_role', esc_attr( um_user( 'role' ) ), $url );
$url = add_query_arg( 'um_form_id', esc_attr( $args['form_id'] ), $url );
exit( wp_redirect( $url ) );
}
$redirect_url = apply_filters( 'um_registration_pending_user_redirect', um_user( $status . '_url' ), $status, um_user( 'ID' ) );
wp_safe_redirect( $redirect_url );
exit;
}
}
if ( 'show_message' === um_user( $status . '_action' ) && '' !== um_user( $status . '_message' ) ) {
$url = UM()->permalinks()->get_current_url();
$url = add_query_arg( 'message', esc_attr( $status ), $url );
// Add only priority role to URL.
$url = add_query_arg( 'um_role', esc_attr( um_user( 'role' ) ), $url );
$url = add_query_arg( 'um_form_id', esc_attr( $form_data['form_id'] ), $url );
wp_safe_redirect( $url );
exit;
}
}
}
add_action( 'um_registration_complete', 'um_check_user_status', 100, 2 );
add_action( 'um_registration_complete', 'um_check_user_status', 100, 3 );
/**
* Validate user password field on registration.
@@ -284,8 +281,9 @@ add_action( 'um_submit_form_errors_hook__registration', 'um_submit_form_errors_h
* Registration form submit handler.
*
* @param array $args
* @param array $form_data
*/
function um_submit_form_register( $args ) {
function um_submit_form_register( $args, $form_data ) {
if ( isset( UM()->form()->errors ) ) {
return;
}
@@ -299,17 +297,18 @@ function um_submit_form_register( $args ) {
* @hook um_add_user_frontend_submitted
*
* @param {array} $submitted Submitted registration data.
* @param {array} $form_data UM form data. Since 2.6.7
*
* @return {array} Extended registration data.
*
* @example <caption>Extends registration data.</caption>
* function my_add_user_frontend_submitted( $submitted ) {
* function my_add_user_frontend_submitted( $submitted, $form_data ) {
* // your code here
* return $submitted;
* }
* add_filter( 'um_add_user_frontend_submitted', 'my_add_user_frontend_submitted' );
* add_filter( 'um_add_user_frontend_submitted', 'my_add_user_frontend_submitted', 10, 2 );
*/
$args = apply_filters( 'um_add_user_frontend_submitted', $args );
$args = apply_filters( 'um_add_user_frontend_submitted', $args, $form_data );
if ( ! empty( $args['user_login'] ) ) {
$user_login = $args['user_login'];
@@ -411,6 +410,7 @@ function um_submit_form_register( $args ) {
'user_email' => trim( $user_email ),
);
// @todo test when ready maybe remove
if ( ! empty( $args['submitted'] ) ) {
$args['submitted'] = UM()->form()->clean_submitted_data( $args['submitted'] );
}
@@ -446,17 +446,18 @@ function um_submit_form_register( $args ) {
*
* @param {string} $user_role User role.
* @param {array} $args Registration data.
* @param {array} $form_data UM form data. Since 2.6.7
*
* @return {string} User role.
*
* @example <caption>Change user role on registration process.</caption>
* function my_registration_user_role( $user_role, $args ) {
* function my_registration_user_role( $user_role, $args, $form_data ) {
* // your code here
* return $user_role;
* }
* add_filter( 'um_registration_user_role', 'my_registration_user_role', 10, 2 );
* add_filter( 'um_registration_user_role', 'my_registration_user_role', 10, 3 );
*/
$user_role = apply_filters( 'um_registration_user_role', $user_role, $args );
$user_role = apply_filters( 'um_registration_user_role', $user_role, $args, $form_data );
$userdata = array(
'user_login' => $user_login,
@@ -466,25 +467,32 @@ function um_submit_form_register( $args ) {
);
$user_id = wp_insert_user( $userdata );
if ( is_wp_error( $user_id ) ) {
return;
}
/**
* Fires after complete UM user registration.
*
* Internal Ultimate Member callbacks (Priority -> Callback name -> Excerpt):
* 1 - `um_after_insert_user()` Make all Ultimate Member data set and actions after user registration|added via wp-admin.
*
* @since 2.0
* @hook um_user_register
*
* @param {int} $user_id User ID.
* @param {array} $args Form data.
* @param {int} $user_id User ID.
* @param {array} $args Form data.
* @param {array} $form_data UM form data. Since 2.6.7
*
* @example <caption>Make any custom action after complete UM user registration.</caption>
* function my_um_user_register( $user_id, $args ) {
* function my_um_user_register( $user_id, $args, $form_data ) {
* // your code here
* }
* add_action( 'um_user_register', 'my_um_user_register', 10, 2 );
* add_action( 'um_user_register', 'my_um_user_register', 10, 3 );
*/
do_action( 'um_user_register', $user_id, $args );
do_action( 'um_user_register', $user_id, $args, $form_data );
}
add_action( 'um_submit_form_register', 'um_submit_form_register' );
add_action( 'um_submit_form_register', 'um_submit_form_register', 10, 2 );
/**
* Show the submit button
@@ -615,36 +623,29 @@ function um_add_register_fields( $args ){
}
add_action( 'um_main_register_fields', 'um_add_register_fields', 100 );
/**
* Saving files to register a new user, if there are fields with files
* Saving files to register a new user, if there are fields with files.
*
* @param $user_id
* @param $args
* @param $form_data
*/
function um_registration_save_files( $user_id, $args ) {
if ( empty( $args['custom_fields'] ) ) {
function um_registration_save_files( $user_id, $args, $form_data ) {
if ( empty( $args['submitted'] ) ) {
// It's only frontend case.
return;
}
$files = array();
$fields = unserialize( $args['custom_fields'] );
// loop through fields
if ( isset( $fields ) && is_array( $fields ) ) {
$fields = maybe_unserialize( $form_data['custom_fields'] );
if ( ! empty( $fields ) && is_array( $fields ) ) {
foreach ( $fields as $key => $array ) {
if ( isset( $args['submitted'][ $key ] ) ) {
if ( isset( $fields[ $key ]['type'] ) && in_array( $fields[ $key ]['type'], array( 'image', 'file' ) ) &&
( um_is_temp_file( $args['submitted'][ $key ] ) || $args['submitted'][ $key ] == 'empty_file' )
if ( isset( $array['type'] ) && in_array( $array['type'], array( 'image', 'file' ), true ) &&
( um_is_temp_file( $args['submitted'][ $key ] ) || 'empty_file' === $args['submitted'][ $key ] )
) {
$files[ $key ] = $args['submitted'][ $key ];
}
}
}
@@ -679,7 +680,7 @@ function um_registration_save_files( $user_id, $args ) {
UM()->uploader()->replace_upload_dir = false;
}
}
add_action( 'um_registration_set_extra_data', 'um_registration_save_files', 10, 2 );
add_action( 'um_registration_set_extra_data', 'um_registration_save_files', 10, 3 );
/**
@@ -692,35 +693,29 @@ add_action( 'um_registration_set_extra_data', 'um_registration_save_files', 10,
*/
function um_registration_set_profile_full_name( $user_id, $args ) {
/**
* UM hook
* Fires for updating user profile full name.
*
* @type action
* @title um_update_profile_full_name
* @description On update user profile change full name
* @input_vars
* [{"var":"$user_id","type":"int","desc":"User ID"},
* {"var":"$args","type":"array","desc":"Form data"}]
* @change_log
* ["Since: 2.0"]
* @usage add_action( 'um_update_profile_full_name', 'function_name', 10, 2 );
* @example
* <?php
* add_action( 'um_update_profile_full_name', 'my_update_profile_full_name', 10, 2 );
* function my_update_profile_full_name( $user_id, $args ) {
* @since 1.3.x
* @hook um_registration_set_extra_data
*
* @param {int} $user_id User ID.
* @param {array} $submitted_data $_POST Submission array.
*
* @example <caption>Make any custom action when updating user profile full name.</caption>
* function my_registration_set_extra_data( $user_id, $submitted_data ) {
* // your code here
* }
* ?>
* add_action( 'um_update_profile_full_name', 'my_update_profile_full_name', 10, 2 );
*/
do_action( 'um_update_profile_full_name', $user_id, $args );
}
add_action( 'um_registration_set_extra_data', 'um_registration_set_profile_full_name', 10, 2 );
/**
* Redirect from default registration to UM registration page
*/
function um_form_register_redirect() {
$page_id = UM()->options()->get( UM()->options()->get_core_page_id( 'register' ) );
$page_id = UM()->options()->get( UM()->options()->get_core_page_id( 'register' ) );
$register_post = get_post( $page_id );
if ( ! empty( $register_post ) ) {
wp_safe_redirect( get_permalink( $page_id ) );