diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php index ef725888..063a09ee 100644 --- a/includes/core/class-shortcodes.php +++ b/includes/core/class-shortcodes.php @@ -203,7 +203,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { if ( ! empty( $role ) && ! empty( $role['status'] ) ) { $message_key = $role['status'] . '_message'; - $this->custom_message = ! empty( $role[ $message_key ] ) ? stripslashes( $role[ $message_key ] ) : ''; + $this->custom_message = ! empty( $role[ $message_key ] ) ? $this->convert_user_tags( stripslashes( $role[ $message_key ] ) ) : ''; } } } @@ -1143,16 +1143,14 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { return um_convert_tags( $str, array(), false ); } - /** * Convert user tags in a string * - * @param $str + * @param string $str * - * @return mixed + * @return string */ - function convert_user_tags( $str ) { - + public function convert_user_tags( $str ) { $pattern_array = array( '{first_name}', '{last_name}', @@ -1160,89 +1158,97 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) { '{user_avatar_small}', '{username}', '{nickname}', + '{user_email}', ); - /** - * UM hook + * Filters the user placeholders patterns. * - * @type filter - * @title um_allowed_user_tags_patterns - * @description Extend user placeholders patterns - * @input_vars - * [{"var":"$patterns","type":"array","desc":"Placeholders"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * Add the `{user_description}` placeholder. * function my_allowed_user_tags( $patterns ) { - * // your code here + * $patterns[] = '{user_description}'; * return $patterns; * } - * ?> + * add_filter( 'um_allowed_user_tags_patterns', 'my_allowed_user_tags' ); */ $pattern_array = apply_filters( 'um_allowed_user_tags_patterns', $pattern_array ); - - //$matches = false; foreach ( $pattern_array as $pattern ) { - if ( preg_match( $pattern, $str ) ) { - $value = ''; + $value = ''; + $usermeta = str_replace( array( '{', '}' ), '', $pattern ); if ( is_user_logged_in() ) { - $usermeta = str_replace( '{', '', $pattern ); - $usermeta = str_replace( '}', '', $usermeta ); - - if ( $usermeta == 'user_avatar_small' ) { + if ( 'user_avatar_small' === $usermeta ) { $value = get_avatar( um_user( 'ID' ), 40 ); } elseif ( um_user( $usermeta ) ) { $value = um_user( $usermeta ); } - if ( $usermeta == 'username' ) { + if ( 'username' === $usermeta ) { $value = um_user( 'user_login' ); } - if ( $usermeta == 'nickname' ) { + if ( 'nickname' === $usermeta ) { $value = um_profile( 'nickname' ); } + if ( 'user_email' === $usermeta ) { + $value = um_user( 'user_email' ); + } + /** - * UM hook + * Filters the user placeholders value of pattern for logged-in user. * - * @type filter - * @title um_profile_tag_hook__{$usermeta} - * @description Change usermeta field value - * @input_vars - * [{"var":"$value","type":"array","desc":"Meta field value"}, - * {"var":"$user_id","type":"array","desc":"User ID"}] - * @change_log - * ["Since: 2.0"] - * @usage - * - * @example - * Add the replacement value for `{user_description}` placeholder. + * function my_user_description( $value, $user_id ) { + * $value = get_user_meta( $user_id, 'user_description', true ); * return $value; * } - * ?> + * add_filter( 'um_profile_tag_hook__user_description', 'my_user_description', 10, 2 ); */ $value = apply_filters( "um_profile_tag_hook__{$usermeta}", $value, um_user( 'ID' ) ); + } else { + /** + * Filters the user placeholders value of pattern for not logged-in user. + * + * @since 2.6.11 + * @hook um_profile_nopriv_tag_hook__{$usermeta} + * + * @param {string} $value User meta field value. + * + * @return {string} User meta field value. + * + * @example Add the replacement value for `{user_description}` placeholder for not logged-in user. + * function my_nopriv_user_description( $value ) { + * $value = ! empty( $_GET['user_description'] ) ? sanitize_text_field( $_GET['user_description'] ) : ''; + * return $value; + * } + * add_filter( 'um_profile_nopriv_tag_hook__user_description', 'my_nopriv_user_description' ); + */ + $value = apply_filters( "um_profile_nopriv_tag_hook__{$usermeta}", $value ); } $str = preg_replace( '/' . $pattern . '/', $value, $str ); } - } return $str; } - /** * Shortcode: Show custom content to specific role * diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php index 9171612b..fee265bc 100644 --- a/includes/core/um-actions-register.php +++ b/includes/core/um-actions-register.php @@ -282,6 +282,27 @@ function um_check_user_status( $user_id, $args, $form_data = null ) { // 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 ); + /** + * Filters the redirect URL for user after registration based on its status when need to show message. + * + * @since 2.6.11 + * @hook um_registration_show_message_redirect_url + * + * @param {string} $url Redirect URL. + * @param {string} $status User status. + * @param {int} $user_id User ID. + * @param {array} $form_data Form data. + * + * @return {string} Redirect URL. + * + * @example Change redirect URL for user after registration based on its status when need to show message. + * function my_um_registration_show_message_redirect_url( $url, $status, $user_id ) { + * // your code here + * return $url; + * } + * add_filter( 'um_registration_show_message_redirect_url', 'my_um_registration_show_message_redirect_url', 10, 4 ); + */ + $url = apply_filters( 'um_registration_show_message_redirect_url', $url, $status, um_user( 'ID' ), $form_data ); // Not `um_safe_redirect()` because UM()->permalinks()->get_current_url() is situated on the same host. wp_safe_redirect( $url ); exit;