From be70ef5a66766b72c861db42145e371c9264466b Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 10:21:49 +0300
Subject: [PATCH 01/37] - fix um_profile_content_main()

---
 includes/core/um-actions-profile.php | 176 +++++++++++----------------
 1 file changed, 72 insertions(+), 104 deletions(-)

diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index f5cd85a0..999bb157 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -1,4 +1,6 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+<?php if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
 
 
 /**
@@ -8,163 +10,129 @@
  */
 function um_profile_content_main( $args ) {
 
-	/**
-	 * @var $mode
-	 */
-	extract( $args );
+	if ( ! array_key_exists( 'mode', $args ) ) {
+		return;
+	}
+	$mode = $args['mode'];
 
-	if ( ! UM()->options()->get( 'profile_tab_main' ) && ! isset( $_REQUEST['um_action'] ) ) {
+	if ( ! UM()->options()->get( 'profile_tab_main' ) && ! isset( $_REQUEST['um_action'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 		return;
 	}
 
 	/**
-	 * UM hook
+	 * Filters check user can view profile
 	 *
-	 * @type filter
-	 * @title um_profile_can_view_main
-	 * @description Check user can view profile
-	 * @input_vars
-	 * [{"var":"$view","type":"bool","desc":"Can view?"},
-	 * {"var":"$user_id","type":"int","desc":"User profile ID"}]
-	 * @change_log
-	 * ["Since: 2.0"]
-	 * @usage
-	 * <?php add_filter( 'um_profile_can_view_main', 'function_name', 10, 2 ); ?>
-	 * @example
-	 * <?php
-	 * add_filter( 'um_profile_can_view_main', 'my_profile_can_view_main', 10, 2 );
-	 * function my_profile_can_view_main( $view, $user_id ) {
+	 * @since 2.0
+	 * @hook  um_profile_can_view_main
+	 *
+	 * @param {int}  $can_view Can view profile.
+	 * @param {int}  $user_id  User ID.
+	 *
+	 * @return {int} Can view profile.
+	 *
+	 * @example <caption>Can view profile.</caption>
+	 * function my_profile_can_view_main( $can_view, $user_id ) {
 	 *     // your code here
-	 *     return $view;
+	 *     return $can_view;
 	 * }
-	 * ?>
+	 * add_filter( 'um_profile_can_view_main', 'my_profile_can_view_main', 10, 2 );
 	 */
 	$can_view = apply_filters( 'um_profile_can_view_main', -1, um_profile_id() );
 
-	if ( $can_view == -1 ) {
+	if ( -1 === (int) $can_view ) {
 		/**
-		 * UM hook
+		 * Fires before form.
 		 *
-		 * @type action
-		 * @title um_before_form
-		 * @description Some actions before profile form
-		 * @input_vars
-		 * [{"var":"$args","type":"array","desc":"Profile form shortcode arguments"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_action( 'um_before_form', 'function_name', 10, 1 );
-		 * @example
-		 * <?php
-		 * add_action( 'um_before_form', 'my_before_form', 10, 1 );
+		 * @since 2.0
+		 * @hook  um_before_form
+		 *
+		 * @param {array} $args Profile form shortcode arguments.
+		 *
+		 * @example <caption>Make any custom action before form.</caption>
 		 * function my_before_form( $args ) {
 		 *     // your code here
 		 * }
-		 * ?>
+		 * add_action( 'um_before_form', 'my_before_form', 10, 1 );
 		 */
 		do_action( 'um_before_form', $args );
 
 		/**
-		 * UM hook
+		 * Fires before profile form fields.
 		 *
-		 * @type action
-		 * @title um_before_{$mode}_fields
-		 * @description Some actions before profile form fields
-		 * @input_vars
-		 * [{"var":"$args","type":"array","desc":"{Profile} form shortcode arguments"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 );
-		 * @example
-		 * <?php
-		 * add_action( 'um_before_{$mode}_fields', 'my_before_fields', 10, 1 );
-		 * function my_before_form( $args ) {
+		 * @since 2.0
+		 * @hook  um_before_{$mode}_fields
+		 *
+		 * @param {array} $args Profile form shortcode arguments.
+		 *
+		 * @example <caption>Make any custom action before fields.</caption>
+		 * function my_before_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * ?>
+		 * add_action( 'um_before_{$mode}_fields', 'my_before_fields', 10, 1 );
 		 */
 		do_action( "um_before_{$mode}_fields", $args );
 
 		/**
-		 * UM hook
+		 * Fires before login form fields.
 		 *
-		 * @type action
-		 * @title um_main_{$mode}_fields
-		 * @description Some actions before login form fields
-		 * @input_vars
-		 * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_action( 'um_before_{$mode}_fields', 'function_name', 10, 1 );
-		 * @example
-		 * <?php
-		 * add_action( 'um_before_{$mode}_fields', 'my_before_fields', 10, 1 );
+		 * @since 2.0
+		 * @hook  um_main_{$mode}_fields
+		 *
+		 * @param {array} $args Login form shortcode arguments.
+		 *
+		 * @example <caption>Make any custom action before login form fields.</caption>
 		 * function my_before_form( $args ) {
 		 *     // your code here
 		 * }
-		 * ?>
+		 * add_action( 'um_main_{$mode}_fields', 'my_before_form', 10, 1 );
 		 */
 		do_action( "um_main_{$mode}_fields", $args );
 
 		/**
-		 * UM hook
+		 * Fires after login form fields.
 		 *
-		 * @type action
-		 * @title um_after_form_fields
-		 * @description Some actions after login form fields
-		 * @input_vars
-		 * [{"var":"$args","type":"array","desc":"Login form shortcode arguments"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_action( 'um_after_form_fields', 'function_name', 10, 1 );
-		 * @example
-		 * <?php
-		 * add_action( 'um_after_form_fields', 'my_after_form_fields', 10, 1 );
+		 * @since 2.0
+		 * @hook  um_after_form_fields
+		 *
+		 * @param {array} $args Login form shortcode arguments.
+		 *
+		 * @example <caption>Make any custom action after login form fields.</caption>
 		 * function my_after_form_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * ?>
+		 * add_action( 'um_after_form_fields', 'my_after_form_fields', 10, 1 );
 		 */
 		do_action( 'um_after_form_fields', $args );
 
 		/**
-		 * UM hook
+		 * Fires after profile form fields.
 		 *
-		 * @type action
-		 * @title um_after_{$mode}_fields
-		 * @description Some actions after profile form fields
-		 * @input_vars
-		 * [{"var":"$args","type":"array","desc":"Profile form shortcode arguments"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_action( 'um_after_{$mode}_fields', 'function_name', 10, 1 );
-		 * @example
-		 * <?php
-		 * add_action( 'um_after_{$mode}_fields', 'my_after_form_fields', 10, 1 );
+		 * @since 2.0
+		 * @hook  um_after_{$mode}_fields
+		 *
+		 * @param {array} $args Profile form shortcode arguments.
+		 *
+		 * @example <caption>Make any custom action after profile form fields.</caption>
 		 * function my_after_form_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * ?>
+		 * add_action( 'um_after_{$mode}_fields', 'my_after_form_fields', 10, 1 );
 		 */
 		do_action( "um_after_{$mode}_fields", $args );
 
 		/**
-		 * UM hook
+		 * Fires after profile form fields.
 		 *
-		 * @type action
-		 * @title um_after_form
-		 * @description Some actions after profile form fields
-		 * @input_vars
-		 * [{"var":"$args","type":"array","desc":"Profile form shortcode arguments"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage add_action( 'um_after_form', 'function_name', 10, 1 );
-		 * @example
-		 * <?php
-		 * add_action( 'um_after_form', 'my_after_form', 10, 1 );
+		 * @since 2.0
+		 * @hook  my_after_form
+		 *
+		 * @param {array} $args Profile form shortcode arguments.
+		 *
+		 * @example <caption>Make any custom action after profile form fields.</caption>
 		 * function my_after_form( $args ) {
 		 *     // your code here
 		 * }
-		 * ?>
+		 * add_action( 'my_after_form', 'my_after_form', 10, 1 );
 		 */
 		do_action( 'um_after_form', $args );
 
@@ -173,7 +141,7 @@ function um_profile_content_main( $args ) {
 		<div class="um-profile-note">
 			<span>
 				<i class="um-faicon-lock"></i>
-				<?php echo $can_view; ?>
+				<?php echo esc_html( $can_view ); ?>
 			</span>
 		</div>
 		<?php

From fe07261c1553acf96059f0791fc3ef8ba92485de Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 10:47:03 +0300
Subject: [PATCH 02/37] - fix um_user_login()

---
 includes/core/um-actions-login.php | 55 ++++++++++++------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/includes/core/um-actions-login.php b/includes/core/um-actions-login.php
index 3c4ae9b7..eeb48526 100644
--- a/includes/core/um-actions-login.php
+++ b/includes/core/um-actions-login.php
@@ -197,39 +197,32 @@ add_action( 'wp_login', 'um_store_lastlogin_timestamp_' );
  * @param array $args
  */
 function um_user_login( $args ) {
-	extract( $args );
+	$rememberme = ( isset( $args['rememberme'] ) && 1 === (int) $args['rememberme'] && isset( $_REQUEST['rememberme'] ) ) ? 1 : 0; // phpcs:ignore WordPress.Security.NonceVerification
 
-	$rememberme = ( isset( $args['rememberme'] ) && 1 == $args['rememberme'] && isset( $_REQUEST['rememberme'] ) ) ? 1 : 0;
-
-	if ( ( UM()->options()->get( 'deny_admin_frontend_login' ) && ! isset( $_GET['provider'] ) ) && strrpos( um_user('wp_roles' ), 'administrator' ) !== false ) {
+	if ( ( UM()->options()->get( 'deny_admin_frontend_login' ) && ! isset( $_GET['provider'] ) ) && strrpos( um_user( 'wp_roles' ), 'administrator' ) !== false ) { // phpcs:ignore WordPress.Security.NonceVerification
 		wp_die( esc_html__( 'This action has been prevented for security measures.', 'ultimate-member' ) );
 	}
 
 	UM()->user()->auto_login( um_user( 'ID' ), $rememberme );
 
 	/**
-	 * UM hook
+	 * Fires after successful login and before user is redirected.
 	 *
-	 * @type action
-	 * @title um_on_login_before_redirect
-	 * @description Hook that runs after successful login and before user is redirected
-	 * @input_vars
-	 * [{"var":"$user_id","type":"int","desc":"User ID"}]
-	 * @change_log
-	 * ["Since: 2.0"]
-	 * @usage add_action( 'um_on_login_before_redirect', 'function_name', 10, 1 );
-	 * @example
-	 * <?php
-	 * add_action( 'um_on_login_before_redirect', 'my_on_login_before_redirect', 10, 1 );
+	 * @since 2.0
+	 * @hook  um_on_login_before_redirect
+	 *
+	 * @param {int} $user_id User ID.
+	 *
+	 * @example <caption>Make any custom action after successful login and before user is redirected.</caption>
 	 * function my_on_login_before_redirect( $user_id ) {
 	 *     // your code here
 	 * }
-	 * ?>
+	 * add_action( 'um_on_login_before_redirect', 'my_on_login_before_redirect', 10, 1 );
 	 */
 	do_action( 'um_on_login_before_redirect', um_user( 'ID' ) );
 
 	// Priority redirect
-	if ( ! empty( $args['redirect_to']  ) ) {
+	if ( ! empty( $args['redirect_to'] ) ) {
 		exit( wp_safe_redirect( $args['redirect_to'] ) );
 	}
 
@@ -247,26 +240,22 @@ function um_user_login( $args ) {
 
 		case 'redirect_url':
 			/**
-			 * UM hook
+			 * Filters change redirect URL after successful login
 			 *
-			 * @type filter
-			 * @title um_login_redirect_url
-			 * @description Change redirect URL after successful login
-			 * @input_vars
-			 * [{"var":"$url","type":"string","desc":"Redirect URL"},
-			 * {"var":"$id","type":"int","desc":"User ID"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_login_redirect_url', 'function_name', 10, 2 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_login_redirect_url', 'my_login_redirect_url', 10, 2 );
+			 * @since 2.0
+			 * @hook  um_profile_can_view_main
+			 *
+			 * @param {string} $can_view Redirect URL.
+			 * @param {int}    $user_id  User ID.
+			 *
+			 * @return {string} Redirect URL.
+			 *
+			 * @example <caption>Change redirect URL.</caption>
 			 * function my_login_redirect_url( $url, $id ) {
 			 *     // your code here
 			 *     return $url;
 			 * }
-			 * ?>
+			 * add_filter( 'um_login_redirect_url', 'my_login_redirect_url', 10, 2 );
 			 */
 			$redirect_url = apply_filters( 'um_login_redirect_url', um_user( 'login_redirect_url' ), um_user( 'ID' ) );
 			exit( wp_redirect( $redirect_url ) );

From d6e96e4fd63a9491e1569c106f4177353bdd965d Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 11:04:59 +0300
Subject: [PATCH 03/37] - fix um_add_update_notice()

---
 includes/core/um-actions-misc.php | 66 +++++++++++++------------------
 1 file changed, 28 insertions(+), 38 deletions(-)

diff --git a/includes/core/um-actions-misc.php b/includes/core/um-actions-misc.php
index faf1a977..c5744df3 100644
--- a/includes/core/um-actions-misc.php
+++ b/includes/core/um-actions-misc.php
@@ -73,38 +73,32 @@ add_action( 'um_after_form_fields', 'um_browser_url_redirect_to' );
  * @param $args
  */
 function um_add_update_notice( $args ) {
-	extract( $args );
-
 	$output  = '';
 	$err     = '';
 	$success = '';
 
-	if ( ! empty( $_REQUEST['updated'] ) && ! UM()->form()->errors ) {
-		switch ( sanitize_key( $_REQUEST['updated'] ) ) {
+	if ( ! empty( $_REQUEST['updated'] ) && ! UM()->form()->errors ) { // phpcs:ignore WordPress.Security.NonceVerification
+		switch ( sanitize_key( $_REQUEST['updated'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 			default:
 				/**
-				 * UM hook
+				 * Filters add custom success message
 				 *
-				 * @type filter
-				 * @title um_custom_success_message_handler
-				 * @description Add custom success message
-				 * @input_vars
-				 * [{"var":"$success","type":"string","desc":"Message"},
-				 * {"var":"$updated","type":"array","desc":"Updated data"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage
-				 * <?php add_filter( 'um_custom_success_message_handler', 'function_name', 10, 2 ); ?>
-				 * @example
-				 * <?php
-				 * add_filter( 'um_custom_success_message_handler', 'my_custom_success_message', 10, 2 );
+				 * @since 2.0
+				 * @hook  um_custom_success_message_handler
+				 *
+				 * @param {string}  $success  Message.
+				 * @param {array}   $updated  Updated data.
+				 *
+				 * @return {string} Message.
+				 *
+				 * @example <caption>Can view profile.</caption>
 				 * function my_custom_success_message( $success, $updated ) {
 				 *     // your code here
 				 *     return $success;
 				 * }
-				 * ?>
+				 * add_filter( 'um_custom_success_message_handler', 'my_custom_success_message', 10, 2 );
 				 */
-				$success = apply_filters( 'um_custom_success_message_handler', $success, sanitize_key( $_REQUEST['updated'] ) );
+				$success = apply_filters( 'um_custom_success_message_handler', $success, sanitize_key( $_REQUEST['updated'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
 				break;
 
 			case 'account':
@@ -122,33 +116,29 @@ function um_add_update_notice( $args ) {
 		}
 	}
 
-	if ( ! empty( $_REQUEST['err'] ) && ! UM()->form()->errors ) {
-		switch( sanitize_key( $_REQUEST['err'] ) ) {
+	if ( ! empty( $_REQUEST['err'] ) && ! UM()->form()->errors ) { // phpcs:ignore WordPress.Security.NonceVerification
+		switch ( sanitize_key( $_REQUEST['err'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 
 			default:
 				/**
-				 * UM hook
+				 * Filters add custom error message
 				 *
-				 * @type filter
-				 * @title um_custom_error_message_handler
-				 * @description Add custom error message
-				 * @input_vars
-				 * [{"var":"$error","type":"string","desc":"Error message"},
-				 * {"var":"$request_error","type":"array","desc":"Error data"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage
-				 * <?php add_filter( 'um_custom_error_message_handler', 'function_name', 10, 2 ); ?>
-				 * @example
-				 * <?php
-				 * add_filter( 'um_custom_error_message_handler', 'my_custom_error_message', 10, 2 );
+				 * @since 2.0
+				 * @hook  um_custom_error_message_handler
+				 *
+				 * @param {string}  $success  Error message.
+				 * @param {array}   $updated  Error data.
+				 *
+				 * @return {string} Error message.
+				 *
+				 * @example <caption>Can view profile.</caption>
 				 * function my_custom_error_message( $error, $request_error ) {
 				 *     // your code here
 				 *     return $error;
 				 * }
-				 * ?>
+				 * add_filter( 'um_custom_error_message_handler', 'my_custom_error_message', 10, 2 );
 				 */
-				$err = apply_filters( 'um_custom_error_message_handler', $err, sanitize_key( $_REQUEST['err'] ) );
+				$err = apply_filters( 'um_custom_error_message_handler', $err, sanitize_key( $_REQUEST['err'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
 				if ( ! $err ) {
 					$err = __( 'An error has been encountered', 'ultimate-member' );
 				}

From 915ec79bd10e209a0976b85dd802c6f719cb3fa7 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 11:19:44 +0300
Subject: [PATCH 04/37] - fix um_pre_profile_shortcode()

---
 includes/core/um-actions-profile.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 999bb157..febbb555 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -1340,12 +1340,12 @@ add_action( 'um_profile_header', 'um_profile_header', 9 );
  * @param $args
  */
 function um_pre_profile_shortcode( $args ) {
-	/**
-	 * @var $mode
-	 */
-	extract( $args );
+	if ( ! array_key_exists( 'mode', $args ) ) {
+		return;
+	}
+	$mode = $args['mode'];
 
-	if ( $mode == 'profile' ) {
+	if ( 'profile' === $mode ) {
 		if ( UM()->fields()->editing ) {
 			if ( um_get_requested_user() ) {
 				if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {

From 07fc2592bf07b1613606e9d0b31093da41aa3116 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 12:21:55 +0300
Subject: [PATCH 05/37] - fix um_submit_form_register()

---
 includes/core/um-actions-register.php | 169 ++++++++++++--------------
 1 file changed, 79 insertions(+), 90 deletions(-)

diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php
index 793feb16..e83af67f 100644
--- a/includes/core/um-actions-register.php
+++ b/includes/core/um-actions-register.php
@@ -291,57 +291,54 @@ function um_submit_form_register( $args ) {
 	}
 
 	/**
-	 * UM hook
+	 * Filters extend user data on registration form submit
 	 *
-	 * @type filter
-	 * @title um_add_user_frontend_submitted
-	 * @description Extend user data on registration form submit
-	 * @input_vars
-	 * [{"var":"$submitted","type":"array","desc":"Registration data"}]
-	 * @change_log
-	 * ["Since: 2.0"]
-	 * @usage
-	 * <?php add_filter( 'um_add_user_frontend_submitted', 'function_name', 10, 1 ); ?>
-	 * @example
-	 * <?php
-	 * add_filter( 'um_add_user_frontend_submitted', 'my_add_user_frontend_submitted', 10, 1 );
-	 * function my_add_user_frontend_submitted( $submitted ) {
+	 * @since 2.0
+	 * @hook  um_add_user_frontend_submitted
+	 *
+	 * @param {array}  $success  Registration data.
+	 *
+	 * @return {array} Registration data.
+	 *
+	 * @example <caption>Registration data.</caption>
+	 * function my_add_user_frontend_submitted( $success, $updated ) {
 	 *     // your code here
 	 *     return $submitted;
 	 * }
-	 * ?>
+	 * add_filter( 'um_add_user_frontend_submitted', 'my_add_user_frontend_submitted', 10, 2 );
 	 */
 	$args = apply_filters( 'um_add_user_frontend_submitted', $args );
 
-	extract( $args );
-
-	if ( ! empty( $username ) && empty( $user_login ) ) {
-		$user_login = $username;
+	if ( ! empty( $args['user_login'] ) ) {
+		$user_login = $args['user_login'];
+	}
+	if ( ! empty( $args['username'] ) && empty( $args['user_login'] ) ) {
+		$user_login = $args['username'];
 	}
 
-	if ( ! empty( $first_name ) && ! empty( $last_name ) && empty( $user_login ) ) {
+	if ( ! empty( $args['first_name'] ) && ! empty( $args['last_name'] ) && empty( $user_login ) ) {
 
 		switch ( UM()->options()->get( 'permalink_base' ) ) {
 			case 'name':
-				$user_login = str_replace( " ", ".", $first_name . " " . $last_name );
+				$user_login = str_replace( ' ', '.', $args['first_name'] . ' ' . $args['last_name'] );
 				break;
 
 			case 'name_dash':
-				$user_login = str_replace( " ", "-", $first_name . " " . $last_name );
+				$user_login = str_replace( ' ', '-', $args['first_name'] . ' ' . $args['last_name'] );
 				break;
 
 			case 'name_plus':
-				$user_login = str_replace( " ", "+", $first_name . " " . $last_name );
+				$user_login = str_replace( ' ', '+', $args['first_name'] . ' ' . $args['last_name'] );
 				break;
 
 			default:
-				$user_login = str_replace( " ", "", $first_name . " " . $last_name );
+				$user_login = str_replace( ' ', '', $args['first_name'] . ' ' . $args['last_name'] );
 				break;
 		}
 		$user_login = sanitize_user( strtolower( remove_accents( $user_login ) ), true );
 
 		if ( ! empty( $user_login ) ) {
-			$count = 1;
+			$count           = 1;
 			$temp_user_login = $user_login;
 			while ( username_exists( $temp_user_login ) ) {
 				$temp_user_login = $user_login . $count;
@@ -351,56 +348,57 @@ function um_submit_form_register( $args ) {
 		}
 	}
 
-	if ( empty( $user_login ) && ! empty( $user_email ) ) {
-		$user_login = $user_email;
+	if ( empty( $user_login ) && ! empty( $args['user_email'] ) ) {
+		$user_login = $args['user_email'];
 	}
 
-	$unique_userID = uniqid();
+	$unique_user_id = uniqid();
 
 	// see dbDelta and WP native DB structure user_login varchar(60)
 	if ( empty( $user_login ) || mb_strlen( $user_login ) > 60 && ! is_email( $user_login ) ) {
-		$user_login = 'user' . $unique_userID;
+		$user_login = 'user' . $unique_user_id;
 		while ( username_exists( $user_login ) ) {
-			$unique_userID = uniqid();
-			$user_login = 'user' . $unique_userID;
+			$unique_user_id = uniqid();
+			$user_login     = 'user' . $unique_user_id;
 		}
 	}
 
-	if ( isset( $username ) && is_email( $username ) ) {
-		$user_email = $username;
+	if ( isset( $args['username'] ) && is_email( $args['username'] ) ) {
+		$user_email = $args['username'];
+	} elseif ( ! empty( $args['user_email'] ) ) {
+		$user_email = $args['user_email'];
 	}
 
-	if ( ! isset( $user_password ) ) {
+	if ( ! isset( $args['user_password'] ) ) {
 		$user_password = UM()->validation()->generate( 8 );
+	} else {
+		$user_password = $args['user_password'];
 	}
 
 	if ( empty( $user_email ) ) {
-		$site_url = @$_SERVER['SERVER_NAME'];
-		$user_email = 'nobody' . $unique_userID . '@' . $site_url;
+		$site_url   = @$_SERVER['SERVER_NAME'];
+		$user_email = 'nobody' . $unique_user_id . '@' . $site_url;
 		while ( email_exists( $user_email ) ) {
-			$unique_userID = uniqid();
-			$user_email = 'nobody' . $unique_userID . '@' . $site_url;
+			$unique_user_id = uniqid();
+			$user_email     = 'nobody' . $unique_user_id . '@' . $site_url;
 		}
+
 		/**
-		 * UM hook
+		 * Filters change user default email if it's empty on registration
 		 *
-		 * @type filter
-		 * @title um_user_register_submitted__email
-		 * @description Change user default email if it's empty on registration
-		 * @input_vars
-		 * [{"var":"$user_email","type":"string","desc":"Default email"}]
-		 * @change_log
-		 * ["Since: 2.0"]
-		 * @usage
-		 * <?php add_filter( 'um_user_register_submitted__email', 'function_name', 10, 1 ); ?>
-		 * @example
-		 * <?php
-		 * add_filter( 'um_user_register_submitted__email', 'my_user_register_submitted__email', 10, 1 );
+		 * @since 2.0
+		 * @hook  um_user_register_submitted__email
+		 *
+		 * @param {string}  $user_email  Default email.
+		 *
+		 * @return {string} $user_email Email.
+		 *
+		 * @example <caption>Change user default email if it's empty on registration.</caption>
 		 * function my_user_register_submitted__email( $user_email ) {
 		 *     // your code here
 		 *     return $user_email;
 		 * }
-		 * ?>
+		 * add_filter( 'um_user_register_submitted__email', 'my_user_register_submitted__email', 10, 1 );
 		 */
 		$user_email = apply_filters( 'um_user_register_submitted__email', $user_email );
 	}
@@ -418,9 +416,9 @@ function um_submit_form_register( $args ) {
 	$args['submitted'] = array_merge( $args['submitted'], $credentials );
 
 	// set timestamp
-	$timestamp = current_time( 'timestamp' );
+	$timestamp                      = current_time( 'timestamp' );
 	$args['submitted']['timestamp'] = $timestamp;
-	$args['timestamp'] = $timestamp;
+	$args['timestamp']              = $timestamp;
 
 	$args = array_merge( $args, $credentials );
 
@@ -439,57 +437,48 @@ function um_submit_form_register( $args ) {
 	}
 
 	/**
-	 * UM hook
+	 * Filters change user role on registration process
 	 *
-	 * @type filter
-	 * @title um_registration_user_role
-	 * @description Change user role on registration process
-	 * @input_vars
-	 * [{"var":"$role","type":"string","desc":"User role"},
-	 * {"var":"$submitted","type":"array","desc":"Registration data"}]
-	 * @change_log
-	 * ["Since: 2.0"]
-	 * @usage
-	 * <?php add_filter( 'um_registration_user_role', 'function_name', 10, 2 ); ?>
-	 * @example
-	 * <?php
-	 * add_filter( 'um_registration_user_role', 'my_registration_user_role', 10, 2 );
-	 * function my_user_register_submitted__email( $role, $submitted ) {
+	 * @since 2.0
+	 * @hook  um_registration_user_role
+	 *
+	 * @param {string}  $user_role  User role.
+	 * @param {array}   $args       Registration data.
+	 *
+	 * @return {string} $user_role User role.
+	 *
+	 * @example <caption>Change user role on registration process.</caption>
+	 * function my_registration_user_role( $user_role, $args ) {
 	 *     // your code here
-	 *     return $role;
+	 *     return $user_role;
 	 * }
-	 * ?>
+	 * add_filter( 'um_registration_user_role', 'my_registration_user_role', 10, 2 );
 	 */
 	$user_role = apply_filters( 'um_registration_user_role', $user_role, $args );
 
 	$userdata = array(
-		'user_login'    => $user_login,
-		'user_pass'     => $user_password,
-		'user_email'    => $user_email,
-		'role'          => $user_role,
+		'user_login' => $user_login,
+		'user_pass'  => $user_password,
+		'user_email' => $user_email,
+		'role'       => $user_role,
 	);
 
 	$user_id = wp_insert_user( $userdata );
 
 	/**
-	 * UM hook
+	 * Fires after complete UM user registration.
 	 *
-	 * @type action
-	 * @title um_user_register
-	 * @description After complete UM user registration.
-	 * @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_user_register', 'function_name', 10, 2 );
-	 * @example
-	 * <?php
-	 * add_action( 'um_user_register', 'my_user_register', 10, 2 );
-	 * function my_user_register( $user_id, $args ) {
+	 * @since 2.0
+	 * @hook  um_user_register
+	 *
+	 * @param {int}   $user_id User ID.
+	 * @param {array} $user_id Form data.
+	 *
+	 * @example <caption>Make any custom action after complete UM user registration.</caption>
+	 * function um_user_register( $user_id, $args ) {
 	 *     // your code here
 	 * }
-	 * ?>
+	 * add_action( 'um_user_register', 'um_user_register', 10, 2 );
 	 */
 	do_action( 'um_user_register', $user_id, $args );
 

From 5a2a23802ddb6d958513c9277a9ad79844c6fa9e Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 12:35:31 +0300
Subject: [PATCH 06/37] - fix ajax_resize_image()

---
 includes/core/class-files.php | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/includes/core/class-files.php b/includes/core/class-files.php
index 8a702456..20e65db3 100644
--- a/includes/core/class-files.php
+++ b/includes/core/class-files.php
@@ -317,37 +317,31 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 		/**
 		 * Resize image AJAX handler
 		 */
-		function ajax_resize_image() {
+		public function ajax_resize_image() {
 			UM()->check_ajax_nonce();
 
-			/**
-			 * @var $key
-			 * @var $src
-			 * @var $coord
-			 * @var $user_id
-			 */
-			extract( $_REQUEST );
+			$data = $_REQUEST; // phpcs:ignore WordPress.Security.NonceVerification
 
-			if ( ! isset( $src ) || ! isset( $coord ) ) {
+			if ( ! isset( $data['src'] ) || ! isset( $data['coord'] ) ) {
 				wp_send_json_error( esc_js( __( 'Invalid parameters', 'ultimate-member' ) ) );
 			}
 
-			$coord_n = substr_count( $coord, "," );
-			if ( $coord_n != 3 ) {
+			$coord_n = substr_count( $data['coord'], ',' );
+			if ( 3 !== $coord_n ) {
 				wp_send_json_error( esc_js( __( 'Invalid coordinates', 'ultimate-member' ) ) );
 			}
 
-			$user_id = empty( $_REQUEST['user_id'] ) ? get_current_user_id() : absint( $_REQUEST['user_id'] );
+			$user_id = empty( $data['user_id'] ) ? get_current_user_id() : absint( $data['user_id'] );
 
-			UM()->fields()->set_id   = isset( $_POST['set_id'] ) ? absint( $_POST['set_id'] ) : null;
-			UM()->fields()->set_mode = isset( $_POST['set_mode'] ) ? sanitize_text_field( $_POST['set_mode'] ) : null;
+			UM()->fields()->set_id   = isset( $_POST['set_id'] ) ? absint( $_POST['set_id'] ) : null; // phpcs:ignore WordPress.Security.NonceVerification
+			UM()->fields()->set_mode = isset( $_POST['set_mode'] ) ? sanitize_text_field( $_POST['set_mode'] ) : null; // phpcs:ignore WordPress.Security.NonceVerification
 
-			if ( UM()->fields()->set_mode != 'register' && ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
+			if ( 'register' !== UM()->fields()->set_mode && ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
 				$ret['error'] = esc_js( __( 'You have no permission to edit this user', 'ultimate-member' ) );
 				wp_send_json_error( $ret );
 			}
 
-			$src = esc_url_raw( $src );
+			$src = esc_url_raw( $data['src'] );
 
 			$image_path = um_is_file_owner( $src, $user_id, true );
 			if ( ! $image_path ) {
@@ -355,7 +349,9 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 			}
 
 			UM()->uploader()->replace_upload_dir = true;
-			$output = UM()->uploader()->resize_image( $image_path, $src, sanitize_text_field( $key ), $user_id, sanitize_text_field( $coord ) );
+
+			$output = UM()->uploader()->resize_image( $image_path, $src, sanitize_text_field( $data['key'] ), $user_id, sanitize_text_field( $data['coord'] ) );
+
 			UM()->uploader()->replace_upload_dir = false;
 
 			delete_option( "um_cache_userdata_{$user_id}" );

From 709625545eaccec93e6b02bc8d1fd75428a252db Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 12:50:44 +0300
Subject: [PATCH 07/37] - fix ultimatemember_password()

---
 includes/core/class-password.php | 112 +++++++++++++------------------
 1 file changed, 48 insertions(+), 64 deletions(-)

diff --git a/includes/core/class-password.php b/includes/core/class-password.php
index dfd14cef..594904a0 100644
--- a/includes/core/class-password.php
+++ b/includes/core/class-password.php
@@ -115,7 +115,7 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 		 *
 		 * @return string
 		 */
-		function ultimatemember_password( $args = array() ) {
+		public function ultimatemember_password( $args = array() ) {
 			ob_start();
 
 			$defaults = array(
@@ -125,7 +125,7 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 				'max_width' => '450px',
 				'align'     => 'center',
 			);
-			$args = wp_parse_args( $args, $defaults );
+			$args     = wp_parse_args( $args, $defaults );
 
 			if ( empty( $args['use_custom_settings'] ) ) {
 				$args = array_merge( $args, UM()->shortcodes()->get_css_args( $args ) );
@@ -134,25 +134,21 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 			}
 
 			/**
-			 * UM hook
+			 * Filters extend Reset Password Arguments
 			 *
-			 * @type filter
-			 * @title um_reset_password_shortcode_args_filter
-			 * @description Extend Reset Password Arguments
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Shortcode arguments"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_reset_password_shortcode_args_filter', 'function_name', 10, 1 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_reset_password_shortcode_args_filter', 'my_reset_password_shortcode_args', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_reset_password_shortcode_args_filter
+			 *
+			 * @param {array}  $args  Shortcode arguments.
+			 *
+			 * @return {array} $args Shortcode arguments.
+			 *
+			 * @example <caption>Extend Reset Password Arguments.</caption>
 			 * function my_reset_password_shortcode_args( $args ) {
 			 *     // your code here
 			 *     return $args;
 			 * }
-			 * ?>
+			 * add_filter( 'um_reset_password_shortcode_args_filter', 'my_reset_password_shortcode_args', 10, 1 );
 			 */
 			$args = apply_filters( 'um_reset_password_shortcode_args_filter', $args );
 
@@ -160,7 +156,7 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 				// then COOKIE are valid then get data from them and populate hidden fields for the password reset form
 				$args['template'] = 'password-change';
 				$args['rp_key']   = '';
-				$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
+				$rp_cookie        = 'wp-resetpass-' . COOKIEHASH;
 				if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
 					list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
 
@@ -171,70 +167,58 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 
 			UM()->fields()->set_id = 'um_password_id';
 
-			/**
-			 * @var $mode
-			 * @var $template
-			 */
-			extract( $args, EXTR_SKIP );
+			if ( ! isset( $mode ) && isset( $args['mode'] ) ) {
+				$mode = $args['mode'];
+			}
+			if ( ! isset( $template ) && isset( $args['template'] ) ) {
+				$template = $args['template'];
+			}
 
 			/**
-			 * UM hook
+			 * Fires pre-load password form shortcode.
 			 *
-			 * @type action
-			 * @title um_pre_{$mode}_shortcode
-			 * @description Action pre-load password form shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Form shortcode pre-loading"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_pre_{$mode}_shortcode', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
-			 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_password_shortcode', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_pre_{$mode}_shortcode
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action pre-load password form shortcode.</caption>
 			 * function my_pre_password_shortcode( $args ) {
 			 *     // your code here
 			 * }
-			 * ?>
+			 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_password_shortcode', 10, 1 );
 			 */
 			do_action( "um_pre_{$mode}_shortcode", $args );
+
 			/**
-			 * UM hook
+			 * Fires pre-load password form shortcode.
 			 *
-			 * @type action
-			 * @title um_before_form_is_loaded
-			 * @description Action pre-load password form shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Form shortcode pre-loading"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_before_form_is_loaded', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
+			 * @since 2.0
+			 * @hook  um_before_form_is_loaded
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action pre-load password form shortcode.</caption>
+			 * function my_before_form_is_loaded( $args ) {
+			 *     // your code here
+			 * }
 			 * add_action( 'um_before_form_is_loaded', 'my_before_form_is_loaded', 10, 1 );
-			 * function my_before_form_is_loaded( $args ) {
-			 *     // your code here
-			 * }
-			 * ?>
 			 */
-			do_action( "um_before_form_is_loaded", $args );
+			do_action( 'um_before_form_is_loaded', $args );
+
 			/**
-			 * UM hook
+			 * Fires pre-load password form shortcode.
 			 *
-			 * @type action
-			 * @title um_before_{$mode}_form_is_loaded
-			 * @description Action pre-load password form shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Form shortcode pre-loading"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_before_{$mode}_form_is_loaded', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
-			 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_before_form_is_loaded', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_before_{$mode}_form_is_loaded
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action pre-load password form shortcode.</caption>
 			 * function my_before_form_is_loaded( $args ) {
 			 *     // your code here
 			 * }
-			 * ?>
+			 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_before_form_is_loaded', 10, 1 );
 			 */
 			do_action( "um_before_{$mode}_form_is_loaded", $args );
 

From f79712b549719483dfcc37b160fc4b6e15a10458 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 12:57:43 +0300
Subject: [PATCH 08/37] - fix ajax_muted_action()

---
 includes/core/class-form.php | 37 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/includes/core/class-form.php b/includes/core/class-form.php
index 4b4c60a3..fb390c00 100644
--- a/includes/core/class-form.php
+++ b/includes/core/class-form.php
@@ -70,18 +70,13 @@ if ( ! class_exists( 'um\core\Form' ) ) {
 		public function ajax_muted_action() {
 			UM()->check_ajax_nonce();
 
-			/**
-			 * @var $user_id
-			 * @var $hook
-			 */
-			extract( $_REQUEST );
-
-			if ( isset( $user_id ) ) {
-				$user_id = absint( $user_id );
+			// phpcs:disable WordPress.Security.NonceVerification
+			if ( isset( $_REQUEST['user_id'] ) ) {
+				$user_id = absint( $_REQUEST['user_id'] );
 			}
 
-			if ( isset( $hook ) ) {
-				$hook = sanitize_key( $hook );
+			if ( isset( $_REQUEST['hook'] ) ) {
+				$hook = sanitize_key( $_REQUEST['hook'] );
 			}
 
 			if ( ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
@@ -91,27 +86,23 @@ if ( ! class_exists( 'um\core\Form' ) ) {
 			switch ( $hook ) {
 				default:
 					/**
-					 * UM hook
+					 * Fires on AJAX muted action.
 					 *
-					 * @type action
-					 * @title um_run_ajax_function__{$hook}
-					 * @description Action on AJAX muted action
-					 * @input_vars
-					 * [{"var":"$request","type":"int","desc":"Request"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_action( 'um_run_ajax_function__{$hook}', 'function_name', 10, 1 );
-					 * @example
-					 * <?php
-					 * add_action( 'um_run_ajax_function__{$hook}', 'my_run_ajax_function', 10, 1 );
+					 * @since 2.0
+					 * @hook  um_run_ajax_function__{$hook}
+					 *
+					 * @param {array} $request Request.
+					 *
+					 * @example <caption>Make any custom action on AJAX muted action.</caption>
 					 * function my_run_ajax_function( $request ) {
 					 *     // your code here
 					 * }
-					 * ?>
+					 * add_action( 'um_run_ajax_function__{$hook}', 'my_run_ajax_function', 10, 1 );
 					 */
 					do_action( "um_run_ajax_function__{$hook}", $_REQUEST );
 					break;
 			}
+			// phpcs:enable WordPress.Security.NonceVerification
 		}
 
 

From 569a341fd27a5e15337539b44f8d61923efc618e Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 13:19:09 +0300
Subject: [PATCH 09/37] - fix ajax_paginate()

---
 includes/core/class-query.php | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/includes/core/class-query.php b/includes/core/class-query.php
index ef19440a..2519011c 100644
--- a/includes/core/class-query.php
+++ b/includes/core/class-query.php
@@ -41,32 +41,32 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 		public function ajax_paginate() {
 			UM()->check_ajax_nonce();
 
-			/**
-			 * @var $hook
-			 * @var $args
-			 */
-			extract( $_REQUEST );
+			// phpcs:disable WordPress.Security.NonceVerification
+			if ( isset( $_REQUEST['hook'] ) ) {
+				$hook = $_REQUEST['hook'];
+			}
+			if ( ! empty( $_REQUEST['args'] ) ) {
+				$args = $_REQUEST['args'];
+			} else {
+				$args = array();
+			}
+			// phpcs:enable WordPress.Security.NonceVerification
 
 			ob_start();
 
 			/**
-			 * UM hook
+			 * Fires on posts loading by AJAX.
 			 *
-			 * @type action
-			 * @title um_ajax_load_posts__{$hook}
-			 * @description Action on posts loading by AJAX
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Query arguments"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_ajax_load_posts__{$hook}', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
-			 * add_action( 'um_ajax_load_posts__{$hook}', 'my_ajax_load_posts', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_ajax_load_posts__{$hook}
+			 *
+			 * @param {array} $args Request.
+			 *
+			 * @example <caption>Make any custom action on posts loading by AJAX.</caption>
 			 * function my_ajax_load_posts( $args ) {
 			 *     // your code here
 			 * }
-			 * ?>
+			 * add_action( 'um_ajax_load_posts__{$hook}', 'my_ajax_load_posts', 10, 1 );
 			 */
 			do_action( "um_ajax_load_posts__{$hook}", $args );
 
@@ -95,9 +95,9 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 			}
 
 			$pages = $wpdb->get_results(
-				"SELECT * 
-				FROM {$wpdb->posts} 
-				WHERE post_type = 'page' AND 
+				"SELECT *
+				FROM {$wpdb->posts}
+				WHERE post_type = 'page' AND
 				      post_status = 'publish'",
 				OBJECT
 			);

From 9cc48e0a8c11e9547697e6a866b0a91d2ca75807 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 14:40:44 +0300
Subject: [PATCH 10/37] - fix load()

---
 includes/core/class-query.php      |   1 +
 includes/core/class-shortcodes.php | 174 +++++++++++++----------------
 2 files changed, 76 insertions(+), 99 deletions(-)

diff --git a/includes/core/class-query.php b/includes/core/class-query.php
index 2519011c..c5583e5c 100644
--- a/includes/core/class-query.php
+++ b/includes/core/class-query.php
@@ -42,6 +42,7 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 			UM()->check_ajax_nonce();
 
 			// phpcs:disable WordPress.Security.NonceVerification
+			$hook = '';
 			if ( isset( $_REQUEST['hook'] ) ) {
 				$hook = $_REQUEST['hook'];
 			}
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index e300d2e2..e736922c 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -602,9 +602,9 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 *
 		 * @return string
 		 */
-		function load( $args ) {
+		public function load( $args ) {
 			$defaults = array();
-			$args = wp_parse_args( $args, $defaults );
+			$args     = wp_parse_args( $args, $defaults );
 
 			// when to not continue
 			$this->form_id = isset( $args['form_id'] ) ? $args['form_id'] : null;
@@ -613,36 +613,32 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			}
 
 			$this->form_status = get_post_status( $this->form_id );
-			if ( $this->form_status != 'publish' ) {
+			if ( 'publish' !== $this->form_status ) {
 				return;
 			}
 
 			// get data into one global array
 			$post_data = UM()->query()->post_data( $this->form_id );
-			$args = array_merge( $args, $post_data );
+			$args      = array_merge( $args, $post_data );
 
 			ob_start();
 
 			/**
-			 * UM hook
+			 * Filters change arguments on load shortcode
 			 *
-			 * @type filter
-			 * @title um_pre_args_setup
-			 * @description Change arguments on load shortcode
-			 * @input_vars
-			 * [{"var":"$post_data","type":"string","desc":"$_POST data"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_pre_args_setup', 'function_name', 10, 1 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_pre_args_setup', 'my_pre_args_setup', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_pre_args_setup
+			 *
+			 * @param {array}  $post_data  $_POST data.
+			 *
+			 * @return {array} $post_data data.
+			 *
+			 * @example <caption>Change arguments on load shortcode.</caption>
 			 * function my_pre_args_setup( $post_data ) {
 			 *     // your code here
 			 *     return $post_data;
 			 * }
-			 * ?>
+			 * add_filter( 'um_pre_args_setup', 'my_pre_args_setup', 10, 1 );
 			 */
 			$args = apply_filters( 'um_pre_args_setup', $args );
 
@@ -650,7 +646,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				$args['template'] = '';
 			}
 
-			if ( isset( $post_data['template'] ) && $post_data['template'] != $args['template'] ) {
+			if ( isset( $post_data['template'] ) && $post_data['template'] !== $args['template'] ) {
 				$args['template'] = $post_data['template'];
 			}
 
@@ -662,7 +658,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				$post_data['template'] = $post_data['mode'];
 			}
 
-			if ( 'directory' == $args['mode'] ) {
+			if ( 'directory' === $args['mode'] ) {
 				wp_enqueue_script( 'um_members' );
 				if ( is_rtl() ) {
 					wp_enqueue_style( 'um_members_rtl' );
@@ -671,7 +667,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 				}
 			}
 
-			if ( 'directory' != $args['mode'] ) {
+			if ( 'directory' !== $args['mode'] ) {
 				$args = array_merge( $post_data, $args );
 
 				if ( empty( $args['use_custom_settings'] ) ) {
@@ -683,39 +679,35 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			// filter for arguments
 
 			/**
-			 * UM hook
+			 * Filters change arguments on load shortcode
 			 *
-			 * @type filter
-			 * @title um_shortcode_args_filter
-			 * @description Change arguments on load shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"string","desc":"Shortcode arguments"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_shortcode_args_filter', 'function_name', 10, 1 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_shortcode_args_filter', 'my_shortcode_args', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_shortcode_args_filter
+			 *
+			 * @param {array}  $post_data  Shortcode arguments.
+			 *
+			 * @return {array} $post_data Shortcode arguments.
+			 *
+			 * @example <caption>Change arguments on load shortcode.</caption>
 			 * function my_shortcode_args( $args ) {
 			 *     // your code here
 			 *     return $args;
 			 * }
-			 * ?>
+			 * add_filter( 'um_shortcode_args_filter', 'my_shortcode_args', 10, 1 );
 			 */
 			$args = apply_filters( 'um_shortcode_args_filter', $args );
 
-			/**
-			 * @var string $mode
-			 */
-			extract( $args, EXTR_SKIP );
+			if ( ! array_key_exists( 'mode', $args ) || ! array_key_exists( 'template', $args ) ) {
+				return;
+			}
+			$mode = $args['mode'];
 
 			//not display on admin preview
-			if ( empty( $_POST['act_id'] ) || sanitize_key( $_POST['act_id'] ) !== 'um_admin_preview_form' ) {
+			if ( empty( $_POST['act_id'] ) || 'um_admin_preview_form' !== sanitize_key( $_POST['act_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
 
 				$enable_loggedin_registration = apply_filters( 'um_registration_for_loggedin_users', false, $args );
 
-				if ( 'register' == $mode && is_user_logged_in() && ! $enable_loggedin_registration ) {
+				if ( 'register' === $mode && is_user_logged_in() && ! $enable_loggedin_registration ) {
 					ob_get_clean();
 					return __( 'You are already registered', 'ultimate-member' );
 				}
@@ -726,7 +718,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			}
 
 			// for profiles only
-			if ( $mode == 'profile' && um_profile_id() ) {
+			if ( 'profile' === $mode && um_profile_id() ) {
 
 				//set requested user if it's not setup from permalinks (for not profile page in edit mode)
 				if ( ! um_get_requested_user() ) {
@@ -756,7 +748,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 							}
 
 							$this->profile_role = $args['role'];
-						} elseif ( $this->profile_role != $args['role'] ) {
+						} elseif ( $this->profile_role !== $args['role'] ) {
 							ob_get_clean();
 							return '';
 						}
@@ -765,90 +757,74 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			}
 
 			/**
-			 * UM hook
+			 * Fires pre-load form shortcode.
 			 *
-			 * @type action
-			 * @title um_pre_{$mode}_shortcode
-			 * @description Action pre-load form shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Form shortcode pre-loading"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_pre_{$mode}_shortcode', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
-			 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_shortcode', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_pre_{$mode}_shortcode
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action on pre-load form shortcode.</caption>
 			 * function my_pre_shortcode( $args ) {
 			 *     // your code here
 			 * }
-			 * ?>
+			 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_shortcode', 10, 1 );
 			 */
 			do_action( "um_pre_{$mode}_shortcode", $args );
+
 			/**
-			 * UM hook
+			 * Fires pre-load form shortcode.
 			 *
-			 * @type action
-			 * @title um_before_form_is_loaded
-			 * @description Action pre-load form shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Form shortcode pre-loading"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_before_form_is_loaded', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
+			 * @since 2.0
+			 * @hook  um_before_form_is_loaded
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action on pre-load form shortcode.</caption>
+			 * function my_pre_shortcode( $args ) {
+			 *     // your code here
+			 * }
 			 * add_action( 'um_before_form_is_loaded', 'my_pre_shortcode', 10, 1 );
-			 * function my_pre_shortcode( $args ) {
-			 *     // your code here
-			 * }
-			 * ?>
 			 */
-			do_action( "um_before_form_is_loaded", $args );
+			do_action( 'um_before_form_is_loaded', $args );
+
 			/**
-			 * UM hook
+			 * Fires pre-load form shortcode.
 			 *
-			 * @type action
-			 * @title um_before_{$mode}_form_is_loaded
-			 * @description Action pre-load form shortcode
-			 * @input_vars
-			 * [{"var":"$args","type":"array","desc":"Form shortcode pre-loading"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_before_{$mode}_form_is_loaded', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
-			 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_pre_shortcode', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_before_{$mode}_form_is_loaded
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action on pre-load form shortcode.</caption>
 			 * function my_pre_shortcode( $args ) {
 			 *     // your code here
 			 * }
-			 * ?>
+			 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_pre_shortcode', 10, 1 );
 			 */
 			do_action( "um_before_{$mode}_form_is_loaded", $args );
 
-			$this->template_load( $template, $args );
+			$this->template_load( $args['template'], $args );
 
 			$this->dynamic_css( $args );
 
-			if ( um_get_requested_user() || $mode == 'logout' ) {
+			if ( um_get_requested_user() || 'logout' === $mode ) {
 				um_reset_user();
 			}
 
 			/**
-			 * UM hook
+			 * Fires after load shortcode content.
 			 *
-			 * @type action
-			 * @title um_after_everything_output
-			 * @description Action after load shortcode content
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_action( 'um_after_everything_output', 'function_name', 10 );
-			 * @example
-			 * <?php
-			 * add_action( 'um_after_everything_output', 'my_after_everything_output', 10 );
-			 * function my_after_everything_output() {
+			 * @since 2.0
+			 * @hook  um_after_everything_output
+			 *
+			 * @param {array} $args Form shortcode pre-loading.
+			 *
+			 * @example <caption>Make any custom action after load shortcode content.</caption>
+			 * function my_pre_shortcode() {
 			 *     // your code here
 			 * }
-			 * ?>
+			 * add_action( 'um_after_everything_output', 'my_pre_shortcode', 10 );
 			 */
 			do_action( 'um_after_everything_output' );
 

From f6c2e17017a05876af3e9a1a5f998b9382f65aa3 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 14:49:40 +0300
Subject: [PATCH 11/37] - fix dynamic_css()

---
 includes/core/class-shortcodes.php | 41 +++++++++++++-----------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index e736922c..802ec4ff 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -853,44 +853,37 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 *
 		 * @return string
 		 */
-		function dynamic_css( $args = array() ) {
+		public function dynamic_css( $args = array() ) {
 			/**
-			 * UM hook
+			 * Filters turn on for disable global dynamic CSS for fix the issue #306
 			 *
-			 * @type filter
-			 * @title um_disable_dynamic_global_css
-			 * @description Turn on for disable global dynamic CSS for fix the issue #306
-			 * @input_vars
-			 * [{"var":"$disable","type":"bool","desc":"Disable global CSS"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_disable_dynamic_global_css', 'function_name', 10, 1 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_disable_dynamic_global_css', 'my_disable_dynamic_global_css', 10, 1 );
+			 * @since 2.0
+			 * @hook  um_disable_dynamic_global_css
+			 *
+			 * @param {bool}  $disable  Disable global CSS.
+			 *
+			 * @return {bool} $disable Disable global CSS.
+			 *
+			 * @example <caption>Turn on for disable global dynamic CSS.</caption>
 			 * function my_disable_dynamic_global_css( $disable ) {
 			 *     // your code here
 			 *     return $disable;
 			 * }
-			 * ?>
+			 * add_filter( 'um_disable_dynamic_global_css', 'my_disable_dynamic_global_css', 10, 1 );
 			 */
 			$disable_css = apply_filters( 'um_disable_dynamic_global_css', false );
-			if ( $disable_css )
+			if ( $disable_css ) {
 				return '';
-
-			/**
-			 * @var $mode
-			 */
-			extract( $args );
+			}
 
 			include_once um_path . 'assets/dynamic_css/dynamic_global.php';
 
-			if ( isset( $mode ) && in_array( $mode, array( 'profile', 'directory' ) ) ) {
-				$file = um_path . 'assets/dynamic_css/dynamic_' . $mode . '.php';
+			if ( isset( $args['mode'] ) && in_array( $args['mode'], array( 'profile', 'directory' ), true ) ) {
+				$file = um_path . 'assets/dynamic_css/dynamic_' . $args['mode'] . '.php';
 
-				if ( file_exists( $file ) )
+				if ( file_exists( $file ) ) {
 					include_once $file;
+				}
 			}
 
 			return '';

From a4ec844737f30fedcb7dd3ce264e2a0b5e03a07a Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 15:48:39 +0300
Subject: [PATCH 12/37] - fix view_field()

---
 includes/core/class-fields.php | 199 ++++++++++++++-------------------
 1 file changed, 85 insertions(+), 114 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 34a3677a..60d4d79a 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -4355,52 +4355,35 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 * @return string|null
 		 * @throws \Exception
 		 */
-		function view_field( $key, $data, $rule = false ) {
+		public function view_field( $key, $data, $rule = false ) {
 			$output = '';
 
 			// get whole field data
 			if ( is_array( $data ) ) {
 				$data = $this->get_field( $key );
-
-				if ( is_array( $data ) ) {
-					/**
-					 * @var $visibility
-					 * @var $type
-					 * @var $default
-					 * @var $classes
-					 * @var $conditional
-					 * @var $content
-					 * @var $divider_text
-					 * @var $spacing
-					 * @var $borderwidth
-					 * @var $borderstyle
-					 * @var $bordercolor
-					 * @var $label
-					 */
-					extract( $data );
-				}
 			}
 
 			//hide if empty type
 			if ( ! isset( $data['type'] ) ) {
 				return '';
 			}
+			$type = $data['type'];
 
-			if ( isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group' ) {
+			if ( isset( $data['in_group'] ) && '' !== $data['in_group'] && 'group' !== $rule ) {
 				return '';
 			}
 
 			//invisible on profile page
-			if ( $visibility == 'edit' || $type == 'password' ) {
+			if ( 'edit' === $data['visibility'] || 'password' === $type ) {
 				return '';
 			}
 
 			//hide if empty
 			$fields_without_metakey = UM()->builtin()->get_fields_without_metakey();
-			if ( ! in_array( $type, $fields_without_metakey ) ) {
-				$_field_value = $this->field_value( $key, $default, $data );
+			if ( ! in_array( $type, $fields_without_metakey, true ) ) {
+				$_field_value = $this->field_value( $key, $data['classes'], $data );
 
-				if ( ! isset( $_field_value ) || $_field_value == '' ) {
+				if ( ! isset( $_field_value ) || '' === $_field_value ) {
 					return '';
 				}
 			}
@@ -4410,7 +4393,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			}
 
 			// disable these fields in profile view only
-			if ( in_array( $key, array( 'user_password' ) ) && $this->set_mode == 'profile' ) {
+			if ( in_array( $key, array( 'user_password' ), true ) && 'profile' === $this->set_mode ) {
 				return '';
 			}
 
@@ -4418,23 +4401,21 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				return '';
 			}
 
-
 			if ( isset( $data['classes'] ) ) {
-				$classes = explode( " ", $data['classes'] );
+				$classes = explode( ' ', $data['classes'] );
 			}
 
 			switch ( $type ) {
 
 				/* Default */
 				default:
+					$_field_value = $this->field_value( $key, $data['default'], $data );
 
-					$_field_value = $this->field_value( $key, $default, $data );
-
-					if ( ! in_array( $type, $fields_without_metakey ) && ( ! isset( $_field_value ) || $_field_value == '' ) ) {
+					if ( ! in_array( $type, $fields_without_metakey, true ) && ( ! isset( $_field_value ) || '' === $_field_value ) ) {
 						$output = '';
 					} else {
 
-						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+						$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 						if ( isset( $data['label'] ) || ! empty( $data['icon'] ) ) {
 
@@ -4445,7 +4426,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= $this->field_label( $data['label'], $key, $data );
 						}
 
-						$res = $this->field_value( $key, $default, $data );
+						$res = $this->field_value( $key, $data['default'], $data );
 
 						if ( ! empty( $res ) ) {
 							$res = stripslashes( $res );
@@ -4462,53 +4443,48 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$data['is_view_field'] = true;
 						/**
-						 * UM hook
+						 * Filters change field HTML on view mode
 						 *
-						 * @type filter
-						 * @title um_view_field
-						 * @description Change field HTML on view mode
-						 * @input_vars
-						 * [{"var":"$output","type":"string","desc":"Field HTML"},
-						 * {"var":"$data","type":"string","desc":"Field Data"},
-						 * {"var":"$type","type":"string","desc":"Field Type"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_view_field', 'function_name', 10, 3 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_view_field', 'my_view_field', 10, 3 );
-						 * function my_form_edit_field( $output, $data, $type ) {
+						 * @since 2.0
+						 * @hook  um_view_field
+						 *
+						 * @param {string}  $output  Field HTML.
+						 * @param {string}  $data    Field Data.
+						 * @param {string}  $type    Field Type.
+						 *
+						 * @return {array} $output Field HTML.
+						 *
+						 * @example <caption>Change field HTML on view mode.</caption>
+						 * function my_view_field( $output, $data, $type ) {
 						 *     // your code here
 						 *     return $output;
 						 * }
-						 * ?>
+						 * add_filter( 'um_view_field', 'my_view_field', 10, 3 );
 						 */
 						$res = apply_filters( 'um_view_field', $res, $data, $type );
+
 						/**
-						 * UM hook
+						 * Filters field HTML on view mode by field type
 						 *
-						 * @type filter
-						 * @title um_view_field_value_{$type}
-						 * @description Change field HTML on view mode by field type
-						 * @input_vars
-						 * [{"var":"$output","type":"string","desc":"Field HTML"},
-						 * {"var":"$data","type":"string","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_view_field_value_{$type}', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_view_field_value_{$type}', 'my_view_field', 10, 2 );
-						 * function my_form_edit_field( $output, $data ) {
+						 * @since 2.0
+						 * @hook  um_view_field_value_{$type}
+						 *
+						 * @param {string}  $output  Field HTML.
+						 * @param {string}  $data    Field Data.
+						 *
+						 * @return {array} $output Field HTML.
+						 *
+						 * @example <caption>Change field HTML on view mode by field type.</caption>
+						 * function my_view_field( $output, $data ) {
 						 *     // your code here
 						 *     return $output;
 						 * }
-						 * ?>
+						 * add_filter( 'um_view_field_value_{$type}', 'my_view_field', 10, 2 );
 						 */
 						$res = apply_filters( "um_view_field_value_{$type}", $res, $data );
 
 						$id_attr = '';
-						if ( ! in_array( $type, $fields_without_metakey ) ) {
+						if ( ! in_array( $type, $fields_without_metakey, true ) ) {
 							$id_attr = ' id="' . esc_attr( $key . UM()->form()->form_suffix ) . '"';
 						}
 
@@ -4525,58 +4501,58 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					break;
 
-				/* HTML */
+					/* HTML */
 				case 'block':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $data['content'] . '</div>';
 					break;
 
-				/* Shortcode */
+					/* Shortcode */
 				case 'shortcode':
-
-					$content = str_replace( '{profile_id}', um_profile_id(), $content );
-					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+					$content = str_replace( '{profile_id}', um_profile_id(), $data['content'] );
+					if ( version_compare( get_bloginfo( 'version' ), '5.4', '<' ) ) {
 						$content = do_shortcode( $content );
 					} else {
 						$content = apply_shortcodes( $content );
 					}
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $content . '</div>';
 					break;
 
-				/* Gap/Space */
+					/* Gap/Space */
 				case 'spacing':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, array( 'height' => $spacing ) ) . '></div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'height' => $data['spacing'] ) ) . '></div>';
 					break;
 
-				/* A line divider */
+					/* A line divider */
 				case 'divider':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, array( 'border-bottom' => $borderwidth . 'px ' . $borderstyle . ' ' . $bordercolor ) ) . '>';
-					if ( $divider_text ) {
-						$output .= '<div class="um-field-divider-text"><span>' . $divider_text . '</span></div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'border-bottom' => $data['borderwidth'] . 'px ' . $data['borderstyle'] . ' ' . $data['bordercolor'] ) ) . '>';
+					if ( $data['divider_text'] ) {
+						$output .= '<div class="um-field-divider-text"><span>' . $data['divider_text'] . '</span></div>';
 					}
 					$output .= '</div>';
 					break;
 
-				/* Rating */
+					/* Rating */
 				case 'rating':
-
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) || ! empty( $data['icon'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
-					ob_start(); ?>
+					ob_start();
+					?>
 
 					<div class="um-field-area">
 						<div class="um-field-value">
-							<div class="um-rating-readonly um-raty" id="<?php echo esc_attr( $key ) ?>"
-							     data-key="<?php echo esc_attr( $key ) ?>" data-number="<?php echo esc_attr( $data['number'] ) ?>"
-							     data-score="<?php echo $this->field_value( $key, $default, $data ) ?>"></div>
+							<div class="um-rating-readonly um-raty" id="<?php echo esc_attr( $key ); ?>"
+								data-key="<?php echo esc_attr( $key ); ?>" data-number="<?php echo esc_attr( $data['number'] ); ?>"
+								data-score="<?php echo $this->field_value( $key, $data['default'], $data ); ?>"></div>
 						</div>
 					</div>
 
-					<?php $output .= ob_get_clean();
+					<?php
+					$output .= ob_get_clean();
 					$output .= '</div>';
 
 					break;
@@ -4586,47 +4562,42 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			// Custom filter for field output
 			if ( isset( $this->set_mode ) ) {
 				/**
-				 * UM hook
+				 * Filters field HTML by field $key
 				 *
-				 * @type filter
-				 * @title um_{$key}_form_show_field
-				 * @description Change field HTML by field $key
-				 * @input_vars
-				 * [{"var":"$output","type":"string","desc":"Field HTML"},
-				 * {"var":"$mode","type":"string","desc":"Form Mode"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage add_filter( 'um_{$key}_form_show_field', 'function_name', 10, 2 );
-				 * @example
-				 * <?php
-				 * add_filter( 'um_{$key}_form_show_field', 'my_form_show_field', 10, 2 );
+				 * @since 2.0
+				 * @hook  um_{$key}_form_show_field
+				 *
+				 * @param {string}  $output  Field HTML.
+				 * @param {string}  $mode    Field Mode.
+				 *
+				 * @return {array} $output Field HTML.
+				 *
+				 * @example <caption>Change field HTML by field $key.</caption>
 				 * function my_form_show_field( $output, $mode ) {
 				 *     // your code here
 				 *     return $output;
 				 * }
-				 * ?>
+				 * add_filter( 'um_{$key}_form_show_field', 'my_form_show_field', 10, 2 );
 				 */
 				$output = apply_filters( "um_{$key}_form_show_field", $output, $this->set_mode );
+
 				/**
-				 * UM hook
+				 * Filters field HTML by field $type
 				 *
-				 * @type filter
-				 * @title um_{$type}_form_show_field
-				 * @description Change field HTML by field $type
-				 * @input_vars
-				 * [{"var":"$output","type":"string","desc":"Field HTML"},
-				 * {"var":"$mode","type":"string","desc":"Form Mode"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage add_filter( 'um_{$type}_form_show_field', 'function_name', 10, 2 );
-				 * @example
-				 * <?php
-				 * add_filter( 'um_{$type}_form_show_field', 'my_form_show_field', 10, 2 );
+				 * @since 2.0
+				 * @hook  um_{$type}_form_show_field
+				 *
+				 * @param {string}  $output  Field HTML.
+				 * @param {string}  $mode    Field Mode.
+				 *
+				 * @return {array} $output Field HTML.
+				 *
+				 * @example <caption>Change field HTML by field $type.</caption>
 				 * function my_form_show_field( $output, $mode ) {
 				 *     // your code here
 				 *     return $output;
 				 * }
-				 * ?>
+				 * add_filter( 'um_{$type}_form_show_field', 'my_form_show_field', 10, 2 );
 				 */
 				$output = apply_filters( "um_{$type}_form_show_field", $output, $this->set_mode );
 			}

From 9f8767b3c888d65388e79888b5afefc5b7ef341a Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 16:07:15 +0300
Subject: [PATCH 13/37] - fix do_ajax_action()

---
 includes/core/class-fields.php | 61 +++++++++++++++-------------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 60d4d79a..d655dc5d 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -4947,57 +4947,48 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		/**
 		 *
 		 */
-		function do_ajax_action() {
+		public function do_ajax_action() {
 			UM()->admin()->check_ajax_nonce();
 
 			if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) {
 				wp_send_json_error( __( 'Please login as administrator', 'ultimate-member' ) );
 			}
 
-			/**
-			 * @var $in_row
-			 * @var $in_sub_row
-			 * @var $in_column
-			 * @var $in_group
-			 * @var $act_id
-			 * @var $arg1
-			 * @var $arg2
-			 */
-			extract( $_POST );
-
 			$output = null;
 
 			$position = array();
-			if ( ! empty( $in_column ) ) {
-				$position['in_row'] = '_um_row_' . ( (int) $in_row + 1 );
-				$position['in_sub_row'] = $in_sub_row;
-				$position['in_column'] = $in_column;
-				$position['in_group'] = $in_group;
+			// phpcs:disable WordPress.Security.NonceVerification
+			if ( ! empty( $_POST['in_column'] ) ) {
+				$position['in_row']     = '_um_row_' . ( (int) $_POST['in_row'] + 1 );
+				$position['in_sub_row'] = isset( $_POST['in_sub_row'] ) ? $_POST['in_sub_row'] : '';
+				$position['in_column']  = isset( $_POST['in_column'] ) ? $_POST['in_column'] : '';
+				$position['in_group']   = isset( $_POST['in_group'] ) ? $_POST['in_group'] : '';
 			}
 
-			switch ( $act_id ) {
+			if ( isset( $_POST['act_id'] ) ) {
+				switch ( $_POST['act_id'] ) {
+					case 'um_admin_duplicate_field':
+						$this->duplicate_field( $_POST['arg1'], $_POST['arg2'] );
+						break;
 
-				case 'um_admin_duplicate_field':
-					$this->duplicate_field( $arg1, $arg2 );
-					break;
+					case 'um_admin_remove_field_global':
+						$this->delete_field_from_db( $_POST['arg1'] );
+						break;
 
-				case 'um_admin_remove_field_global':
-					$this->delete_field_from_db( $arg1 );
-					break;
+					case 'um_admin_remove_field':
+						$this->delete_field_from_form( $_POST['arg1'], $_POST['arg2'] );
+						break;
 
-				case 'um_admin_remove_field':
-					$this->delete_field_from_form( $arg1, $arg2 );
-					break;
-
-				case 'um_admin_add_field_from_predefined':
-					$this->add_field_from_predefined( $arg1, $arg2, $position );
-					break;
-
-				case 'um_admin_add_field_from_list':
-					$this->add_field_from_list( $arg1, $arg2, $position );
-					break;
+					case 'um_admin_add_field_from_predefined':
+						$this->add_field_from_predefined( $_POST['arg1'], $_POST['arg2'], $position );
+						break;
 
+					case 'um_admin_add_field_from_list':
+						$this->add_field_from_list( $_POST['arg1'], $_POST['arg2'], $position );
+						break;
+				}
 			}
+			// phpcs:enable WordPress.Security.NonceVerification
 
 			if ( is_array( $output ) ) {
 				print_r( $output );

From a027cfcd70d7156ba869245fe40bc6ec04240cb4 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 16:11:32 +0300
Subject: [PATCH 14/37] - fix make()

---
 includes/core/class-query.php | 47 ++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/includes/core/class-query.php b/includes/core/class-query.php
index c5583e5c..1b1ef124 100644
--- a/includes/core/class-query.php
+++ b/includes/core/class-query.php
@@ -146,51 +146,46 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 		 *
 		 * @return array|bool|int|\WP_Query
 		 */
-		function make( $args ) {
+		public function make( $args ) {
 
 			$defaults = array(
-				'post_type' => 'post',
-				'post_status' => array('publish')
+				'post_type'   => 'post',
+				'post_status' => array( 'publish' ),
 			);
-			$args = wp_parse_args( $args, $defaults );
+			$args     = wp_parse_args( $args, $defaults );
 
-			if ( isset( $args['post__in'] ) && empty( $args['post__in'] ) )
+			if ( isset( $args['post__in'] ) && empty( $args['post__in'] ) ) {
 				return false;
+			}
 
-			extract( $args );
-
-			if ( $post_type == 'comment' ) { // comments
+			if ( 'comment' === $args['post_type'] ) { // comments
 
 				unset( $args['post_type'] );
 
 				/**
-				 * UM hook
+				 * Filters extend excluded comment types
 				 *
-				 * @type filter
-				 * @title um_excluded_comment_types
-				 * @description Extend excluded comment types
-				 * @input_vars
-				 * [{"var":"$types","type":"array","desc":"Comment Types"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage
-				 * <?php add_filter( 'um_excluded_comment_types', 'function_name', 10, 1 ); ?>
-				 * @example
-				 * <?php
-				 * add_filter( 'um_excluded_comment_types', 'my_excluded_comment_types', 10, 1 );
-				 * function my_profile_active_tab( $types ) {
+				 * @since 2.0
+				 * @hook  um_excluded_comment_types
+				 *
+				 * @param {array}  $types  Comment Types.
+				 *
+				 * @return {array} $types Comment Types.
+				 *
+				 * @example <caption>Extend excluded comment types.</caption>
+				 * function my_excluded_comment_types( $types ) {
 				 *     // your code here
 				 *     return $types;
 				 * }
-				 * ?>
+				 * add_filter( 'um_excluded_comment_types', 'my_excluded_comment_types', 10, 1 );
 				 */
-				$args['type__not_in'] = apply_filters( 'um_excluded_comment_types', array('') );
+				$args['type__not_in'] = apply_filters( 'um_excluded_comment_types', array( '' ) );
 
-				$comments = get_comments($args);
+				$comments = get_comments( $args );
 				return $comments;
 
 			} else {
-				$custom_posts = new \WP_Query();
+				$custom_posts        = new \WP_Query();
 				$args['post_status'] = is_array( $args['post_status'] ) ? $args['post_status'] : explode( ',', $args['post_status'] );
 
 				$custom_posts->query( $args );

From 43263dd0f7124915db8f22bdf587bc9f9aeccf49 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Thu, 22 Jun 2023 16:26:23 +0300
Subject: [PATCH 15/37] - fix new_row_output()

---
 includes/core/class-fields.php | 69 +++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index d655dc5d..6fe88ed5 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -4845,33 +4845,32 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 *
 		 * @return string
 		 */
-		function new_row_output( $row_id, $row_array ) {
+		public function new_row_output( $row_id, $row_array ) {
 			$output = null;
-			extract( $row_array );
 
-			$padding = ( isset( $padding ) ) ? $padding : '';
-			$margin = ( isset( $margin ) ) ? $margin : '';
-			$background = ( isset( $background ) ) ? $background : '';
-			$text_color = ( isset( $text_color ) ) ? $text_color : '';
-			$borderradius = ( isset( $borderradius ) ) ? $borderradius : '';
-			$border = ( isset( $border ) ) ? $border : '';
-			$bordercolor = ( isset( $bordercolor ) ) ? $bordercolor : '';
-			$borderstyle = ( isset( $borderstyle ) ) ? $borderstyle : '';
-			$heading = ( isset( $heading ) ) ? $heading : '';
-			$css_class = ( isset( $css_class ) ) ? $css_class : '';
+			$padding      = ( isset( $row_array['padding'] ) ) ? $row_array['padding'] : '';
+			$margin       = ( isset( $row_array['margin'] ) ) ? $row_array['margin'] : '';
+			$background   = ( isset( $row_array['background'] ) ) ? $row_array['background'] : '';
+			$text_color   = ( isset( $row_array['text_color'] ) ) ? $row_array['text_color'] : '';
+			$borderradius = ( isset( $row_array['borderradius'] ) ) ? $row_array['borderradius'] : '';
+			$border       = ( isset( $row_array['border'] ) ) ? $row_array['border'] : '';
+			$bordercolor  = ( isset( $row_array['bordercolor'] ) ) ? $row_array['bordercolor'] : '';
+			$borderstyle  = ( isset( $row_array['borderstyle'] ) ) ? $row_array['borderstyle'] : '';
+			$heading      = ( isset( $row_array['heading'] ) ) ? $row_array['heading'] : '';
+			$css_class    = ( isset( $row_array['css_class'] ) ) ? $row_array['css_class'] : '';
 
-			$css_padding = '';
-			$css_margin = '';
-			$css_background = '';
-			$css_borderradius = '';
-			$css_border = '';
-			$css_bordercolor = '';
-			$css_borderstyle = '';
+			$css_padding                  = '';
+			$css_margin                   = '';
+			$css_background               = '';
+			$css_borderradius             = '';
+			$css_border                   = '';
+			$css_bordercolor              = '';
+			$css_borderstyle              = '';
 			$css_heading_background_color = '';
-			$css_heading_padding = '';
-			$css_heading_text_color = '';
-			$css_heading_borderradius = '';
-			$css_text_color = '';
+			$css_heading_padding          = '';
+			$css_heading_text_color       = '';
+			$css_heading_borderradius     = '';
+			$css_text_color               = '';
 
 			// row css rules
 			if ( $padding ) {
@@ -4900,30 +4899,30 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			}
 			if ( $text_color ) {
 				$css_text_color = 'color: ' . $text_color . ' !important;';
-				$css_class .= ' um-customized-row';
+				$css_class     .= ' um-customized-row';
 			}
 
 			// show the heading
 			if ( $heading ) {
 
-				if ( ! empty( $heading_background_color ) ) {
-					$css_heading_background_color = "background-color: $heading_background_color;";
-					$css_heading_padding = 'padding: 10px 15px;';
+				if ( ! empty( $row_array['heading_background_color'] ) ) {
+					$css_heading_background_color = 'background-color: ' . $row_array['heading_background_color'] . ';';
+					$css_heading_padding          = 'padding: 10px 15px;';
 				}
 
 				$css_heading_borderradius = empty( $borderradius ) ? '' : "border-radius: $borderradius $borderradius 0px 0px;";
-				$css_heading_border = $css_border . $css_borderstyle . $css_bordercolor . $css_heading_borderradius . 'border-bottom-width: 0px;';
-				$css_heading_margin = $css_margin . 'margin-bottom: 0px;';
-				$css_heading_text_color = empty( $heading_text_color ) ? '' : "color: $heading_text_color;";
-				$css_icon_color = empty( $icon_color ) ?  '' : "color: $icon_color;";
+				$css_heading_border       = $css_border . $css_borderstyle . $css_bordercolor . $css_heading_borderradius . 'border-bottom-width: 0px;';
+				$css_heading_margin       = $css_margin . 'margin-bottom: 0px;';
+				$css_heading_text_color   = empty( $row_array['heading_text_color'] ) ? '' : 'color: ' . $row_array['heading_text_color'] . ';';
+				$css_icon_color           = empty( $row_array['icon_color'] ) ? '' : 'color: ' . $row_array['icon_color'] . ';';
 
 				$output .= '<div class="um-row-heading" style="' . $css_heading_margin . $css_heading_padding . $css_heading_border . $css_heading_background_color . $css_heading_text_color . '">';
 
-				if ( ! empty( $icon ) ) {
-					$output .= '<span class="um-row-heading-icon" style="' . $css_icon_color . '"><i class="' . $icon . '"></i></span>';
+				if ( ! empty( $row_array['icon'] ) ) {
+					$output .= '<span class="um-row-heading-icon" style="' . $css_icon_color . '"><i class="' . $row_array['icon'] . '"></i></span>';
 				}
-				if ( ! empty( $heading_text ) ) {
-					$output .= htmlspecialchars( $heading_text );
+				if ( ! empty( $row_array['heading_text'] ) ) {
+					$output .= htmlspecialchars( $row_array['heading_text'] );
 				}
 
 				$output .= '</div>';

From 9d36b6fdec3ea63dce370843050dbebf9082e7af Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 23 Jun 2023 01:25:48 +0300
Subject: [PATCH 16/37] - reviewed `um_profile_content_main()`;

---
 includes/core/um-actions-profile.php | 138 ++++++++++++++++-----------
 1 file changed, 84 insertions(+), 54 deletions(-)

diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index febbb555..1376c69a 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -1,38 +1,38 @@
-<?php if ( ! defined( 'ABSPATH' ) ) {
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
-} // Exit if accessed directly
-
+}
 
 /**
- * Um_profile_content_{main_tab}
+ * It renders the content of main profile tab.
  *
- * @param $args
+ * @param array $args
  */
 function um_profile_content_main( $args ) {
-
 	if ( ! array_key_exists( 'mode', $args ) ) {
 		return;
 	}
 	$mode = $args['mode'];
 
-	if ( ! UM()->options()->get( 'profile_tab_main' ) && ! isset( $_REQUEST['um_action'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+	// phpcs:ignore WordPress.Security.NonceVerification -- $_REQUEST is used for echo only
+	if ( ! isset( $_REQUEST['um_action'] ) && ! UM()->options()->get( 'profile_tab_main' ) ) {
 		return;
 	}
 
 	/**
-	 * Filters check user can view profile
+	 * Filters user's ability to view a profile
 	 *
-	 * @since 2.0
+	 * @since 1.3.x
 	 * @hook  um_profile_can_view_main
 	 *
-	 * @param {int}  $can_view Can view profile.
-	 * @param {int}  $user_id  User ID.
+	 * @param {int} $can_view   Can view profile. It's -1 by default.
+	 * @param {int} $profile_id User Profile ID.
 	 *
-	 * @return {int} Can view profile.
+	 * @return {int} Can view profile. Set it to -1 for displaying and vice versa to hide.
 	 *
-	 * @example <caption>Can view profile.</caption>
-	 * function my_profile_can_view_main( $can_view, $user_id ) {
-	 *     // your code here
+	 * @example <caption>Make profile hidden.</caption>
+	 * function my_profile_can_view_main( $can_view, $profile_id ) {
+	 *     $can_view = 1; // make profile hidden.
 	 *     return $can_view;
 	 * }
 	 * add_filter( 'um_profile_can_view_main', 'my_profile_can_view_main', 10, 2 );
@@ -41,98 +41,129 @@ function um_profile_content_main( $args ) {
 
 	if ( -1 === (int) $can_view ) {
 		/**
-		 * Fires before form.
+		 * Fires before UM Form content.
 		 *
-		 * @since 2.0
+		 * @since 1.3.x
 		 * @hook  um_before_form
 		 *
-		 * @param {array} $args Profile form shortcode arguments.
+		 * @param {array} $args UM Form shortcode arguments.
 		 *
-		 * @example <caption>Make any custom action before form.</caption>
+		 * @example <caption>Make any custom action before UM form.</caption>
 		 * function my_before_form( $args ) {
 		 *     // your code here
 		 * }
-		 * add_action( 'um_before_form', 'my_before_form', 10, 1 );
+		 * add_action( 'um_before_form', 'my_before_form' );
 		 */
 		do_action( 'um_before_form', $args );
-
 		/**
-		 * Fires before profile form fields.
+		 * Fires before UM Form fields.
 		 *
-		 * @since 2.0
+		 * Note: $mode can be equals to 'login', 'profile', 'register'.
+		 *
+		 * @since 1.3.x
 		 * @hook  um_before_{$mode}_fields
 		 *
-		 * @param {array} $args Profile form shortcode arguments.
+		 * @param {array} $args UM Form shortcode arguments.
 		 *
-		 * @example <caption>Make any custom action before fields.</caption>
-		 * function my_before_fields( $args ) {
+		 * @example <caption>Make any custom action before UM Profile form fields.</caption>
+		 * function my_before_profile_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * add_action( 'um_before_{$mode}_fields', 'my_before_fields', 10, 1 );
+		 * add_action( 'um_before_profile_fields', 'my_before_profile_fields' );
+		 * @example <caption>Make any custom action before UM Login form fields.</caption>
+		 * function my_before_login_fields( $args ) {
+		 *     // your code here
+		 * }
+		 * add_action( 'um_before_login_fields', 'my_before_login_fields' );
+		 * @example <caption>Make any custom action before UM Register form fields.</caption>
+		 * function my_before_register_fields( $args ) {
+		 *     // your code here
+		 * }
+		 * add_action( 'um_before_register_fields', 'my_before_register_fields' );
 		 */
 		do_action( "um_before_{$mode}_fields", $args );
-
 		/**
-		 * Fires before login form fields.
+		 * Fires for rendering UM Form fields.
 		 *
-		 * @since 2.0
+		 * Note: $mode can be equals to 'login', 'profile', 'register'.
+		 *
+		 * @since 1.3.x
 		 * @hook  um_main_{$mode}_fields
 		 *
-		 * @param {array} $args Login form shortcode arguments.
+		 * @param {array} $args UM Form shortcode arguments.
 		 *
-		 * @example <caption>Make any custom action before login form fields.</caption>
-		 * function my_before_form( $args ) {
+		 * @example <caption>Make any custom action when profile form fields are rendered.</caption>
+		 * function my_main_profile_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * add_action( 'um_main_{$mode}_fields', 'my_before_form', 10, 1 );
+		 * add_action( 'um_main_profile_fields', 'my_main_profile_fields' );
+		 * @example <caption>Make any custom action when login form fields are rendered.</caption>
+		 * function my_main_login_fields( $args ) {
+		 *     // your code here
+		 * }
+		 * add_action( 'um_main_login_fields', 'my_main_login_fields' );
+		 * @example <caption>Make any custom action when register form fields are rendered.</caption>
+		 * function my_main_register_fields( $args ) {
+		 *     // your code here
+		 * }
+		 * add_action( 'um_main_register_fields', 'my_main_register_fields' );
 		 */
 		do_action( "um_main_{$mode}_fields", $args );
-
 		/**
-		 * Fires after login form fields.
+		 * Fires after UM Form fields.
 		 *
-		 * @since 2.0
+		 * @since 1.3.x
 		 * @hook  um_after_form_fields
 		 *
-		 * @param {array} $args Login form shortcode arguments.
+		 * @param {array} $args UM Form shortcode arguments.
 		 *
-		 * @example <caption>Make any custom action after login form fields.</caption>
+		 * @example <caption>Make any custom action after UM Form fields.</caption>
 		 * function my_after_form_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * add_action( 'um_after_form_fields', 'my_after_form_fields', 10, 1 );
+		 * add_action( 'um_after_form_fields', 'my_after_form_fields' );
 		 */
 		do_action( 'um_after_form_fields', $args );
-
 		/**
-		 * Fires after profile form fields.
+		 * Fires after UM Form fields.
 		 *
-		 * @since 2.0
+		 * Note: $mode can be equals to 'login', 'profile', 'register'.
+		 *
+		 * @since 1.3.x
 		 * @hook  um_after_{$mode}_fields
 		 *
-		 * @param {array} $args Profile form shortcode arguments.
+		 * @param {array} $args UM Form shortcode arguments.
 		 *
 		 * @example <caption>Make any custom action after profile form fields.</caption>
-		 * function my_after_form_fields( $args ) {
+		 * function my_after_profile_fields( $args ) {
 		 *     // your code here
 		 * }
-		 * add_action( 'um_after_{$mode}_fields', 'my_after_form_fields', 10, 1 );
+		 * add_action( 'um_after_profile_fields', 'my_after_profile_fields' );
+		 * @example <caption>Make any custom action after login form fields.</caption>
+		 * function my_after_login_fields( $args ) {
+		 *     // your code here
+		 * }
+		 * add_action( 'um_after_login_fields', 'my_after_login_fields' );
+		 * @example <caption>Make any custom action after register form fields.</caption>
+		 * function my_after_register_fields( $args ) {
+		 *     // your code here
+		 * }
+		 * add_action( 'um_after_register_fields', 'my_after_register_fields' );
 		 */
 		do_action( "um_after_{$mode}_fields", $args );
-
 		/**
-		 * Fires after profile form fields.
+		 * Fires after UM Form content.
 		 *
-		 * @since 2.0
-		 * @hook  my_after_form
+		 * @since 1.3.x
+		 * @hook  um_after_form
 		 *
-		 * @param {array} $args Profile form shortcode arguments.
+		 * @param {array} $args UM Form shortcode arguments.
 		 *
-		 * @example <caption>Make any custom action after profile form fields.</caption>
+		 * @example <caption>Make any custom action after UM Form content.</caption>
 		 * function my_after_form( $args ) {
 		 *     // your code here
 		 * }
-		 * add_action( 'my_after_form', 'my_after_form', 10, 1 );
+		 * add_action( 'um_after_form', 'my_after_form' );
 		 */
 		do_action( 'um_after_form', $args );
 
@@ -149,7 +180,6 @@ function um_profile_content_main( $args ) {
 }
 add_action( 'um_profile_content_main', 'um_profile_content_main' );
 
-
 /**
  * Update user's profile
  *

From 4c1575ee36194a323fa4cf2b8b389c2239df926e Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 23 Jun 2023 01:56:15 +0300
Subject: [PATCH 17/37] - reviewed `um_user_login()`;

---
 includes/core/um-actions-login.php | 53 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/includes/core/um-actions-login.php b/includes/core/um-actions-login.php
index eeb48526..dbf019ea 100644
--- a/includes/core/um-actions-login.php
+++ b/includes/core/um-actions-login.php
@@ -1,5 +1,7 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit;
-
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Error procesing hook for login
@@ -13,7 +15,6 @@ function um_submit_form_errors_hook_login( $args ) {
 	$mode = $args['mode'];
 	$user_password = $args['user_password'];
 
-
 	if ( isset( $args['username'] ) && $args['username'] == '' ) {
 		UM()->form()->add_error( 'username', __( 'Please enter your username or email', 'ultimate-member' ) );
 	}
@@ -190,16 +191,17 @@ function um_store_lastlogin_timestamp_( $login ) {
 }
 add_action( 'wp_login', 'um_store_lastlogin_timestamp_' );
 
-
 /**
  * Login user process
  *
  * @param array $args
  */
 function um_user_login( $args ) {
-	$rememberme = ( isset( $args['rememberme'] ) && 1 === (int) $args['rememberme'] && isset( $_REQUEST['rememberme'] ) ) ? 1 : 0; // phpcs:ignore WordPress.Security.NonceVerification
+	// phpcs:disable WordPress.Security.NonceVerification -- already verified here
+	$rememberme = ( isset( $_REQUEST['rememberme'], $args['rememberme'] ) && 1 === (int) $args['rememberme'] ) ? 1 : 0;
 
-	if ( ( UM()->options()->get( 'deny_admin_frontend_login' ) && ! isset( $_GET['provider'] ) ) && strrpos( um_user( 'wp_roles' ), 'administrator' ) !== false ) { // phpcs:ignore WordPress.Security.NonceVerification
+	// @todo check using the 'deny_admin_frontend_login' option
+	if ( false !== strrpos( um_user( 'wp_roles' ), 'administrator' ) && ( ! isset( $_GET['provider'] ) && UM()->options()->get( 'deny_admin_frontend_login' ) ) ) {
 		wp_die( esc_html__( 'This action has been prevented for security measures.', 'ultimate-member' ) );
 	}
 
@@ -208,7 +210,7 @@ function um_user_login( $args ) {
 	/**
 	 * Fires after successful login and before user is redirected.
 	 *
-	 * @since 2.0
+	 * @since 1.3.x
 	 * @hook  um_on_login_before_redirect
 	 *
 	 * @param {int} $user_id User ID.
@@ -221,29 +223,29 @@ function um_user_login( $args ) {
 	 */
 	do_action( 'um_on_login_before_redirect', um_user( 'ID' ) );
 
-	// Priority redirect
+	// Priority redirect from $_GET attribute.
 	if ( ! empty( $args['redirect_to'] ) ) {
-		exit( wp_safe_redirect( $args['redirect_to'] ) );
+		wp_safe_redirect( $args['redirect_to'] );
+		exit;
 	}
 
 	// Role redirect
 	$after_login = um_user( 'after_login' );
 	if ( empty( $after_login ) ) {
-		exit( wp_redirect( um_user_profile_url() ) );
+		wp_safe_redirect( um_user_profile_url() );
+		exit;
 	}
 
 	switch ( $after_login ) {
-
 		case 'redirect_admin':
-			exit( wp_redirect( admin_url() ) );
-			break;
-
+			wp_safe_redirect( admin_url() );
+			exit;
 		case 'redirect_url':
 			/**
-			 * Filters change redirect URL after successful login
+			 * Filters change redirect URL after successful login.
 			 *
 			 * @since 2.0
-			 * @hook  um_profile_can_view_main
+			 * @hook  um_login_redirect_url
 			 *
 			 * @param {string} $can_view Redirect URL.
 			 * @param {int}    $user_id  User ID.
@@ -258,22 +260,19 @@ function um_user_login( $args ) {
 			 * add_filter( 'um_login_redirect_url', 'my_login_redirect_url', 10, 2 );
 			 */
 			$redirect_url = apply_filters( 'um_login_redirect_url', um_user( 'login_redirect_url' ), um_user( 'ID' ) );
-			exit( wp_redirect( $redirect_url ) );
-			break;
-
+			wp_safe_redirect( $redirect_url );
+			exit;
 		case 'refresh':
-			exit( wp_redirect( UM()->permalinks()->get_current_url() ) );
-			break;
-
+			wp_safe_redirect( UM()->permalinks()->get_current_url() );
+			exit;
 		case 'redirect_profile':
 		default:
-			exit( wp_redirect( um_user_profile_url() ) );
-			break;
-
+			wp_safe_redirect( um_user_profile_url() );
+			exit;
 	}
+	// phpcs:enable WordPress.Security.NonceVerification -- already verified here
 }
-add_action( 'um_user_login', 'um_user_login', 10 );
-
+add_action( 'um_user_login', 'um_user_login' );
 
 /**
  * Form processing

From f9404bb516fd26eb973915af54caadfc1d339620 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 23 Jun 2023 03:05:49 +0300
Subject: [PATCH 18/37] - reviewed `um_add_update_notice()`;

---
 includes/core/um-actions-misc.php | 109 ++++++++++++++++++------------
 1 file changed, 65 insertions(+), 44 deletions(-)

diff --git a/includes/core/um-actions-misc.php b/includes/core/um-actions-misc.php
index c5744df3..0160e190 100644
--- a/includes/core/um-actions-misc.php
+++ b/includes/core/um-actions-misc.php
@@ -1,8 +1,8 @@
-<?php if ( ! defined( 'ABSPATH' ) ) {
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
-
 /**
  * Add a force redirect to from $_get
  *
@@ -66,122 +66,125 @@ function um_browser_url_redirect_to( $args ) {
 }
 add_action( 'um_after_form_fields', 'um_browser_url_redirect_to' );
 
-
 /**
- * Add a notice to form
+ * Add a notice to UM Form after submission
  *
- * @param $args
+ * @param array $args
  */
 function um_add_update_notice( $args ) {
 	$output  = '';
 	$err     = '';
 	$success = '';
 
-	if ( ! empty( $_REQUEST['updated'] ) && ! UM()->form()->errors ) { // phpcs:ignore WordPress.Security.NonceVerification
-		switch ( sanitize_key( $_REQUEST['updated'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+	// Skip if there are errors while submission.
+	if ( UM()->form()->errors ) {
+		return;
+	}
+
+	// phpcs:disable WordPress.Security.NonceVerification -- used for echo and already verified here.
+	if ( ! empty( $_REQUEST['updated'] ) ) {
+		$updated = sanitize_key( $_REQUEST['updated'] );
+		switch ( $updated ) {
 			default:
 				/**
-				 * Filters add custom success message
+				 * Filters a custom success message.
 				 *
-				 * @since 2.0
+				 * @since 1.3.x
+				 * @since 2.6.4 Added `$args` parameter.
 				 * @hook  um_custom_success_message_handler
 				 *
-				 * @param {string}  $success  Message.
-				 * @param {array}   $updated  Updated data.
+				 * @param {string} $success Success message.
+				 * @param {string} $updated Updated key.
+				 * @param {array}  $args    UM Form shortcode arguments.
 				 *
 				 * @return {string} Message.
 				 *
-				 * @example <caption>Can view profile.</caption>
-				 * function my_custom_success_message( $success, $updated ) {
-				 *     // your code here
+				 * @example <caption>It adds a custom message for `custom_key_on_profile` updated key.</caption>
+				 * function my_custom_success_message( $success, $updated, $args ) {
+				 *     if ( 'custom_key_on_profile' === $updated ) {
+				 *         $success = 'Some custom message';
+				 *     }
 				 *     return $success;
 				 * }
-				 * add_filter( 'um_custom_success_message_handler', 'my_custom_success_message', 10, 2 );
+				 * add_filter( 'um_custom_success_message_handler', 'my_custom_success_message', 10, 3 );
 				 */
-				$success = apply_filters( 'um_custom_success_message_handler', $success, sanitize_key( $_REQUEST['updated'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+				$success = apply_filters( 'um_custom_success_message_handler', $success, $updated, $args );
 				break;
-
 			case 'account':
 				$success = __( 'Your account was updated successfully.', 'ultimate-member' );
 				break;
-
 			case 'password_changed':
 				$success = __( 'You have successfully changed your password.', 'ultimate-member' );
 				break;
-
 			case 'account_active':
 				$success = __( 'Your account is now active! You can login.', 'ultimate-member' );
 				break;
-
 		}
 	}
 
-	if ( ! empty( $_REQUEST['err'] ) && ! UM()->form()->errors ) { // phpcs:ignore WordPress.Security.NonceVerification
-		switch ( sanitize_key( $_REQUEST['err'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-
+	if ( ! empty( $_REQUEST['err'] ) ) {
+		$request_error = sanitize_key( $_REQUEST['err'] );
+		switch ( $request_error ) {
 			default:
 				/**
-				 * Filters add custom error message
+				 * Filters a custom error message.
 				 *
-				 * @since 2.0
+				 * @since 1.3.x
+				 * @since 2.6.4 Added `$args` parameter.
 				 * @hook  um_custom_error_message_handler
 				 *
-				 * @param {string}  $success  Error message.
-				 * @param {array}   $updated  Error data.
+				 * @param {string} $error         Error message.
+				 * @param {string} $request_error Error data.
+				 * @param {array}  $args          UM Form shortcode arguments.
 				 *
 				 * @return {string} Error message.
 				 *
-				 * @example <caption>Can view profile.</caption>
-				 * function my_custom_error_message( $error, $request_error ) {
-				 *     // your code here
+				 * @example <caption>It adds a custom error for `custom_key_on_profile` error key.</caption>
+				 * function my_custom_error_message( $error, $request_error, $args ) {
+				 *     if ( 'custom_key_on_profile' === $request_error ) {
+				 *         $error = 'Some custom message';
+				 *     }
 				 *     return $error;
 				 * }
-				 * add_filter( 'um_custom_error_message_handler', 'my_custom_error_message', 10, 2 );
+				 * add_filter( 'um_custom_error_message_handler', 'my_custom_error_message', 10, 3 );
 				 */
-				$err = apply_filters( 'um_custom_error_message_handler', $err, sanitize_key( $_REQUEST['err'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
-				if ( ! $err ) {
+				$err = apply_filters( 'um_custom_error_message_handler', $err, $request_error, $args );
+				if ( empty( $err ) ) {
 					$err = __( 'An error has been encountered', 'ultimate-member' );
 				}
 				break;
-
 			case 'registration_disabled':
 				$err = __( 'Registration is currently disabled', 'ultimate-member' );
 				break;
-
 			case 'blocked_email':
 				$err = __( 'This email address has been blocked.', 'ultimate-member' );
 				break;
-
 			case 'blocked_domain':
 				$err = __( 'We do not accept registrations from that domain.', 'ultimate-member' );
 				break;
-
 			case 'blocked_ip':
 				$err = __( 'Your IP address has been blocked.', 'ultimate-member' );
 				break;
-
 			case 'inactive':
 				$err = __( 'Your account has been disabled.', 'ultimate-member' );
 				break;
-
 			case 'awaiting_admin_review':
 				$err = __( 'Your account has not been approved yet.', 'ultimate-member' );
 				break;
-
 			case 'awaiting_email_confirmation':
 				$err = __( 'Your account is awaiting e-mail verification.', 'ultimate-member' );
 				break;
-
 			case 'rejected':
 				$err = __( 'Your membership request has been rejected.', 'ultimate-member' );
 				break;
-
 			case 'invalid_nonce':
 				$err = __( 'An error has been encountered. Probably page was cached. Please try again.', 'ultimate-member' );
 				break;
-
 		}
 	}
+	// phpcs:enable WordPress.Security.NonceVerification -- used for echo and already verified here.
+
+	add_filter( 'um_late_escaping_allowed_tags', 'um_form_notices_additional_tags', 10, 2 );
 
 	if ( ! empty( $err ) ) {
 		$output .= '<p class="um-notice err"><i class="um-icon-ios-close-empty" onclick="jQuery(this).parent().fadeOut();"></i>' . $err . '</p>';
@@ -191,6 +194,24 @@ function um_add_update_notice( $args ) {
 		$output .= '<p class="um-notice success"><i class="um-icon-ios-close-empty" onclick="jQuery(this).parent().fadeOut();"></i>' . $success . '</p>';
 	}
 
-	echo $output;
+	echo wp_kses( $output, UM()->get_allowed_html( 'templates' ) );
+
+	remove_filter( 'um_late_escaping_allowed_tags', 'um_form_notices_additional_tags' );
 }
 add_action( 'um_before_form', 'um_add_update_notice', 500 );
+
+/**
+ * Extends allowed tags for displaying UM Form notices.
+ *
+ * @since 2.6.4
+ *
+ * @param array  $allowed_html
+ * @param string $context
+ * @return array
+ */
+function um_form_notices_additional_tags( $allowed_html, $context ) {
+	if ( 'templates' === $context ) {
+		$allowed_html['i']['onclick'] = true;
+	}
+	return $allowed_html;
+}

From f52f266aa849f3bca70754329582dec324199cb7 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 23 Jun 2023 03:16:42 +0300
Subject: [PATCH 19/37] - reviewed `um_pre_profile_shortcode()`;

---
 includes/core/um-actions-profile.php | 60 +++++++++++++---------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 1376c69a..74e66ff6 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -1363,54 +1363,50 @@ function um_profile_header( $args ) {
 }
 add_action( 'um_profile_header', 'um_profile_header', 9 );
 
-
 /**
- * Adds profile permissions to view/edit
+ * Adds profile permissions to view/edit.
  *
- * @param $args
+ * @param array $args
  */
 function um_pre_profile_shortcode( $args ) {
-	if ( ! array_key_exists( 'mode', $args ) ) {
+	// It handles only UM Profile forms.
+	if ( ! array_key_exists( 'mode', $args ) || 'profile' !== $args['mode'] ) {
 		return;
 	}
-	$mode = $args['mode'];
 
-	if ( 'profile' === $mode ) {
-		if ( UM()->fields()->editing ) {
-			if ( um_get_requested_user() ) {
-				if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {
-					um_redirect_home( um_get_requested_user(), um_is_myprofile() );
-				}
-				um_fetch_user( um_get_requested_user() );
+	if ( UM()->fields()->editing ) {
+		if ( um_get_requested_user() ) {
+			if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {
+				um_redirect_home( um_get_requested_user(), um_is_myprofile() );
 			}
+			um_fetch_user( um_get_requested_user() );
+		}
+	} else {
+		UM()->fields()->viewing = 1;
+
+		if ( um_get_requested_user() ) {
+			if ( ! um_is_myprofile() && ! um_can_view_profile( um_get_requested_user() ) ) {
+				um_redirect_home( um_get_requested_user(), um_is_myprofile() );
+			}
+
+			if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {
+				UM()->user()->cannot_edit = 1;
+			}
+
+			um_fetch_user( um_get_requested_user() );
 		} else {
-			UM()->fields()->viewing = 1;
+			if ( ! is_user_logged_in() ) {
+				um_redirect_home( um_get_requested_user(), um_is_myprofile() );
+			}
 
-			if ( um_get_requested_user() ) {
-				if ( ! um_can_view_profile( um_get_requested_user() ) && ! um_is_myprofile() ) {
-					um_redirect_home( um_get_requested_user(), um_is_myprofile() );
-				}
-
-				if ( ! UM()->roles()->um_current_user_can( 'edit', um_get_requested_user() ) ) {
-					UM()->user()->cannot_edit = 1;
-				}
-
-				um_fetch_user( um_get_requested_user() );
-			} else {
-				if ( ! is_user_logged_in() ) {
-					um_redirect_home( um_get_requested_user(), um_is_myprofile() );
-				}
-
-				if ( ! um_user( 'can_edit_profile' ) ) {
-					UM()->user()->cannot_edit = 1;
-				}
+			if ( ! um_user( 'can_edit_profile' ) ) {
+				UM()->user()->cannot_edit = 1;
 			}
 		}
 	}
 }
 add_action( 'um_pre_profile_shortcode', 'um_pre_profile_shortcode' );
 
-
 /**
  * Display the edit profile icon
  *

From 60a5feb18bc32eecb9813286a16689a3bb892326 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Fri, 23 Jun 2023 10:46:35 +0300
Subject: [PATCH 20/37] - fix edit_field()

---
 includes/core/class-fields.php | 1149 ++++++++++++++------------------
 1 file changed, 518 insertions(+), 631 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 6fe88ed5..acda401f 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2140,70 +2140,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					// Merge data passed with original field data.
 					$data = array_merge( $origin_data, $data );
 				}
-
-				/**
-				 * @var string      $in_row
-				 * @var boolean     $in_sub_row
-				 * @var boolean     $in_column
-				 * @var string      $type
-				 * @var string      $metakey
-				 * @var int         $position
-				 * @var string      $title
-				 * @var string      $help
-				 * @var array       $options
-				 * @var string      $visibility
-				 * @var string      $label
-				 * @var string      $placeholder
-				 * @var boolean     $public
-				 * @var boolean     $editable
-				 * @var string      $icon
-				 * @var boolean     $in_group
-				 * @var boolean     $required
-				 * @var string      $validate
-				 * @var string      $default
-				 * @var string      $conditional
-				 * @var string      $input
-				 * @var string      $js_format
-				 * @var string      $date_max
-				 * @var string      $date_min
-				 * @var string      $disabled_weekdays
-				 * @var string      $years_x
-				 * @var string      $years
-				 * @var string      $range
-				 * @var string      $intervals
-				 * @var string      $height
-				 * @var string      $spacing
-				 * @var string      $borderwidth
-				 * @var string      $borderstyle
-				 * @var string      $bordercolor
-				 * @var string      $divider_text
-				 * @var string      $crop_class
-				 * @var string      $crop_data
-				 * @var string      $modal_size
-				 * @var string      $ratio
-				 * @var string      $min_width
-				 * @var string      $min_height
-				 * @var string      $button_text
-				 * @var string      $max_size
-				 * @var string      $max_size_error
-				 * @var string      $extension_error
-				 * @var string      $allowed_types
-				 * @var string      $upload_text
-				 * @var string      $max_files_error
-				 * @var string      $upload_help_text
-				 * @var string      $min_size_error
-				 * @var string      $filter
-				 * @var string      $content
-				 * @var string      $max_entries
-				 */
-				extract( $data );
 			}
 
 			if ( ! isset( $data['type'] ) ) {
 				return '';
 			}
 
-			if ( isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group' ) {
+			if ( isset( $data['in_group'] ) && '' !== $data['in_group'] && 'group' !== $rule ) {
 				return '';
 			}
 
@@ -2215,7 +2158,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			// required option? 'required_opt' - it's field attribute predefined in the field data in code
 			if ( isset( $data['required_opt'] ) ) {
 				$opt = $data['required_opt'];
-				if ( UM()->options()->get( $opt[0] ) != $opt[1] ) {
+				if ( UM()->options()->get( $opt[0] ) !== $opt[1] ) {
 					return '';
 				}
 			}
@@ -2229,12 +2172,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			// fields that need to be disabled in edit mode (profile) (email, username, etc.)
 			$arr_restricted_fields = $this->get_restricted_fields_for_edit( $_um_profile_id );
-			if ( in_array( $key, $arr_restricted_fields ) && $this->editing == true && $this->set_mode == 'profile' ) {
+			if ( in_array( $key, $arr_restricted_fields, true ) && true === $this->editing && 'profile' === $this->set_mode ) {
 				return '';
 			}
 
-
-			if ( $visibility == 'view' && $this->set_mode != 'register' ) {
+			if ( 'view' === $data['visibility'] && 'register' !== $this->set_mode ) {
 				return '';
 			}
 
@@ -2246,7 +2188,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			// Stop return empty values build field attributes:
 
-			if ( $visibility == 'view' && $this->set_mode == 'register' ) {
+			if ( 'view' === $data['visibility'] && 'register' === $this->set_mode ) {
 
 				um_fetch_user( get_current_user_id() );
 				if ( ! um_user( 'can_edit_everyone' ) ) {
@@ -2254,7 +2196,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				}
 
 				um_fetch_user( $_um_profile_id );
-				if ( isset( $data['public'] ) && $data['public'] == '-2' && $data['roles'] ) {
+				if ( isset( $data['public'] ) && '-2' === $data['public'] && $data['roles'] ) {
 					$current_user_roles = um_user( 'roles' );
 					if ( ! empty( $current_user_roles ) && count( array_intersect( $current_user_roles, $data['roles'] ) ) > 0 ) {
 						$disabled = '';
@@ -2262,9 +2204,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				}
 			}
 
-			if ( ! empty( $this->editing ) && $this->set_mode == 'profile' ) {
+			if ( ! empty( $this->editing ) && 'profile' === $this->set_mode ) {
 				if ( ! UM()->roles()->um_user_can( 'can_edit_everyone' ) ) {
-					if ( isset( $data['editable'] ) && $data['editable'] == 0 ) {
+					if ( isset( $data['editable'] ) && 0 === $data['editable'] ) {
 						$disabled = ' disabled="disabled" ';
 					}
 				}
@@ -2274,41 +2216,47 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			if ( ! isset( $data['autocomplete'] ) ) {
 				$autocomplete = 'off';
+			} else {
+				$autocomplete = $data['autocomplete'];
 			}
 
 			if ( isset( $data['classes'] ) ) {
-				$classes = explode( " ", $data['classes'] );
+				$classes = explode( ' ', $data['classes'] );
+			} else {
+				$classes = '';
 			}
 
 			um_fetch_user( $_um_profile_id );
 
+			if ( ! isset( $data['type'] ) ) {
+				return '';
+			}
+			$type = $data['type'];
+
 			/**
-			 * UM hook
+			 * Filters change field type.
 			 *
-			 * @type filter
-			 * @title um_hook_for_field_{$type}
-			 * @description Change field type
-			 * @input_vars
-			 * [{"var":"$type","type":"string","desc":"Field Type"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage add_filter( 'um_hook_for_field_{$type}', 'function_name', 10, 1 );
-			 * @example
-			 * <?php
-			 * add_filter( 'um_hook_for_field_{$type}', 'my_field_type', 10, 1 );
-			 * function my_get_field( $type ) {
+			 * @since 2.0
+			 * @hook  um_hook_for_field_{$type}
+			 *
+			 * @param {string} $type Field Type.
+			 *
+			 * @return {string} $type Field Type.
+			 *
+			 * @example <caption>Change field type.</caption>
+			 * function my_field_type( $type ) {
 			 *     // your code here
 			 *     return $type;
 			 * }
-			 * ?>
+			 * add_filter( 'um_hook_for_field_{$type}', 'my_field_type', 10, 1 );
 			 */
 			$type = apply_filters( "um_hook_for_field_{$type}", $type );
 			switch ( $type ) {
 
 				case 'textarea':
 				case 'multiselect':
-					$field_id = $field_name = $key;
-					$field_value = $this->field_value( $key, $default, $data );
+					$field_id    = $field_name = $key;
+					$field_value = $this->field_value( $key, $data['default'], $data );
 					break;
 
 				case 'select':
@@ -2322,30 +2270,26 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			}
 
 			/**
-			 * UM hook
+			 * Filters change core id not allowed duplicate.
 			 *
-			 * @type filter
-			 * @title um_completeness_field_id
-			 * @description use for change core id not allowed duplicate
-			 * @input_vars
-			 * [{"var":"$field_id","type":"string","desc":"Field id"},
-			 * {"var":"$data","type":"array","desc":"Field Data"}]
-			 * {"var":"$args","type":"array","desc":"Optional field arguments"}]
-			 * @change_log
-			 * ["Since: 2.0.13"]
-			 * @usage add_filter( 'um_completeness_field_id', 'function_name', 10, 3 );
-			 * @example
-			 * <?php
-			 * add_filter( 'um_completeness_field_id', 'function_name', 10, 3 );
+			 * @since 2.0.13
+			 * @hook  um_completeness_field_id
+			 *
+			 * @param {int}    $field_id  Field id.
+			 * @param {array}  $data      Field Data.
+			 * @param {array}  $args      Optional field arguments.
+			 *
+			 * @return {int} $field_id Field id.
+			 *
+			 * @example <caption>Change core id.</caption>
 			 * function function_name( $field_id, $data, $args ) {
 			 *     // your code here
 			 *     return $field_id;
 			 * }
-			 * ?>
+			 * add_filter( 'um_completeness_field_id', 'function_name', 10, 3 );
 			 */
 			$field_id = apply_filters( 'um_completeness_field_id', $field_id, $data, $args );
 
-
 			/* Begin by field type */
 			switch ( $type ) {
 
@@ -2354,27 +2298,23 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$mode = ( isset( $this->set_mode ) ) ? $this->set_mode : 'no_mode';
 
 					/**
-					 * UM hook
+					 * Filters change field html by $mode and field $type
 					 *
-					 * @type filter
-					 * @title um_edit_field_{$mode}_{$type}
-					 * @description Change field html by $mode and field $type
-					 * @input_vars
-					 * [{"var":"$output","type":"string","desc":"Field HTML"},
-					 * {"var":"$data","type":"array","desc":"Field Data"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_filter( 'um_edit_field_{$mode}_{$type}', 'function_name', 10, 2 );
-					 * @example
-					 * <?php
-					 * add_filter( 'um_edit_field_{$mode}_{$type}', 'my_edit_field_html', 10, 2 );
+					 * @since 2.0
+					 * @hook  um_edit_field_{$mode}_{$type}
+					 *
+					 * @param {string} $output  Field HTML.
+					 * @param {array}  $data      Field Data.
+					 *
+					 * @return {int} $output Field HTML.
+					 *
+					 * @example <caption>Change field html by $mode and field $type.</caption>
 					 * function my_edit_field_html( $output, $data ) {
 					 *     // your code here
 					 *     return $output;
 					 * }
-					 * ?>
+					 * add_filter( 'um_edit_field_{$mode}_{$type}', 'my_edit_field_html', 10, 2 );
 					 */
-
 					$output .= apply_filters( "um_edit_field_{$mode}_{$type}", $output, $data );
 					break;
 
@@ -2384,26 +2324,23 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				case 'vimeo_video':
 				case 'spotify':
 				case 'soundcloud_track':
-
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
-
-						$output .= '<div class="um-field-icon"><i class="' . $icon . '"></i></div>';
-
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+						$output .= '<div class="um-field-icon"><i class="' . $data['icon'] . '"></i></div>';
 					}
 
 					$field_name  = $key . $form_suffix;
-					$field_value = $this->field_value( $key, $default, $data );
+					$field_value = $this->field_value( $key, $data['default'], $data );
 					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
 
-					$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2413,7 +2350,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2422,26 +2359,25 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Text */
 				case 'text':
-
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 					}
 
 					$field_name  = $key . $form_suffix;
-					$field_value = $this->field_value( $key, $default, $data );
+					$field_value = $this->field_value( $key, $data['default'], $data );
 					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
 
-					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2460,26 +2396,25 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Tel */
 				case 'tel':
-
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 					}
 
 					$field_name  = $key . $form_suffix;
-					$field_value = $this->field_value( $key, $default, $data );
+					$field_value = $this->field_value( $key, $data['default'], $data );
 					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
 
-					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2489,7 +2424,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2498,39 +2433,38 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Number */
 				case 'number':
-
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 					}
 
 					$number_limit = '';
-					if ( isset( $min ) ) {
-						$number_limit .= ' min="' . esc_attr( $min ) . '" ';
+					if ( isset( $data['min'] ) ) {
+						$number_limit .= ' min="' . esc_attr( $data['min'] ) . '" ';
 					}
-					if ( isset( $max ) ) {
-						$number_limit .= ' max="' . esc_attr( $max ) . '" ';
+					if ( isset( $data['max'] ) ) {
+						$number_limit .= ' max="' . esc_attr( $data['max'] ) . '" ';
 					}
 
-					$field_value = $this->field_value( $key, $default, $data );
+					$field_value = $this->field_value( $key, $data['default'], $data );
 					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
 
-					$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="number" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" ' . $number_limit . ' />
+					$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="number" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" ' . $number_limit . ' />
 
 						</div>';
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2539,34 +2473,33 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Password */
 				case 'password':
-
 					$original_key = $key;
 
-					if ( $key == 'single_user_password' ) {
+					if ( 'single_user_password' === $key ) {
 
 						$key = $original_key;
 
-						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+						$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 						if ( isset( $data['label'] ) ) {
-							$output .= $this->field_label( $label, $key, $data );
+							$output .= $this->field_label( $data['label'], $key, $data );
 						}
 
 						$output .= '<div class="um-field-area">';
 
-						if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 						}
 
-						$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+						$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 							</div>';
 
 						if ( $this->is_error( $key ) ) {
 							$output .= $this->field_error( $this->show_error( $key ) );
-						}else if ( $this->is_notice( $key ) ) {
+						} elseif ( $this->is_notice( $key ) ) {
 							$output .= $this->field_notice( $this->show_notice( $key ) );
 						}
 
@@ -2574,11 +2507,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					} else {
 
-						if ( UM()->account()->current_password_is_required( 'password' ) &&
-						     ( $this->set_mode == 'account' || um_is_core_page( 'account' ) ) ) {
+						if ( UM()->account()->current_password_is_required( 'password' ) && ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
 
-							$key = 'current_' . $original_key;
-							$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+							$key     = 'current_' . $original_key;
+							$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 							if ( isset( $data['label'] ) ) {
 								$output .= $this->field_label( __( 'Current Password', 'ultimate-member' ), $key, $data );
@@ -2586,13 +2518,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 							$output .= '<div class="um-field-area">';
 
-							if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field') {
+							if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 							}
 
-							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 								</div>';
 
@@ -2608,32 +2540,32 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$key = $original_key;
 
-						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+						$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
-						if ( $this->set_mode == 'account' && um_is_core_page( 'account' ) || $this->set_mode == 'password' && um_is_core_page( 'password-reset' ) ) {
+						if ( 'account' === $this->set_mode && um_is_core_page( 'account' ) || 'password' === $this->set_mode && um_is_core_page( 'password-reset' ) ) {
 
 							$output .= $this->field_label( __( 'New Password', 'ultimate-member' ), $key, $data );
 
 						} elseif ( isset( $data['label'] ) ) {
 
-							$output .= $this->field_label( $label, $key, $data );
+							$output .= $this->field_label( $data['label'], $key, $data );
 
 						}
 
 						$output .= '<div class="um-field-area">';
 
-						if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field') {
+						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 						}
 
 						$name = $key . $form_suffix;
-						if ( $this->set_mode == 'password' && um_is_core_page( 'password-reset' ) ) {
+						if ( 'password' === $this->set_mode && um_is_core_page( 'password-reset' ) ) {
 							$name = $key;
 						}
 
-						$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+						$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2645,84 +2577,83 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$output .= '</div>';
 
-						if ( $this->set_mode != 'login' && isset( $data['force_confirm_pass'] ) && $data['force_confirm_pass'] == 1 ) {
+						if ( 'login' !== $this->set_mode && isset( $data['force_confirm_pass'] ) && 1 === $data['force_confirm_pass'] ) {
 
-							$key = 'confirm_' . $original_key;
-							$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+							$key     = 'confirm_' . $original_key;
+							$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 							if ( ! empty( $data['label_confirm_pass'] ) ) {
 								$label_confirm_pass = __( $data['label_confirm_pass'], 'ultimate-member' );
-								$output .= $this->field_label( $label_confirm_pass, $key, $data );
+								$output            .= $this->field_label( $label_confirm_pass, $key, $data );
 							} elseif ( isset( $data['label'] ) ) {
 								$data['label'] = __( $data['label'], 'ultimate-member' );
+								/* translators: 1: label, 2: key, 3: data. */
 								$output .= $this->field_label( sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] ), $key, $data );
 							}
 
 							$output .= '<div class="um-field-area">';
 
-							if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+							if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 							}
 
 							$name = $key . $form_suffix;
-							if ( $this->set_mode == 'password' && um_is_core_page( 'password-reset' ) ) {
+							if ( 'password' === $this->set_mode && um_is_core_page( 'password-reset' ) ) {
 								$name = $key;
 							}
 
 							if ( ! empty( $label_confirm_pass ) ) {
 								$placeholder = $label_confirm_pass;
-							} elseif( ! empty( $placeholder ) && ! isset( $data['label'] ) ) {
-								$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $placeholder );
-							} elseif( isset( $data['label'] ) ) {
+							} elseif ( ! empty( $data['placeholder'] ) && ! isset( $data['label'] ) ) {
+								/* translators: 1: placeholder. */
+								$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['placeholder'] );
+							} elseif ( isset( $data['label'] ) ) {
+								/* translators: 1: label. */
 								$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] );
 							}
 
-
-							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />';
-
+							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />';
 
 							$output .= '</div>';
 
 							if ( $this->is_error( $key ) ) {
 								$output .= $this->field_error( $this->show_error( $key ) );
-							}else if ( $this->is_notice( $key ) ) {
+							} elseif ( $this->is_notice( $key ) ) {
 								$output .= $this->field_notice( $this->show_notice( $key ) );
 							}
 
 							$output .= '</div>';
 
 						}
-
 					}
 
 					break;
 
 				/* URL */
 				case 'url':
-
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 					}
 
-					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $this->field_value( $key, $default, $data ) ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $this->field_value( $key, $data['default'], $data ) ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2731,23 +2662,22 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Date */
 				case 'date':
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
-
-					if (isset( $data['label'] )) {
-						$output .= $this->field_label( $label, $key, $data );
+					if ( isset( $data['label'] ) ) {
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 					}
 
 					// Normalise date format.
-					$value = $this->field_value( $key, $default, $data );
+					$value = $this->field_value( $key, $data['default'], $data );
 					if ( $value ) {
 						// numeric (either unix or YYYYMMDD). ACF uses Ymd format of date inside the meta tables.
 						if ( is_numeric( $value ) && strlen( $value ) !== 8 ) {
@@ -2759,13 +2689,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$value = date( 'Y/m/d', $unixtimestamp );
 					}
 
-					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" data-range="' . esc_attr( $range ) . '" data-years="' . esc_attr( $years ) . '" data-years_x="' . esc_attr( $years_x ) . '" data-disabled_weekdays="' . esc_attr( $disabled_weekdays ) . '" data-date_min="' . esc_attr( $date_min ) . '" data-date_max="' . esc_attr( $date_max ) . '" data-format="' . esc_attr( $js_format ) . '" data-value="' . esc_attr( $value ) . '" />
+					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" data-range="' . esc_attr( $data['range'] ) . '" data-years="' . esc_attr( $data['years'] ) . '" data-years_x="' . esc_attr( $data['years_x'] ) . '" data-disabled_weekdays="' . esc_attr( $data['disabled_weekdays'] ) . '" data-date_min="' . esc_attr( $data['date_min'] ) . '" data-date_max="' . esc_attr( $data['date_max'] ) . '" data-format="' . esc_attr( $data['js_format'] ) . '" data-value="' . esc_attr( $value ) . '" />
 
 						</div>';
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2774,28 +2704,27 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Time */
 				case 'time':
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
-
-					if (isset( $data['label'] )) {
-						$output .= $this->field_label( $label, $key, $data );
+					if ( isset( $data['label'] ) ) {
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 
 					}
 
-					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '"  data-format="' . esc_attr( $js_format ) . '" data-intervals="' . esc_attr( $intervals ) . '" data-value="' . $this->field_value( $key, $default, $data ) . '" />
+					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '"  data-format="' . esc_attr( $data['js_format'] ) . '" data-intervals="' . esc_attr( $data['intervals'] ) . '" data-value="' . $this->field_value( $key, $data['default'], $data ) . '" />
 
 						</div>';
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2809,25 +2738,25 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Textarea */
 				case 'textarea':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					if ( isset( $data['html'] ) && $data['html'] != 0 && 'description' !== $key ) {
+					if ( isset( $data['html'] ) && 0 !== $data['html'] && 'description' !== $key ) {
 
 						$textarea_settings = array(
 							'media_buttons' => false,
 							'wpautop'       => false,
 							'editor_class'  => $this->get_class( $key, $data ),
-							'editor_height' => $height,
+							'editor_height' => $data['height'],
 							'tinymce'       => array(
 								'toolbar1' => 'formatselect,bullist,numlist,bold,italic,underline,forecolor,blockquote,hr,removeformat,link,unlink,undo,redo',
 								'toolbar2' => '',
-							)
+							),
 						);
 
 						if ( ! empty( $disabled ) ) {
@@ -2835,24 +2764,21 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						/**
-						 * UM hook
+						 * Filters change WP Editor options for textarea init.
 						 *
-						 * @type filter
-						 * @title um_form_fields_textarea_settings
-						 * @description Change WP Editor options for textarea init
-						 * @input_vars
-						 * [{"var":"$textarea_settings","type":"array","desc":"WP Editor settings"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_form_fields_textarea_settings', 'function_name', 10, 1 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_form_fields_textarea_settings', 'my_textarea_settings', 10, 1 );
-						 * function my_edit_field_html( $textarea_settings ) {
+						 * @since 2.0
+						 * @hook  um_form_fields_textarea_settings
+						 *
+						 * @param {array}  $textarea_settings  WP Editor settings.
+						 *
+						 * @return {array} $textarea_settings  WP Editor settings.
+						 *
+						 * @example <caption>Change WP Editor options.</caption>
+						 * function function_name( $textarea_settings ) {
 						 *     // your code here
 						 *     return $textarea_settings;
 						 * }
-						 * ?>
+						 * add_filter( 'um_form_fields_textarea_settings', 'function_name', 10, 1 );
 						 */
 						$textarea_settings = apply_filters( 'um_form_fields_textarea_settings', $textarea_settings );
 
@@ -2864,13 +2790,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						// add the contents of the buffer to the output variable
 						$output .= ob_get_clean();
-						$output .= '<br /><span class="description">' . $placeholder . '</span>';
+						$output .= '<br /><span class="description">' . $data['placeholder'] . '</span>';
 					} else {
 						$textarea_field_value = '';
 						if ( ! empty( $field_value ) ) {
 							$textarea_field_value = ! empty( $data['html'] ) ? $field_value : wp_strip_all_tags( $field_value );
 						}
-						$output .= '<textarea  ' . $disabled . '  style="height: ' . esc_attr( $height ) . ';" class="' . $this->get_class( $key, $data ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_id ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . esc_textarea( $textarea_field_value ) . '</textarea>';
+						$output .= '<textarea  ' . $disabled . '  style="height: ' . esc_attr( $data['height'] ) . ';" class="' . $this->get_class( $key, $data ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_id ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '">' . esc_textarea( $textarea_field_value ) . '</textarea>';
 					}
 
 					$output .= '</div>';
@@ -2881,7 +2807,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -2890,15 +2816,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Rating */
 				case 'rating':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
 
-					$output .= '<div class="um-rating um-raty" id="' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" data-number="' . esc_attr( $data['number'] ) . '" data-score="' . $this->field_value( $key, $default, $data ) . '"></div>';
+					$output .= '<div class="um-rating um-raty" id="' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" data-number="' . esc_attr( $data['number'] ) . '" data-score="' . $this->field_value( $key, $data['default'], $data ) . '"></div>';
 					$output .= '</div>';
 
 					if ( $this->is_error( $key ) ) {
@@ -2913,78 +2839,76 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Gap/Space */
 				case 'spacing':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, array( 'height' => $spacing ) ) . '></div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'height' => $data['spacing'] ) ) . '></div>';
 					break;
 
 				/* A line divider */
 				case 'divider':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, array( 'border-bottom' => $borderwidth . 'px ' . $borderstyle . ' ' . $bordercolor ) ) . '>';
-					if ( $divider_text ) {
-						$output .= '<div class="um-field-divider-text"><span>' . esc_html( $divider_text ) . '</span></div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'border-bottom' => $data['borderwidth'] . 'px ' . $data['borderstyle'] . ' ' . $data['bordercolor'] ) ) . '>';
+					if ( $data['divider_text'] ) {
+						$output .= '<div class="um-field-divider-text"><span>' . esc_html( $data['divider_text'] ) . '</span></div>';
 					}
 					$output .= '</div>';
 					break;
 
 				/* Single Image Upload */
 				case 'image':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
-					if ( in_array( $key, array( 'profile_photo', 'cover_photo' ) ) ) {
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
+					if ( in_array( $key, array( 'profile_photo', 'cover_photo' ), true ) ) {
 						$field_value = '';
 					} else {
-						$field_value = $this->field_value( $key, $default, $data );
+						$field_value = $this->field_value( $key, $data['default'], $data );
 					}
 					$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $field_value . '" />';
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 					$modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __( 'Upload Photo', 'ultimate-member' );
-					$output .= '<div class="um-field-area" style="text-align: center;">';
+					$output     .= '<div class="um-field-area" style="text-align: center;">';
 
-					if ( ! empty( $field_value ) && $field_value != 'empty_file' ) {
-						if ( ! in_array( $key, array( 'profile_photo', 'cover_photo' ) ) ) {
-							if ( isset( $this->set_mode ) && 'register' == $this->set_mode ) {
-								$image_info = get_transient("um_{$field_value}");
+					if ( ! empty( $field_value ) && 'empty_file' !== $field_value ) {
+						if ( ! in_array( $key, array( 'profile_photo', 'cover_photo' ), true ) ) {
+							if ( isset( $this->set_mode ) && 'register' === $this->set_mode ) {
+								$image_info = get_transient( "um_{$field_value}" );
 							} else {
-								$image_info = um_user( $data['metakey']."_metadata" );
+								$image_info = um_user( $data['metakey'] . '_metadata' );
 							}
 
-							if ( ( isset( $this->set_mode ) && $this->set_mode == 'register' ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $field_value ) ) {
-								$imgValue = UM()->uploader()->get_core_temp_url() . "/" . $this->field_value( $key, $default, $data );
+							if ( ( isset( $this->set_mode ) && 'register' === $this->set_mode ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $field_value ) ) {
+								$img_value = UM()->uploader()->get_core_temp_url() . '/' . $this->field_value( $key, $data['default'], $data );
 							} else {
-								$imgValue = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
+								$img_value = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
 							}
-							$img = '<img src="' . $imgValue . '" alt="" />';
+							$img = '<img src="' . $img_value . '" alt="" />';
 						} else {
 							$img = '';
 						}
-						$output .= '<div class="um-single-image-preview show ' . $crop_class . '" data-crop="' . $crop_data . '" data-key="' . $key . '">';
+						$output .= '<div class="um-single-image-preview show ' . $data['crop_class'] . '" data-crop="' . $data['crop_data'] . '" data-key="' . $key . '">';
 						if ( empty( $disabled ) ) {
 							$output .= '<a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a>';
 						}
 						$output .= $img;
 						$output .= '</div>';
 						if ( empty( $disabled ) ) {
-							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . $modal_size . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . __( 'Change photo', 'ultimate-member' ) . '</a>';
+							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . $data['modal_size'] . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . __( 'Change photo', 'ultimate-member' ) . '</a>';
 						}
-
-
 					} else {
-						$output .= '<div class="um-single-image-preview ' . $crop_class . '" data-crop="' . $crop_data . '" data-key="' . $key . '">';
+						$output .= '<div class="um-single-image-preview ' . $data['crop_class'] . '" data-crop="' . $data['crop_data'] . '" data-key="' . $key . '">';
 						if ( empty( $disabled ) ) {
 							$output .= '<a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a>';
 						}
 						$output .= '<img src="" alt="" /><div class="um-clear"></div></div>';
 						if ( empty( $disabled ) ) {
-							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . $modal_size . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . $button_text . '</a>';
+							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . $data['modal_size'] . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . $data['button_text'] . '</a>';
 						}
 					}
 					$output .= '</div>';
 					/* modal hidden */
 					if ( empty( $disabled ) ) {
-						if ( ! isset( $allowed_types ) ) {
+						if ( ! isset( $data['allowed_types'] ) ) {
 							$allowed_types = 'gif,jpg,jpeg,png';
-						} elseif ( is_array( $allowed_types ) ) {
-							$allowed_types = implode( ',', $allowed_types );
+						} elseif ( is_array( $data['allowed_types'] ) ) {
+							$allowed_types = implode( ',', $data['allowed_types'] );
 						}
 
 						$output .= '<div class="um-modal-hidden-content">';
@@ -2999,8 +2923,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						$nonce   = wp_create_nonce( 'um_upload_nonce-' . $this->timestamp );
-						$output .= '<div class="um-single-image-preview ' . $crop_class . '"  data-crop="' . $crop_data . '" data-ratio="' . $ratio . '" data-min_width="' . $min_width . '" data-min_height="' . $min_height . '" data-coord=""><a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a><img src="" alt="" /><div class="um-clear"></div></div><div class="um-clear"></div>';
-						$output .= '<div class="um-single-image-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-nonce="' . $nonce . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-icon="' . esc_attr( $icon ) . '" data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $max_size ) . '" data-max_size_error="' . esc_attr( $max_size_error ) . '" data-min_size_error="' . esc_attr( $min_size_error ) . '" data-extension_error="' . esc_attr( $extension_error ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $upload_text ) . '" data-max_files_error="' . esc_attr( $max_files_error ) . '" data-upload_help_text="' . esc_attr( $upload_help_text ) . '">' . $button_text . '</div>';
+						$output .= '<div class="um-single-image-preview ' . $data['crop_class'] . '"  data-crop="' . $data['crop_data'] . '" data-ratio="' . $data['ratio'] . '" data-min_width="' . $data['min_width'] . '" data-min_height="' . $data['min_height'] . '" data-coord=""><a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a><img src="" alt="" /><div class="um-clear"></div></div><div class="um-clear"></div>';
+						$output .= '<div class="um-single-image-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-nonce="' . $nonce . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-icon="' . esc_attr( $data['icon'] ) . '" data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $data['max_size'] ) . '" data-max_size_error="' . esc_attr( $data['max_size_error'] ) . '" data-min_size_error="' . esc_attr( $data['min_size_error'] ) . '" data-extension_error="' . esc_attr( $data['extension_error'] ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $data['upload_text'] ) . '" data-max_files_error="' . esc_attr( $data['max_files_error'] ) . '" data-upload_help_text="' . esc_attr( $data['upload_help_text'] ) . '">' . $data['button_text'] . '</div>';
 						$output .= '<div class="um-modal-footer">
 									<div class="um-modal-right">
 										<a href="javascript:void(0);" class="um-modal-btn um-finish-upload image disabled" data-key="' . $key . '" data-change="' . __( 'Change photo', 'ultimate-member' ) . '" data-processing="' . __( 'Processing...', 'ultimate-member' ) . '"> ' . __( 'Apply', 'ultimate-member' ) . '</a>
@@ -3023,23 +2947,23 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Single File Upload */
 				case 'file':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
-					$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $default, $data ) . '" />';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
+					$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" />';
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 					$modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __( 'Upload File', 'ultimate-member' );
-					$output .= '<div class="um-field-area" style="text-align: center;">';
+					$output     .= '<div class="um-field-area" style="text-align: center;">';
 
-					$file_field_value = $this->field_value( $key, $default, $data );
+					$file_field_value = $this->field_value( $key, $data['default'], $data );
 
-					if ( ! empty( $file_field_value ) && 'empty_file' !==  $file_field_value ) {
+					if ( ! empty( $file_field_value ) && 'empty_file' !== $file_field_value ) {
 						$file_type = wp_check_filetype( $file_field_value );
 
 						if ( um_is_temp_file( $file_field_value ) ) {
 							$file_info = get_transient( "um_{$file_field_value}" );
 						} else {
-							$file_info = um_user( $data['metakey'] . "_metadata" );
+							$file_info = um_user( $data['metakey'] . '_metadata' );
 						}
 
 						$file_field_name = $file_field_value;
@@ -3047,12 +2971,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$file_field_name = $file_info['original_name'];
 						}
 
-						if ( ( isset( $this->set_mode ) && 'register' == $this->set_mode ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $file_field_value ) ) {
+						if ( ( isset( $this->set_mode ) && 'register' === $this->set_mode ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $file_field_value ) ) {
 							$file_url = UM()->uploader()->get_core_temp_url() . DIRECTORY_SEPARATOR . $file_field_value;
 							$file_dir = UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $file_field_value;
 						} else {
 							$file_url = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
-							$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $this->field_value( $key, $default, $data );
+							$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $this->field_value( $key, $data['default'], $data );
 						}
 
 						//multisite fix for old customers
@@ -3076,12 +3000,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						if ( empty( $disabled ) ) {
-							$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$modal_size}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">" . __( 'Change file', 'ultimate-member' ) . "</a>";
+							$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$data['modal_size']}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">" . __( 'Change file', 'ultimate-member' ) . "</a>";
 						}
 					} else {
 						$output .= "<div class=\"um-single-file-preview\" data-key=\"{$key}\"></div>";
 						if ( empty( $disabled ) ) {
-							$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$modal_size}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">{$button_text}</a>";
+							$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$data['modal_size']}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">{$data['button_text']}</a>";
 						}
 					}
 					$output .= '</div>';
@@ -3090,7 +3014,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						if ( ! isset( $allowed_types ) ) {
 							$allowed_types = 'pdf,txt';
 						} elseif ( is_array( $allowed_types ) ) {
-							$allowed_types = implode( ',', $allowed_types );
+							$allowed_types = implode( ',', $data['allowed_types'] );
 						}
 
 						$output .= '<div class="um-modal-hidden-content">';
@@ -3112,8 +3036,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 											</a>
 										</div>
 								</div>';
-						$nonce  = wp_create_nonce( 'um_upload_nonce-' . $this->timestamp );
-						$output .= '<div class="um-single-file-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-nonce="' . $nonce . '" data-icon="' . esc_attr( $icon ) . '" data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $max_size ) . '" data-max_size_error="' . esc_attr( $max_size_error ) . '" data-min_size_error="' . esc_attr( $min_size_error ) . '" data-extension_error="' . esc_attr( $extension_error ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $upload_text ) . '" data-max_files_error="' . esc_attr( $max_files_error ) . '" data-upload_help_text="' . esc_attr( $upload_help_text ) . '">' . $button_text . '</div>';
+						$nonce   = wp_create_nonce( 'um_upload_nonce-' . $this->timestamp );
+						$output .= '<div class="um-single-file-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-nonce="' . $nonce . '" data-icon="' . esc_attr( $data['icon'] ) . '" data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $data['max_size'] ) . '" data-max_size_error="' . esc_attr( $data['max_size_error'] ) . '" data-min_size_error="' . esc_attr( $data['min_size_error'] ) . '" data-extension_error="' . esc_attr( $data['extension_error'] ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $data['upload_text'] ) . '" data-max_files_error="' . esc_attr( $data['max_files_error'] ) . '" data-upload_help_text="' . esc_attr( $data['upload_help_text'] ) . '">' . $data['button_text'] . '</div>';
 						$output .= '<div class="um-modal-footer">
 									<div class="um-modal-right">
 										<a href="javascript:void(0);" class="um-modal-btn um-finish-upload file disabled" data-key="' . esc_attr( $key ) . '" data-change="' . esc_attr__( 'Change file' ) . '" data-processing="' . esc_attr__( 'Processing...', 'ultimate-member' ) . '"> ' . __( 'Save', 'ultimate-member' ) . '</a>
@@ -3127,7 +3051,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					/* end */
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 					$output .= '</div>';
@@ -3136,32 +3060,31 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Select dropdown */
 				case 'select':
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
-
-					if ( isset( $data['allowclear'] ) && $data['allowclear'] == 0 ) {
+					if ( isset( $data['allowclear'] ) && 0 === $data['allowclear'] ) {
 						$class = 'um-s2';
 					} else {
 						$class = 'um-s1';
 					}
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
-					$output .= '<div class="um-field-area ' . ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ? 'um-field-area-has-icon' : '' ) . ' ">';
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+					$output .= '<div class="um-field-area ' . ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ? 'um-field-area-has-icon' : '' ) . ' ">';
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 					}
 
-					$options = array();
-					$has_parent_option = false;
-					$disabled_by_parent_option = '';
-					$atts_ajax = '';
+					$options                      = array();
+					$has_parent_option            = false;
+					$disabled_by_parent_option    = '';
+					$atts_ajax                    = '';
 					$select_original_option_value = '';
 
-					if ( isset( $data[ 'options' ] ) && is_array( $data[ 'options' ] ) ) {
-						$options = $data[ 'options' ];
+					if ( isset( $data['options'] ) && is_array( $data['options'] ) ) {
+						$options = $data['options'];
 					}
 
 					if ( ! empty( $data['parent_dropdown_relationship'] ) && ! UM()->user()->preview ) {
@@ -3171,32 +3094,27 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$has_parent_option = true;
 
 						/**
-						 * UM hook
+						 * Filters change parent dropdown relationship by $form_key.
 						 *
-						 * @type filter
-						 * @title um_custom_dropdown_options_parent__{$form_key}
-						 * @description Change parent dropdown relationship by $form_key
-						 * @input_vars
-						 * [{"var":"$parent","type":"string","desc":"Parent dropdown relationship"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_custom_dropdown_options_parent__{$form_key}', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_custom_dropdown_options_parent__{$form_key}', 'my_custom_dropdown_options_parent', 10, 2 );
-						 * function my_custom_dropdown_options_parent( $parent, $data ) {
+						 * @since 2.0
+						 * @hook  um_custom_dropdown_options_parent__{$form_key}
+						 *
+						 * @param {string}  $parent  Parent dropdown relationship.
+						 * @param {array}   $data    Field Data.
+						 *
+						 * @return {array} $parent  Parent dropdown relationship.
+						 *
+						 * @example <caption>Change parent dropdown relationship.</caption>
+						 * function function_name( $parent, $data ) {
 						 *     // your code here
 						 *     return $parent;
 						 * }
-						 * ?>
+						 * add_filter( 'um_custom_dropdown_options_parent__{$form_key}', 'function_name', 10, 2 );
 						 */
 						$parent_dropdown_relationship = apply_filters( "um_custom_dropdown_options_parent__{$form_key}", $data['parent_dropdown_relationship'], $data );
-						$atts_ajax .= " data-um-parent='{$parent_dropdown_relationship}' ";
+						$atts_ajax                   .= " data-um-parent='{$parent_dropdown_relationship}' ";
 
-						if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option && function_exists( $data['custom_dropdown_options_source'] ) &&
-							um_user( $data['parent_dropdown_relationship'] )
-						) {
+						if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option && function_exists( $data['custom_dropdown_options_source'] ) && um_user( $data['parent_dropdown_relationship'] ) ) {
 							if ( ! $this->is_source_blacklisted( $data['custom_dropdown_options_source'] ) ) {
 								$options = call_user_func( $data['custom_dropdown_options_source'], $data['parent_dropdown_relationship'] );
 							}
@@ -3215,8 +3133,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					// Child dropdown
 					if ( $has_parent_option ) {
-						if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option &&
-							 function_exists( $data['custom_dropdown_options_source'] ) && isset( UM()->form()->post_form[ $form_key ] ) ) {
+						if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option && function_exists( $data['custom_dropdown_options_source'] ) && isset( UM()->form()->post_form[ $form_key ] ) ) {
 							if ( ! $this->is_source_blacklisted( $data['custom_dropdown_options_source'] ) ) {
 								$options = call_user_func( $data['custom_dropdown_options_source'], $data['parent_dropdown_relationship'] );
 							}
@@ -3226,49 +3143,43 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					if ( ! empty( $data['custom_dropdown_options_source'] ) ) {
 
 						/**
-						 * UM hook
+						 * Filters change custom dropdown options source by $form_key.
 						 *
-						 * @type filter
-						 * @title um_custom_dropdown_options_source__{$form_key}
-						 * @description Change custom dropdown options source by $form_key
-						 * @input_vars
-						 * [{"var":"$source","type":"string","desc":"Dropdown options source"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_custom_dropdown_options_source__{$form_key}', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_custom_dropdown_options_source__{$form_key}', 'my_custom_dropdown_options_source', 10, 2 );
-						 * function my_custom_dropdown_options_source( $source, $data ) {
+						 * @since 2.0
+						 * @hook  um_custom_dropdown_options_source__{$form_key}
+						 *
+						 * @param {string}  $source  Dropdown options source.
+						 * @param {array}   $data    Field Data.
+						 *
+						 * @return {array} $source  Parent dropdown relationship.
+						 *
+						 * @example <caption>Change custom dropdown options.</caption>
+						 * function function_name( $source, $data ) {
 						 *     // your code here
 						 *     return $source;
 						 * }
-						 * ?>
+						 * add_filter( 'um_custom_dropdown_options_source__{$form_key}', 'function_name', 10, 2 );
 						 */
 						$ajax_source = apply_filters( "um_custom_dropdown_options_source__{$form_key}", $data['custom_dropdown_options_source'], $data );
-						$atts_ajax .= ' data-um-ajax-source="' . esc_attr( $ajax_source ) . '" ';
+						$atts_ajax  .= ' data-um-ajax-source="' . esc_attr( $ajax_source ) . '" ';
 
 						/**
-						 * UM hook
+						 * Filters change custom dropdown options source by $form_key.
 						 *
-						 * @type filter
-						 * @title um_custom_dropdown_options_source_url__{$form_key}
-						 * @description Change custom dropdown options source URL by $form_key
-						 * @input_vars
-						 * [{"var":"$url","type":"string","desc":"Dropdown options source URL"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_custom_dropdown_options_source_url__{$form_key}', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_custom_dropdown_options_source_url__{$form_key}', 'my_custom_dropdown_options_source_url', 10, 2 );
-						 * function my_custom_dropdown_options_source( $url, $data ) {
+						 * @since 2.0
+						 * @hook  um_custom_dropdown_options_source_url__{$form_key}
+						 *
+						 * @param {string}  $url     Dropdown options source URL.
+						 * @param {array}   $data    Field Data.
+						 *
+						 * @return {array} $url  Parent dropdown relationship.
+						 *
+						 * @example <caption>Change custom dropdown options.</caption>
+						 * function my_custom_dropdown_options_source_url( $url, $data ) {
 						 *     // your code here
 						 *     return $url;
 						 * }
-						 * ?>
+						 * add_filter( 'um_custom_dropdown_options_source_url__{$form_key}', 'my_custom_dropdown_options_source_url', 10, 2 );
 						 */
 						// todo maybe deprecate
 //						$ajax_source_url = apply_filters( "um_custom_dropdown_options_source_url__{$form_key}", admin_url( 'admin-ajax.php' ), $data );
@@ -3277,36 +3188,33 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 
 					/**
-					 * UM hook
+					 * Filters enable options pairs by field $key.
 					 *
-					 * @type filter
-					 * @title um_fields_options_enable_pairs__{$key}
-					 * @description Enable options pairs by field $key
-					 * @input_vars
-					 * [{"var":"$options_pairs","type":"string","desc":"Enable pairs"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_filter( 'um_fields_options_enable_pairs__{$key}', 'function_name', 10, 1 );
-					 * @example
-					 * <?php
-					 * add_filter( 'um_fields_options_enable_pairs__{$key}', 'my_fields_options_enable_pairs', 10, 1 );
+					 * @since 2.0
+					 * @hook  um_fields_options_enable_pairs__{$key}
+					 *
+					 * @param {string}  $options_pairs  Enable pairs.
+					 *
+					 * @return {string}  $options_pairs  Enable pairs.
+					 *
+					 * @example <caption>Enable options pairs.</caption>
 					 * function my_fields_options_enable_pairs( $options_pairs ) {
 					 *     // your code here
 					 *     return $options_pairs;
 					 * }
-					 * ?>
+					 * add_filter( 'um_fields_options_enable_pairs__{$key}', 'my_fields_options_enable_pairs', 10, 1 );
 					 */
 					$enable_options_pair = apply_filters( "um_fields_options_enable_pairs__{$key}", false );
 
 					if ( ! $has_parent_option ) {
-						if ( isset( $options ) && $options == 'builtin' ) {
-							$options = UM()->builtin()->get ( $filter );
+						if ( isset( $options ) && 'builtin' === $options ) {
+							$options = UM()->builtin()->get( $data['filter'] );
 						}
 
 						// 'country'
-						if ( $key === 'country' && empty( $options ) ) {
+						if ( 'country' === $key && empty( $options ) ) {
 							$options = UM()->builtin()->get( 'countries' );
-						} else if ( empty( $options ) && isset( $data['options'] ) ) {
+						} elseif ( empty( $options ) && isset( $data['options'] ) ) {
 							$options = $data['options'];
 						}
 
@@ -3314,64 +3222,67 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						if ( isset( $options ) ) {
 							/**
-							 * UM hook
+							 * Filters extend dropdown dynamic options.
 							 *
-							 * @type filter
-							 * @title um_select_dropdown_dynamic_options
-							 * @description Extend dropdown dynamic options
-							 * @input_vars
-							 * [{"var":"$options","type":"array","desc":"Dynamic options"},
-							 * {"var":"$data","type":"array","desc":"Field Data"}]
-							 * @change_log
-							 * ["Since: 2.0"]
-							 * @usage add_filter( 'um_select_dropdown_dynamic_options', 'function_name', 10, 2 );
-							 * @example
-							 * <?php
-							 * add_filter( 'um_select_dropdown_dynamic_options', 'my_select_dropdown_dynamic_options', 10, 2 );
+							 * @since 2.0
+							 * @hook  um_select_dropdown_dynamic_options
+							 *
+							 * @param {array}  $options  Dynamic options.
+							 * @param {array}  $data     Field Data.
+							 *
+							 * @return {array}  $options  Dynamic options.
+							 *
+							 * @example <caption>Extend dropdown dynamic options.</caption>
 							 * function my_select_dropdown_dynamic_options( $options, $data ) {
 							 *     // your code here
 							 *     return $options;
 							 * }
-							 * ?>
+							 * add_filter( 'um_select_dropdown_dynamic_options', 'my_select_dropdown_dynamic_options', 10, 2 );
 							 */
 							$options = apply_filters( 'um_select_dropdown_dynamic_options', $options, $data );
+
 							/**
-							 * UM hook
+							 * Filters extend dropdown dynamic options by field $key.
 							 *
-							 * @type filter
-							 * @title um_select_dropdown_dynamic_options_{$key}
-							 * @description Extend dropdown dynamic options by field $key
-							 * @input_vars
-							 * [{"var":"$options","type":"array","desc":"Dynamic options"}]
-							 * @change_log
-							 * ["Since: 2.0"]
-							 * @usage add_filter( 'um_select_dropdown_dynamic_options_{$key}', 'function_name', 10, 1 );
-							 * @example
-							 * <?php
-							 * add_filter( 'um_select_dropdown_dynamic_options_{$key}', 'my_select_dropdown_dynamic_options', 10, 1 );
+							 * @since 2.0
+							 * @hook  um_select_dropdown_dynamic_options_{$key}
+							 *
+							 * @param {array}  $options  Dynamic options.
+							 *
+							 * @return {array}  $options  Dynamic options.
+							 *
+							 * @example <caption>Extend dropdown dynamic options by field $key.</caption>
 							 * function my_select_dropdown_dynamic_options( $options ) {
 							 *     // your code here
 							 *     return $options;
 							 * }
-							 * ?>
+							 * add_filter( 'um_select_dropdown_dynamic_options_{$key}', 'my_select_dropdown_dynamic_options', 10, 1 );
 							 */
 							$options = apply_filters( "um_select_dropdown_dynamic_options_{$key}", $options );
 						}
 					}
 
-					if ( $form_key === 'role' ) {
+					if ( 'role' === $form_key ) {
 						$options = $this->get_available_roles( $form_key, $options );
 					}
 
 					/**
-					 * UM hook
+					 * Filters enable options pair by field $data.
 					 *
-					 * @type filter
-					 * @title um_select_option_value
-					 * @description Enable options pair by field $data
-					 * @input_vars
-					 * [{"var":"$options_pair","type":"null","desc":"Enable pairs"},
-					 * {"var":"$data","type":"array","desc":"Field Data"}]
+					 * @since 2.0
+					 * @hook  um_select_options_pair
+					 *
+					 * @param {string}  $options_pair  Enable pairs.
+					 * @param {array}   $data          Field Data.
+					 *
+					 * @return {array}  $options_pair  Enable pairs.
+					 *
+					 * @example <caption>Enable options pair.</caption>
+					 * function my_um_select_options_pair( $options_pair, $data ) {
+					 *     // your code here
+					 *     return $options_pair;
+					 * }
+					 * add_filter( 'um_select_options_pair', 'my_um_select_options_pair', 10, 2 );
 					 */
 					$options_pair = apply_filters( 'um_select_options_pair', null, $data );
 
@@ -3382,11 +3293,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$field_value = '';
 
-					if ( ! empty( $placeholder ) && is_string( $placeholder ) ) {
-						$placeholder = strip_tags( $placeholder );
+					if ( ! empty( $data['placeholder'] ) && is_string( $data['placeholder'] ) ) {
+						$placeholder = strip_tags( $data['placeholder'] );
+					} else {
+						$placeholder = '';
 					}
 
-					$output .= '<select data-default="' . $data['default'] . '" ' . $disabled . ' ' . $select_original_option_value . ' ' . $disabled_by_parent_option . '  name="' . esc_attr( $form_key ) . '" id="' . esc_attr( $field_id ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . '" style="width: 100%" data-placeholder="' . esc_attr( $placeholder ) . '" ' . $atts_ajax . '>';
+					$output .= '<select data-default="' . $data['default'] . '" ' . $disabled . ' ' . $select_original_option_value . ' ' . $disabled_by_parent_option . '  name="' . esc_attr( $form_key ) . '" id="' . esc_attr( $field_id ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . '" style="width: 100%" data-placeholder="' . esc_attr( $placeholder ) . '" ' . $atts_ajax . '>';
 
 					$output .= '<option value=""></option>';
 
@@ -3396,18 +3309,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 							$v = rtrim( $v );
 
-							$option_value = $v;
+							$option_value                 = $v;
 							$um_field_checkbox_item_title = $v;
 
-
-							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ) ) ||
-								 ( $this->set_mode == 'account' || um_is_core_page( 'account' ) ) ) {
-								$option_value = $k;
+							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ), true ) || ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
+								$option_value                 = $k;
 								$um_field_checkbox_item_title = $v;
 							}
 
 							if ( isset( $options_pair ) ) {
-								$option_value = $k;
+								$option_value                 = $k;
 								$um_field_checkbox_item_title = $v;
 							}
 
@@ -3416,10 +3327,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= '<option value="' . $option_value . '" ';
 
 							if ( $this->is_selected( $form_key, $option_value, $data ) ) {
-								$output .= 'selected';
+								$output     .= 'selected';
 								$field_value = $option_value;
 							} elseif ( ! isset( $options_pair ) && $this->is_selected( $form_key, $v, $data ) ) {
-								$output .= 'selected';
+								$output     .= 'selected';
 								$field_value = $v;
 							}
 
@@ -3435,70 +3346,63 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 
-
 					if ( $this->is_error( $form_key ) ) {
 						$output .= $this->field_error( $this->show_error( $form_key ) );
 					} elseif ( $this->is_notice( $form_key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $form_key ) );
 					}
 
-
 					$output .= '</div>';
 					break;
 
 				/* Multi-Select dropdown */
 				case 'multiselect':
+					$max_selections = ( isset( $data['max_selections'] ) ) ? absint( $data['max_selections'] ) : 0;
 
-					$max_selections = ( isset( $max_selections ) ) ? absint( $max_selections ) : 0;
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
-
-					if ( isset( $data['allowclear'] ) && $data['allowclear'] == 0 ) {
+					if ( isset( $data['allowclear'] ) && 0 === $data['allowclear'] ) {
 						$class = 'um-s2';
 					} else {
 						$class = 'um-s1';
 					}
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
-					$field_icon = false;
+					$field_icon        = false;
 					$field_icon_output = '';
 
 					/**
-					 * UM hook
+					 * Filters change multiselect keyword data.
 					 *
-					 * @type filter
-					 * @title um_multiselect_option_value
-					 * @description Change multiselect keyword data
-					 * @input_vars
-					 * [{"var":"$keyword","type":"int","desc":"Option Value"},
-					 * {"var":"$type","type":"string","desc":"Field Type"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_filter( 'um_multiselect_option_value', 'function_name', 10, 2 );
-					 * @example
-					 * <?php
-					 * add_filter( 'um_multiselect_option_value', 'my_multiselect_option_value', 10, 2 );
+					 * @since 2.0
+					 * @hook  um_multiselect_option_value
+					 *
+					 * @param {int}      $keyword  Option Value.
+					 * @param {string}   $type     Field Type.
+					 *
+					 * @return {int}  $keyword  Option Value.
+					 *
+					 * @example <caption>Change multiselect keyword data.</caption>
 					 * function my_multiselect_option_value( $keyword, $type ) {
 					 *     // your code here
 					 *     return $keyword;
 					 * }
-					 * ?>
+					 * add_filter( 'um_multiselect_option_value', 'my_multiselect_option_value', 10, 2 );
 					 */
 					$use_keyword = apply_filters( 'um_multiselect_option_value', 0, $data['type'] );
 
-					$output .= '<div class="um-field-area ' . (! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field' ? 'um-field-area-has-icon' : '' ) . ' ">';
-					if ( ! empty( $icon ) && isset( $this->field_icons ) && $this->field_icons == 'field') {
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $icon ) . '"></i></div>';
+					$output .= '<div class="um-field-area ' . ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ? 'um-field-area-has-icon' : '' ) . ' ">';
+					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 					}
 
-					$output .= '<select  ' . $disabled . ' multiple="multiple" name="' . esc_attr( $field_name ) . '[]" id="' . esc_attr( $field_id ) . '" data-maxsize="' . esc_attr( $max_selections ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . ' um-user-keyword_' . $use_keyword . '" style="width: 100%" data-placeholder="' . esc_attr( $placeholder ) . '">';
+					$output .= '<select  ' . $disabled . ' multiple="multiple" name="' . esc_attr( $field_name ) . '[]" id="' . esc_attr( $field_id ) . '" data-maxsize="' . esc_attr( $max_selections ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . ' um-user-keyword_' . $use_keyword . '" style="width: 100%" data-placeholder="' . esc_attr( $data['placeholder'] ) . '">';
 
-
-					if ( isset( $options ) && $options == 'builtin' ) {
-						$options = UM()->builtin()->get( $filter );
+					if ( isset( $options ) && 'builtin' === $options ) {
+						$options = UM()->builtin()->get( $data['filter'] );
 					}
 
 					if ( ! isset( $options ) ) {
@@ -3507,81 +3411,82 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					if ( isset( $options ) ) {
 						/**
-						 * UM hook
+						 * Filters extend multiselect options.
 						 *
-						 * @type filter
-						 * @title um_multiselect_options
-						 * @description Extend multiselect options
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Multiselect Options"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_multiselect_options', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_multiselect_options', 'my_multiselect_options', 10, 2 );
+						 * @since 2.0
+						 * @hook  um_multiselect_options
+						 *
+						 * @param {array}   $options  Multiselect Options.
+						 * @param {array}   $data     Field Data.
+						 *
+						 * @return {array}  $options  Multiselect Options.
+						 *
+						 * @example <caption>Extend multiselect options.</caption>
 						 * function my_multiselect_options( $options, $data ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_multiselect_options', 'my_multiselect_options', 10, 2 );
 						 */
 						$options = apply_filters( 'um_multiselect_options', $options, $data );
+
 						/**
-						 * UM hook
+						 * Filters extend multiselect options by field $key.
 						 *
-						 * @type filter
-						 * @title um_multiselect_options_{$key}
-						 * @description Extend multiselect options by field $key
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Multiselect Options"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_multiselect_options_{$key}', 'function_name', 10, 1 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_multiselect_options_{$key}', 'my_multiselect_options', 10, 1 );
+						 * @since 2.0
+						 * @hook  um_multiselect_options_{$key}
+						 *
+						 * @param {array}   $options  Multiselect Options.
+						 *
+						 * @return {array}  $options  Multiselect Options.
+						 *
+						 * @example <caption>Extend multiselect options.</caption>
 						 * function my_multiselect_options( $options ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_multiselect_options_{$key}', 'my_multiselect_options', 10, 2 );
 						 */
 						$options = apply_filters( "um_multiselect_options_{$key}", $options );
+
 						/**
-						 * UM hook
+						 * Filters extend multiselect options by field $type.
 						 *
-						 * @type filter
-						 * @title um_multiselect_options_{$type}
-						 * @description Extend multiselect options by field $type
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Multiselect Options"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_multiselect_options_{$type}', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_multiselect_options_{$type}', 'my_multiselect_options', 10, 2 );
-						 * function my_multiselect_option_value( $options, $data ) {
+						 * @since 2.0
+						 * @hook  um_multiselect_options_{$type}
+						 *
+						 * @param {array}   $options  Multiselect Options.
+						 * @param {array}   $data     Field Data.
+						 *
+						 * @return {array}  $options  Multiselect Options.
+						 *
+						 * @example <caption>Extend multiselect options.</caption>
+						 * function my_multiselect_options( $options, $data ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_multiselect_options_{$type}', 'my_multiselect_options', 10, 2 );
 						 */
-						$options = apply_filters( "um_multiselect_options_{$data['type']}", $options, $data );
+						$options = apply_filters( "um_multiselect_options_{$type}", $options, $data );
 					}
 
 					/**
-					 * UM hook
+					 * Filters enable options pair by field $data.
 					 *
-					 * @type filter
-					 * @title um_select_option_value
-					 * @description Enable options pair by field $data
-					 * @input_vars
-					 * [{"var":"$options_pair","type":"null","desc":"Enable pairs"},
-					 * {"var":"$data","type":"array","desc":"Field Data"}]
+					 * @since 2.0
+					 * @hook  um_multiselect_options_{$type}
+					 *
+					 * @param {null}    $options_pair  Enable pairs.
+					 * @param {array}   $data          Field Data.
+					 *
+					 * @return {array}  $options_pair  Enable pairs.
+					 *
+					 * @example <caption>Enable options pair.</caption>
+					 * function my_um_select_options_pair( $options_pair, $data ) {
+					 *     // your code here
+					 *     return $options_pair;
+					 * }
+					 * add_filter( 'um_select_options_pair', 'my_um_select_options_pair', 10, 2 );
 					 */
 					$use_keyword = apply_filters( 'um_select_options_pair', null, $data );
 
@@ -3601,11 +3506,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$v = rtrim( $v );
 
 							$um_field_checkbox_item_title = $v;
-							$opt_value = $v;
+							$opt_value                    = $v;
 
 							if ( $use_keyword ) {
 								$um_field_checkbox_item_title = $v;
-								$opt_value = $k;
+								$opt_value                    = $k;
 							}
 
 							$opt_value = $this->filter_field_non_utf8_value( $opt_value );
@@ -3613,7 +3518,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= '<option value="' . $opt_value . '" ';
 							if ( $this->is_selected( $key, $opt_value, $data ) ) {
 
-								$output .= 'selected';
+								$output                    .= 'selected';
 								$arr_selected[ $opt_value ] = $opt_value;
 							}
 
@@ -3632,10 +3537,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 
-
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -3644,57 +3548,51 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Radio */
 				case 'radio':
-
 					if ( isset( $options ) ) {
 						/**
-						 * UM hook
+						 * Filters extend radio field options.
 						 *
-						 * @type filter
-						 * @title um_radio_field_options
-						 * @description Extend radio field options
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Radio Field Options"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_radio_field_options', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_radio_field_options', 'my_radio_field_options', 10, 2 );
+						 * @since 2.0
+						 * @hook  um_radio_field_options
+						 *
+						 * @param {array}   $options  Radio Field Options.
+						 * @param {array}   $data     Field Data.
+						 *
+						 * @return {array}  $options  Radio Field Options.
+						 *
+						 * @example <caption>Extend radio field options.</caption>
 						 * function my_radio_field_options( $options, $data ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_radio_field_options', 'my_radio_field_options', 10, 2 );
 						 */
 						$options = apply_filters( 'um_radio_field_options', $options, $data );
+
 						/**
-						 * UM hook
+						 * Filters extend radio field options by field $key.
 						 *
-						 * @type filter
-						 * @title um_radio_field_options_{$key}
-						 * @description Extend radio field options by field $key
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Radio field Options"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_radio_field_options_{$key}', 'function_name', 10, 1 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_radio_field_options_{$key}', 'my_radio_field_options', 10, 1 );
+						 * @since 2.0
+						 * @hook  um_radio_field_options_{$key}
+						 *
+						 * @param {array}   $options  Radio Field Options.
+						 *
+						 * @return {array}  $options  Radio Field Options.
+						 *
+						 * @example <caption>Extend radio field options.</caption>
 						 * function my_radio_field_options( $options ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_radio_field_options_{$key}', 'my_radio_field_options', 10, 1 );
 						 */
 						$options = apply_filters( "um_radio_field_options_{$key}", $options );
 					}
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
@@ -3702,43 +3600,49 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$options = $this->get_available_roles( $form_key, $options );
 
 					// add options
-					$i = 0;
+					$i           = 0;
 					$field_value = array();
 
 					/**
-					 * UM hook
+					 * Filters enable options pair by field $data.
 					 *
-					 * @type filter
-					 * @title um_radio_option_value
-					 * @description Enable options pair by field $data
-					 * @input_vars
-					 * [{"var":"$options_pair","type":"null","desc":"Enable pairs"},
-					 * {"var":"$data","type":"array","desc":"Field Data"}]
+					 * @since 2.0
+					 * @hook  um_radio_options_pair__{$key}
+					 *
+					 * @param {null}    $options_pair  Enable pairs.
+					 * @param {array}   $data          Field Data.
+					 *
+					 * @return {array}  $options_pair  Enable pairs.
+					 *
+					 * @example <caption>Enable options pair.</caption>
+					 * function my_radio_field_options( $options ) {
+					 *     // your code here
+					 *     return $options;
+					 * }
+					 * add_filter( 'um_radio_options_pair__{$key}', 'my_radio_field_options', 10, 2 );
 					 */
 					$options_pair = apply_filters( "um_radio_options_pair__{$key}", false, $data );
 
-
 					if ( ! empty( $options ) ) {
 						foreach ( $options as $k => $v ) {
 
 							$v = rtrim( $v );
 
 							$um_field_checkbox_item_title = $v;
-							$option_value = $v;
+							$option_value                 = $v;
 
-							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ) ) ||
-								 ( $this->set_mode == 'account' || um_is_core_page( 'account' ) ) ) {
+							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ), true ) || ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
 								$um_field_checkbox_item_title = $v;
-								$option_value = $k;
+								$option_value                 = $k;
 							}
 
-							if( $options_pair ){
+							if ( $options_pair ) {
 								$um_field_checkbox_item_title = $v;
-								$option_value = $k;
+								$option_value                 = $k;
 							}
 
 							$i++;
-							if ($i % 2 == 0) {
+							if ( 0 === $i % 2 ) {
 								$col_class = ' right ';
 							} else {
 								$col_class = '';
@@ -3746,25 +3650,24 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 							if ( $this->is_radio_checked( $key, $option_value, $data ) ) {
 								$active = 'active';
-								$class = "um-icon-android-radio-button-on";
+								$class  = 'um-icon-android-radio-button-on';
 							} else {
 								$active = '';
-								$class = "um-icon-android-radio-button-off";
+								$class  = 'um-icon-android-radio-button-off';
 							}
 
-
-							if ( isset( $data['editable'] ) && $data['editable'] == 0 ) {
-								$col_class .= " um-field-radio-state-disabled";
+							if ( isset( $data['editable'] ) && 0 === $data['editable'] ) {
+								$col_class .= ' um-field-radio-state-disabled';
 							}
 
 							$output .= '<label class="um-field-radio ' . esc_attr( $active ) . ' um-field-half ' . esc_attr( $col_class ) . '">';
 
 							$option_value = $this->filter_field_non_utf8_value( $option_value );
 
-							$output .= '<input  ' . $disabled . ' type="radio" name="' . ( ( $form_key == 'role' ) ? esc_attr( $form_key ) : esc_attr( $form_key ) . '[]' ) . '" value="' . $option_value . '" ';
+							$output .= '<input ' . $disabled . ' type="radio" name="' . ( ( 'role' === $form_key ) ? esc_attr( $form_key ) : esc_attr( $form_key ) . '[]' ) . '" value="' . $option_value . '" ';
 
 							if ( $this->is_radio_checked( $key, $option_value, $data ) ) {
-								$output .= 'checked';
+								$output             .= 'checked';
 								$field_value[ $key ] = $option_value;
 							}
 
@@ -3774,10 +3677,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= '<span class="um-field-radio-option">' . esc_html__( $um_field_checkbox_item_title, 'ultimate-member' ) . '</span>';
 							$output .= '</label>';
 
-							if ( $i % 2 == 0 ) {
+							if ( 0 === $i % 2 ) {
 								$output .= '<div class="um-clear"></div>';
 							}
-
 						}
 					}
 
@@ -3793,7 +3695,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -3802,57 +3704,51 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Checkbox */
 				case 'checkbox':
-
 					if ( isset( $options ) ) {
 						/**
-						 * UM hook
+						 * Filters extend checkbox options.
 						 *
-						 * @type filter
-						 * @title um_checkbox_field_options
-						 * @description Extend checkbox options
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Checkbox Options"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_checkbox_field_options', 'function_name', 10, 2 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_checkbox_field_options', 'my_checkbox_options', 10, 2 );
-						 * function my_checkbox_options( $options, $data ) {
+						 * @since 2.0
+						 * @hook  um_checkbox_field_options
+						 *
+						 * @param {array}   $options  Checkbox Options.
+						 * @param {array}   $data     Field Data.
+						 *
+						 * @return {array}  $options  Checkbox Options.
+						 *
+						 * @example <caption>Extend checkbox options.</caption>
+						 * function um_checkbox_field_options( $options, $data ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_checkbox_field_options', 'um_checkbox_field_options', 10, 2 );
 						 */
 						$options = apply_filters( 'um_checkbox_field_options', $options, $data );
+
 						/**
-						 * UM hook
+						 * Filters extend checkbox options by field $key.
 						 *
-						 * @type filter
-						 * @title um_checkbox_field_options_{$key}
-						 * @description Extend checkbox options by field $key
-						 * @input_vars
-						 * [{"var":"$options","type":"array","desc":"Checkbox Options"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_checkbox_field_options_{$key}', 'function_name', 10, 1 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_checkbox_field_options_{$key}', 'my_checkbox_options', 10, 1 );
+						 * @since 2.0
+						 * @hook  um_checkbox_field_options_{$key}
+						 *
+						 * @param {array}   $options  Checkbox Options.
+						 *
+						 * @return {array}  $options  Checkbox Options.
+						 *
+						 * @example <caption>Extend checkbox options.</caption>
 						 * function my_checkbox_options( $options ) {
 						 *     // your code here
 						 *     return $options;
 						 * }
-						 * ?>
+						 * add_filter( 'um_checkbox_field_options_{$key}', 'my_checkbox_options', 10, 1 );
 						 */
 						$options = apply_filters( "um_checkbox_field_options_{$key}", $options );
 					}
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $label, $key, $data );
+						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
 					$output .= '<div class="um-field-area">';
@@ -3865,7 +3761,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$v = rtrim( $v );
 
 						$i++;
-						if ( $i % 2 == 0 ) {
+						if ( 0 === $i % 2 ) {
 							$col_class = ' right ';
 						} else {
 							$col_class = '';
@@ -3873,14 +3769,14 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						if ( $this->is_selected( $key, $v, $data ) ) {
 							$active = 'active';
-							$class = "um-icon-android-checkbox-outline";
+							$class  = 'um-icon-android-checkbox-outline';
 						} else {
 							$active = '';
-							$class = "um-icon-android-checkbox-outline-blank";
+							$class  = 'um-icon-android-checkbox-outline-blank';
 						}
 
-						if ( isset( $data['editable'] ) && $data['editable'] == 0 ) {
-							$col_class .= " um-field-radio-state-disabled";
+						if ( isset( $data['editable'] ) && 0 === $data['editable'] ) {
+							$col_class .= ' um-field-radio-state-disabled';
 						}
 
 						$output .= '<label class="um-field-checkbox ' . esc_attr( $active ) . ' um-field-half ' . esc_attr( $col_class ) . '">';
@@ -3903,47 +3799,43 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						$output .= '<span class="um-field-checkbox-state"><i class="' . esc_attr( $class ) . '"></i></span>';
+
 						/**
-						 * UM hook
+						 * Filters change Checkbox item title.
 						 *
-						 * @type filter
-						 * @title um_field_checkbox_item_title
-						 * @description Change Checkbox item title
-						 * @input_vars
-						 * [{"var":"$checkbox_item_title","type":"array","desc":"Item Title"},
-						 * {"var":"$key","type":"string","desc":"Field Key"},
-						 * {"var":"$value","type":"string","desc":"Field Value"},
-						 * {"var":"$data","type":"array","desc":"Field Data"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage add_filter( 'um_field_checkbox_item_title', 'function_name', 10, 4 );
-						 * @example
-						 * <?php
-						 * add_filter( 'um_field_checkbox_item_title', 'my_checkbox_item_title', 10, 4 );
-						 * function my_checkbox_item_title( $checkbox_item_title, $key, $value, $data ) {
+						 * @since 2.0
+						 * @hook  um_field_checkbox_item_title
+						 *
+						 * @param {array}    $um_field_checkbox_item_title  Item Title.
+						 * @param {string}   $key                           Field Key.
+						 * @param {string}   $v                             Field Value.
+						 * @param {array}    $data                          Field Data.
+						 *
+						 * @return {array}  $um_field_checkbox_item_title  Item Title.
+						 *
+						 * @example <caption>Change Checkbox item title.</caption>
+						 * function um_checkbox_field_options( $um_field_checkbox_item_title, $key, $v, $data ) {
 						 *     // your code here
-						 *     return $checkbox_item_title;
+						 *     return $um_field_checkbox_item_title;
 						 * }
-						 * ?>
+						 * add_filter( 'um_field_checkbox_item_title', 'um_checkbox_field_options', 10, 4 );
 						 */
 						$um_field_checkbox_item_title = apply_filters( 'um_field_checkbox_item_title', $um_field_checkbox_item_title, $key, $v, $data );
+
 						$output .= '<span class="um-field-checkbox-option">' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</span>';
 						$output .= '</label>';
 
-						if ( $i % 2 == 0 ) {
+						if ( 0 === $i % 2 ) {
 							$output .= '<div class="um-clear"></div>';
 						}
-
 					}
 
 					$output .= '<div class="um-clear"></div>';
-
 					$output .= '</div>';
 
-
 					if ( $this->is_error( $key ) ) {
 						$output .= $this->field_error( $this->show_error( $key ) );
-					}else if ( $this->is_notice( $key ) ) {
+					} elseif ( $this->is_notice( $key ) ) {
 						$output .= $this->field_notice( $this->show_notice( $key ) );
 					}
 
@@ -3952,30 +3844,28 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* HTML */
 				case 'block':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $data['content'] . '</div>';
 					break;
 
 				/* Shortcode */
 				case 'shortcode':
-
-					$content = str_replace( '{profile_id}', um_profile_id(), $content );
-					if ( version_compare( get_bloginfo('version'),'5.4', '<' ) ) {
+					$content = str_replace( '{profile_id}', um_profile_id(), $data['content'] );
+					if ( version_compare( get_bloginfo( 'version' ), '5.4', '<' ) ) {
 						$content = do_shortcode( $content );
 					} else {
 						$content = apply_shortcodes( $content );
 					}
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $content . '</div>';
 					break;
 
 				/* Unlimited Group */
 				case 'group':
-
 					$fields = $this->get_fields_in_group( $key );
 					if ( ! empty( $fields ) ) {
 
-						$output .= '<div class="um-field-group" data-max_entries="' . $max_entries . '">
-								<div class="um-field-group-head"><i class="um-icon-plus"></i>' . esc_html__( $label, 'ultimate-member' ) . '</div>';
+						$output .= '<div class="um-field-group" data-max_entries="' . $data['max_entries'] . '">
+								<div class="um-field-group-head"><i class="um-icon-plus"></i>' . esc_html__( $data['label'], 'ultimate-member' ) . '</div>';
 						$output .= '<div class="um-field-group-body"><a href="javascript:void(0);" class="um-field-group-cancel"><i class="um-icon-close"></i></a>';
 
 						foreach ( $fields as $subkey => $subdata ) {
@@ -3994,25 +3884,22 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			// Custom filter for field output
 			if ( isset( $this->set_mode ) ) {
 				/**
-				 * UM hook
+				 * Filters change field HTML on edit mode by field $key.
 				 *
-				 * @type filter
-				 * @title um_{$key}_form_edit_field
-				 * @description Change field HTML on edit mode by field $key
-				 * @input_vars
-				 * [{"var":"$output","type":"string","desc":"Field HTML"},
-				 * {"var":"$mode","type":"string","desc":"Fields Mode"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage add_filter( 'um_{$key}_form_edit_field', 'function_name', 10, 2 );
-				 * @example
-				 * <?php
-				 * add_filter( 'um_{$key}_form_edit_field', 'my_form_edit_field', 10, 2 );
-				 * function my_form_edit_field( $output, $mode ) {
+				 * @since 2.0
+				 * @hook  my_form_edit_field
+				 *
+				 * @param {array}   $output   Field HTML.
+				 * @param {array}   $mode     Field Mode.
+				 *
+				 * @return {array}  $output  Field HTML.
+				 *
+				 * @example <caption>Change field HTML.</caption>
+				 * function um_checkbox_field_options( $output, $mode ) {
 				 *     // your code here
 				 *     return $output;
 				 * }
-				 * ?>
+				 * add_filter( 'um_{$key}_form_edit_field', 'my_form_edit_field', 10, 2 );
 				 */
 				$output = apply_filters( "um_{$key}_form_edit_field", $output, $this->set_mode );
 			}

From 5c8c3411e7833883f255de584ae6a06570f7af10 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 23 Jun 2023 16:52:22 +0300
Subject: [PATCH 21/37] - wpcs fixes;

---
 includes/core/class-form.php          |  2 --
 includes/core/um-actions-register.php | 40 ++++++++++++---------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/includes/core/class-form.php b/includes/core/class-form.php
index fb390c00..e6007bcd 100644
--- a/includes/core/class-form.php
+++ b/includes/core/class-form.php
@@ -583,11 +583,9 @@ if ( ! class_exists( 'um\core\Form' ) ) {
 				 * ?>
 				 */
 				do_action( "um_submit_form_{$this->post_form['mode']}", $this->post_form );
-
 			}
 		}
 
-
 		/**
 		 * Beautify form data
 		 *
diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php
index e83af67f..dc90a2d7 100644
--- a/includes/core/um-actions-register.php
+++ b/includes/core/um-actions-register.php
@@ -1,11 +1,13 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
-
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
- * Account automatically approved
+ * Account automatically approved.
  *
- * @param $user_id
- * @param $args
+ * @param int   $user_id
+ * @param array $args
  */
 function um_post_registration_approved_hook( $user_id, $args ) {
 	um_fetch_user( $user_id );
@@ -14,12 +16,11 @@ function um_post_registration_approved_hook( $user_id, $args ) {
 }
 add_action( 'um_post_registration_approved_hook', 'um_post_registration_approved_hook', 10, 2 );
 
-
 /**
- * Account needs email validation
+ * Account needs email validation.
  *
- * @param $user_id
- * @param $args
+ * @param int   $user_id
+ * @param array $args
  */
 function um_post_registration_checkmail_hook( $user_id, $args ) {
 	um_fetch_user( $user_id );
@@ -28,20 +29,18 @@ function um_post_registration_checkmail_hook( $user_id, $args ) {
 }
 add_action( 'um_post_registration_checkmail_hook', 'um_post_registration_checkmail_hook', 10, 2 );
 
-
 /**
- * Account needs admin review
+ * Account needs admin review.
  *
- * @param $user_id
- * @param $args
+ * @param int   $user_id
+ * @param array $args
  */
 function um_post_registration_pending_hook( $user_id, $args ) {
 	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', 10, 2 );
 
 /**
  * After insert a new user
@@ -118,7 +117,6 @@ function um_after_insert_user( $user_id, $args ) {
 }
 add_action( 'um_user_register', 'um_after_insert_user', 1, 2 );
 
-
 /**
  * Send notification about registration
  *
@@ -131,7 +129,7 @@ function um_send_registration_notification( $user_id, $args ) {
 	$emails = um_multi_admin_email();
 	if ( ! empty( $emails ) ) {
 		foreach ( $emails as $email ) {
-			if ( um_user( 'account_status' ) != 'pending' ) {
+			if ( 'pending' !== um_user( 'account_status' ) ) {
 				UM()->mail()->send( $email, 'notification_new_user', array( 'admin' => true ) );
 			} else {
 				UM()->mail()->send( $email, 'notification_review', array( 'admin' => true ) );
@@ -141,7 +139,6 @@ function um_send_registration_notification( $user_id, $args ) {
 }
 add_action( 'um_registration_complete', 'um_send_registration_notification', 10, 2 );
 
-
 /**
  * Check user status and redirect it after registration
  *
@@ -270,7 +267,6 @@ function um_check_user_status( $user_id, $args ) {
 }
 add_action( 'um_registration_complete', 'um_check_user_status', 100, 2 );
 
-
 function um_submit_form_errors_hook__registration( $args ) {
 	// Check for "\" in password.
 	if ( array_key_exists( 'user_password', $args ) && false !== strpos( wp_unslash( trim( $args['user_password'] ) ), '\\' ) ) {
@@ -280,9 +276,9 @@ function um_submit_form_errors_hook__registration( $args ) {
 add_action( 'um_submit_form_errors_hook__registration', 'um_submit_form_errors_hook__registration', 10, 1 );
 
 /**
- * Registration form submit handler
+ * Registration form submit handler.
  *
- * @param $args
+ * @param array $args
  * @return bool|int|WP_Error
  */
 function um_submit_form_register( $args ) {
@@ -431,7 +427,7 @@ function um_submit_form_register( $args ) {
 		$exclude_roles = array_diff( array_keys( $wp_roles->roles ), UM()->roles()->get_editable_user_roles() );
 
 		//if role is properly set it
-		if ( ! in_array( $args['role'], $exclude_roles ) ) {
+		if ( ! in_array( $args['role'], $exclude_roles, true ) ) {
 			$user_role = $args['role'];
 		}
 	}

From d49c9d540fbe6ce7c06bcafe184d5836d94a1aa2 Mon Sep 17 00:00:00 2001
From: ashubawork <andrew.shuba2@gmail.com>
Date: Mon, 26 Jun 2023 10:11:12 +0300
Subject: [PATCH 22/37] - fix allowed types attribute in edit_field()

---
 includes/core/class-fields.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index acda401f..3da26800 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2909,6 +2909,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$allowed_types = 'gif,jpg,jpeg,png';
 						} elseif ( is_array( $data['allowed_types'] ) ) {
 							$allowed_types = implode( ',', $data['allowed_types'] );
+						} else {
+							$allowed_types = $data['allowed_types'];
 						}
 
 						$output .= '<div class="um-modal-hidden-content">';
@@ -3015,6 +3017,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$allowed_types = 'pdf,txt';
 						} elseif ( is_array( $allowed_types ) ) {
 							$allowed_types = implode( ',', $data['allowed_types'] );
+						} else {
+							$allowed_types = $data['allowed_types'];
 						}
 
 						$output .= '<div class="um-modal-hidden-content">';

From d7c94b8015dd9387fc85dc4003014a7a2755ca56 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 14:31:25 +0300
Subject: [PATCH 23/37] - review `um_submit_form_register()`;

---
 includes/core/um-actions-register.php | 54 +++++++++++++--------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/includes/core/um-actions-register.php b/includes/core/um-actions-register.php
index dc90a2d7..6947b735 100644
--- a/includes/core/um-actions-register.php
+++ b/includes/core/um-actions-register.php
@@ -279,29 +279,30 @@ add_action( 'um_submit_form_errors_hook__registration', 'um_submit_form_errors_h
  * Registration form submit handler.
  *
  * @param array $args
- * @return bool|int|WP_Error
  */
 function um_submit_form_register( $args ) {
 	if ( isset( UM()->form()->errors ) ) {
-		return false;
+		return;
 	}
 
 	/**
-	 * Filters extend user data on registration form submit
+	 * Filters user data submitted by a registration form.
 	 *
-	 * @since 2.0
+	 * Note: Data is already sanitized here.
+	 *
+	 * @since 1.3.x
 	 * @hook  um_add_user_frontend_submitted
 	 *
-	 * @param {array}  $success  Registration data.
+	 * @param {array} $submitted Submitted registration data.
 	 *
-	 * @return {array} Registration data.
+	 * @return {array} Extended registration data.
 	 *
-	 * @example <caption>Registration data.</caption>
-	 * function my_add_user_frontend_submitted( $success, $updated ) {
+	 * @example <caption>Extends registration data.</caption>
+	 * function my_add_user_frontend_submitted( $submitted ) {
 	 *     // your code here
 	 *     return $submitted;
 	 * }
-	 * add_filter( 'um_add_user_frontend_submitted', 'my_add_user_frontend_submitted', 10, 2 );
+	 * add_filter( 'um_add_user_frontend_submitted', 'my_add_user_frontend_submitted' );
 	 */
 	$args = apply_filters( 'um_add_user_frontend_submitted', $args );
 
@@ -351,7 +352,7 @@ function um_submit_form_register( $args ) {
 	$unique_user_id = uniqid();
 
 	// see dbDelta and WP native DB structure user_login varchar(60)
-	if ( empty( $user_login ) || mb_strlen( $user_login ) > 60 && ! is_email( $user_login ) ) {
+	if ( empty( $user_login ) || ( mb_strlen( $user_login ) > 60 && ! is_email( $user_login ) ) ) {
 		$user_login = 'user' . $unique_user_id;
 		while ( username_exists( $user_login ) ) {
 			$unique_user_id = uniqid();
@@ -372,7 +373,7 @@ function um_submit_form_register( $args ) {
 	}
 
 	if ( empty( $user_email ) ) {
-		$site_url   = @$_SERVER['SERVER_NAME'];
+		$site_url   = wp_parse_url( get_site_url(), PHP_URL_HOST );
 		$user_email = 'nobody' . $unique_user_id . '@' . $site_url;
 		while ( email_exists( $user_email ) ) {
 			$unique_user_id = uniqid();
@@ -380,21 +381,21 @@ function um_submit_form_register( $args ) {
 		}
 
 		/**
-		 * Filters change user default email if it's empty on registration
+		 * Filters change user default email if it's empty on registration.
 		 *
-		 * @since 2.0
+		 * @since 1.3.x
 		 * @hook  um_user_register_submitted__email
 		 *
-		 * @param {string}  $user_email  Default email.
+		 * @param {string} $user_email Default email.
 		 *
-		 * @return {string} $user_email Email.
+		 * @return {string} Default customized email.
 		 *
 		 * @example <caption>Change user default email if it's empty on registration.</caption>
 		 * function my_user_register_submitted__email( $user_email ) {
 		 *     // your code here
 		 *     return $user_email;
 		 * }
-		 * add_filter( 'um_user_register_submitted__email', 'my_user_register_submitted__email', 10, 1 );
+		 * add_filter( 'um_user_register_submitted__email', 'my_user_register_submitted__email' );
 		 */
 		$user_email = apply_filters( 'um_user_register_submitted__email', $user_email );
 	}
@@ -411,8 +412,8 @@ function um_submit_form_register( $args ) {
 
 	$args['submitted'] = array_merge( $args['submitted'], $credentials );
 
-	// set timestamp
-	$timestamp                      = current_time( 'timestamp' );
+	// Set registration timestamp.
+	$timestamp                      = current_time( 'timestamp' ); // @todo Working on timestamps.
 	$args['submitted']['timestamp'] = $timestamp;
 	$args['timestamp']              = $timestamp;
 
@@ -438,10 +439,10 @@ function um_submit_form_register( $args ) {
 	 * @since 2.0
 	 * @hook  um_registration_user_role
 	 *
-	 * @param {string}  $user_role  User role.
-	 * @param {array}   $args       Registration data.
+	 * @param {string} $user_role User role.
+	 * @param {array}  $args      Registration data.
 	 *
-	 * @return {string} $user_role User role.
+	 * @return {string} User role.
 	 *
 	 * @example <caption>Change user role on registration process.</caption>
 	 * function my_registration_user_role( $user_role, $args ) {
@@ -468,20 +469,17 @@ function um_submit_form_register( $args ) {
 	 * @hook  um_user_register
 	 *
 	 * @param {int}   $user_id User ID.
-	 * @param {array} $user_id Form data.
+	 * @param {array} $args    Form data.
 	 *
 	 * @example <caption>Make any custom action after complete UM user registration.</caption>
-	 * function um_user_register( $user_id, $args ) {
+	 * function my_um_user_register( $user_id, $args ) {
 	 *     // your code here
 	 * }
-	 * add_action( 'um_user_register', 'um_user_register', 10, 2 );
+	 * add_action( 'um_user_register', 'my_um_user_register', 10, 2 );
 	 */
 	do_action( 'um_user_register', $user_id, $args );
-
-	return $user_id;
 }
-add_action( 'um_submit_form_register', 'um_submit_form_register', 10 );
-
+add_action( 'um_submit_form_register', 'um_submit_form_register' );
 
 /**
  * Show the submit button

From bf5c6a6d04826617142a8b908de54bb33209dfa4 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 14:55:17 +0300
Subject: [PATCH 24/37] - review `ajax_resize_image()`;

---
 includes/core/class-files.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/includes/core/class-files.php b/includes/core/class-files.php
index 20e65db3..834db12d 100644
--- a/includes/core/class-files.php
+++ b/includes/core/class-files.php
@@ -1,12 +1,12 @@
 <?php
 namespace um\core;
 
-// Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\Files' ) ) {
 
-
 	/**
 	 * Class Files
 	 * @package um\core
@@ -313,36 +313,34 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 			}
 		}
 
-
 		/**
 		 * Resize image AJAX handler
 		 */
 		public function ajax_resize_image() {
 			UM()->check_ajax_nonce();
-
-			$data = $_REQUEST; // phpcs:ignore WordPress.Security.NonceVerification
-
-			if ( ! isset( $data['src'] ) || ! isset( $data['coord'] ) ) {
+			// phpcs:disable WordPress.Security.NonceVerification -- verified by the `check_ajax_nonce()`
+			if ( ! isset( $_REQUEST['src'], $_REQUEST['coord'], $_REQUEST['key'] ) ) {
 				wp_send_json_error( esc_js( __( 'Invalid parameters', 'ultimate-member' ) ) );
 			}
 
-			$coord_n = substr_count( $data['coord'], ',' );
+			$coord_n = substr_count( $_REQUEST['coord'], ',' );
 			if ( 3 !== $coord_n ) {
 				wp_send_json_error( esc_js( __( 'Invalid coordinates', 'ultimate-member' ) ) );
 			}
 
-			$user_id = empty( $data['user_id'] ) ? get_current_user_id() : absint( $data['user_id'] );
+			$key     = sanitize_text_field( $_REQUEST['key'] );
+			$coord   = sanitize_text_field( $_REQUEST['coord'] );
+			$user_id = empty( $_REQUEST['user_id'] ) ? get_current_user_id() : absint( $_REQUEST['user_id'] );
 
-			UM()->fields()->set_id   = isset( $_POST['set_id'] ) ? absint( $_POST['set_id'] ) : null; // phpcs:ignore WordPress.Security.NonceVerification
-			UM()->fields()->set_mode = isset( $_POST['set_mode'] ) ? sanitize_text_field( $_POST['set_mode'] ) : null; // phpcs:ignore WordPress.Security.NonceVerification
+			UM()->fields()->set_id   = isset( $_POST['set_id'] ) ? absint( $_POST['set_id'] ) : null;
+			UM()->fields()->set_mode = isset( $_POST['set_mode'] ) ? sanitize_text_field( $_POST['set_mode'] ) : null;
 
 			if ( 'register' !== UM()->fields()->set_mode && ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
 				$ret['error'] = esc_js( __( 'You have no permission to edit this user', 'ultimate-member' ) );
 				wp_send_json_error( $ret );
 			}
 
-			$src = esc_url_raw( $data['src'] );
-
+			$src        = esc_url_raw( $_REQUEST['src'] );
 			$image_path = um_is_file_owner( $src, $user_id, true );
 			if ( ! $image_path ) {
 				wp_send_json_error( esc_js( __( 'Invalid file ownership', 'ultimate-member' ) ) );
@@ -350,16 +348,15 @@ if ( ! class_exists( 'um\core\Files' ) ) {
 
 			UM()->uploader()->replace_upload_dir = true;
 
-			$output = UM()->uploader()->resize_image( $image_path, $src, sanitize_text_field( $data['key'] ), $user_id, sanitize_text_field( $data['coord'] ) );
+			$output = UM()->uploader()->resize_image( $image_path, $src, $key, $user_id, $coord );
 
 			UM()->uploader()->replace_upload_dir = false;
 
 			delete_option( "um_cache_userdata_{$user_id}" );
-
+			// phpcs:enable WordPress.Security.NonceVerification -- verified by the `check_ajax_nonce()`
 			wp_send_json_success( $output );
 		}
 
-
 		/**
 		 * Image upload by AJAX
 		 *

From f8da8f0433777abafeb5e097da1f29825bb6e791 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 16:54:43 +0300
Subject: [PATCH 25/37] - review `ultimatemember_password()`; - made
 UM()->password()->change_password variable as private and avoid dynamic for
 PHP8 compatibility; - marked `um_before_{$mode}_form_is_loaded` hook as has
 to be deprecated since 2.7.0 because it duplicates previous 2 hooks with
 similar; - updated hookdocs for `um_before_{$mode}_form_is_loaded`; - updated
 hookdocs for `um_before_form_is_loaded`; - updated hookdocs for
 `um_pre_{$mode}_shortcode`;

---
 includes/core/class-account.php    |  61 +--------------
 includes/core/class-password.php   | 114 +++++++++--------------------
 includes/core/class-shortcodes.php |  63 +++++++++-------
 3 files changed, 75 insertions(+), 163 deletions(-)

diff --git a/includes/core/class-account.php b/includes/core/class-account.php
index f8bea1b5..a86b63ef 100644
--- a/includes/core/class-account.php
+++ b/includes/core/class-account.php
@@ -245,69 +245,14 @@ if ( ! class_exists( 'um\core\Account' ) ) {
 
 				$this->current_tab = apply_filters( 'um_change_default_tab', $this->current_tab, $args );
 
-				/**
-				 * UM hook
-				 *
-				 * @type action
-				 * @title um_pre_{$mode}_shortcode
-				 * @description Make some action before account tabs loading
-				 * @input_vars
-				 * [{"var":"$args","type":"array","desc":"Account Page Arguments"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage add_action( 'um_pre_{$mode}_shortcode', 'function_name', 10, 1 );
-				 * @example
-				 * <?php
-				 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_account_shortcode', 10, 1 );
-				 * function my_pre_account_shortcode( $args ) {
-				 *     // your code here
-				 * }
-				 * ?>
-				 */
+				/** This filter is documented in includes/core/class-shortcodes.php */
 				do_action( "um_pre_{$args['mode']}_shortcode", $args );
-				/**
-				 * UM hook
-				 *
-				 * @type action
-				 * @title um_before_form_is_loaded
-				 * @description Make some action before account tabs loading
-				 * @input_vars
-				 * [{"var":"$args","type":"array","desc":"Account Page Arguments"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage add_action( 'um_before_form_is_loaded', 'function_name', 10, 1 );
-				 * @example
-				 * <?php
-				 * add_action( 'um_before_form_is_loaded', 'my_before_form_is_loaded', 10, 1 );
-				 * function my_before_form_is_loaded( $args ) {
-				 *     // your code here
-				 * }
-				 * ?>
-				 */
+				/** This filter is documented in includes/core/class-shortcodes.php */
 				do_action( 'um_before_form_is_loaded', $args );
-				/**
-				 * UM hook
-				 *
-				 * @type action
-				 * @title um_before_{$mode}_form_is_loaded
-				 * @description Make some action before account tabs loading
-				 * @input_vars
-				 * [{"var":"$args","type":"array","desc":"Account Page Arguments"}]
-				 * @change_log
-				 * ["Since: 2.0"]
-				 * @usage add_action( 'um_before_{$mode}_form_is_loaded', 'function_name', 10, 1 );
-				 * @example
-				 * <?php
-				 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_before_account_form_is_loaded', 10, 1 );
-				 * function my_before_account_form_is_loaded( $args ) {
-				 *     // your code here
-				 * }
-				 * ?>
-				 */
+				/** This filter is documented in includes/core/class-shortcodes.php */
 				do_action( "um_before_{$args['mode']}_form_is_loaded", $args );
 
 				UM()->shortcodes()->template_load( $args['template'], $args );
-
 			}
 
 			if ( ! is_admin() && ! defined( 'DOING_AJAX' ) ) {
diff --git a/includes/core/class-password.php b/includes/core/class-password.php
index 594904a0..6e851af3 100644
--- a/includes/core/class-password.php
+++ b/includes/core/class-password.php
@@ -1,37 +1,35 @@
 <?php
 namespace um\core;
 
-
-// Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
-
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\Password' ) ) {
 
-
 	/**
 	 * Class Password
 	 * @package um\core
 	 */
 	class Password {
 
+		private $change_password = false;
 
 		/**
 		 * Password constructor.
 		 */
-		function __construct() {
+		public function __construct() {
 			add_shortcode( 'ultimatemember_password', array( &$this, 'ultimatemember_password' ) );
 
 			add_action( 'template_redirect', array( &$this, 'form_init' ), 10001 );
 
 			add_action( 'um_reset_password_errors_hook', array( &$this, 'um_reset_password_errors_hook' ) );
-			add_action( 'um_reset_password_process_hook', array( &$this,'um_reset_password_process_hook' ) );
+			add_action( 'um_reset_password_process_hook', array( &$this, 'um_reset_password_process_hook' ) );
 
 			add_action( 'um_change_password_errors_hook', array( &$this, 'um_change_password_errors_hook' ) );
-			add_action( 'um_change_password_process_hook', array( &$this,'um_change_password_process_hook' ) );
+			add_action( 'um_change_password_process_hook', array( &$this, 'um_change_password_process_hook' ) );
 		}
 
-
 		/**
 		 * Get Reset URL
 		 *
@@ -107,7 +105,6 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 			return $classes;
 		}
 
-
 		/**
 		 * Shortcode
 		 *
@@ -116,32 +113,33 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 		 * @return string
 		 */
 		public function ultimatemember_password( $args = array() ) {
-			ob_start();
-
-			$defaults = array(
-				'template'  => 'password-reset',
-				'mode'      => 'password',
-				'form_id'   => 'um_password_id',
-				'max_width' => '450px',
-				'align'     => 'center',
+			/** There is possible to use 'shortcode_atts_ultimatemember_password' filter for getting customized $atts. This filter is documented in wp-includes/shortcodes.php "shortcode_atts_{$shortcode}" */
+			$args = shortcode_atts(
+				array(
+					'template'  => 'password-reset',
+					'mode'      => 'password',
+					'form_id'   => 'um_password_id',
+					'max_width' => '450px',
+					'align'     => 'center',
+				),
+				$args,
+				'ultimatemember_password'
 			);
-			$args     = wp_parse_args( $args, $defaults );
 
 			if ( empty( $args['use_custom_settings'] ) ) {
 				$args = array_merge( $args, UM()->shortcodes()->get_css_args( $args ) );
 			} else {
 				$args = array_merge( UM()->shortcodes()->get_css_args( $args ), $args );
 			}
-
 			/**
 			 * Filters extend Reset Password Arguments
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
 			 * @hook  um_reset_password_shortcode_args_filter
 			 *
-			 * @param {array}  $args  Shortcode arguments.
+			 * @param {array} $args Shortcode arguments.
 			 *
-			 * @return {array} $args Shortcode arguments.
+			 * @return {array} Shortcode arguments.
 			 *
 			 * @example <caption>Extend Reset Password Arguments.</caption>
 			 * function my_reset_password_shortcode_args( $args ) {
@@ -152,7 +150,7 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 			 */
 			$args = apply_filters( 'um_reset_password_shortcode_args_filter', $args );
 
-			if ( isset( $this->change_password ) ) {
+			if ( false !== $this->change_password ) {
 				// then COOKIE are valid then get data from them and populate hidden fields for the password reset form
 				$args['template'] = 'password-change';
 				$args['rp_key']   = '';
@@ -165,74 +163,30 @@ if ( ! class_exists( 'um\core\Password' ) ) {
 				}
 			}
 
-			UM()->fields()->set_id = 'um_password_id';
-
-			if ( ! isset( $mode ) && isset( $args['mode'] ) ) {
-				$mode = $args['mode'];
-			}
-			if ( ! isset( $template ) && isset( $args['template'] ) ) {
-				$template = $args['template'];
+			if ( empty( $args['mode'] ) || empty( $args['template'] ) ) {
+				return '';
 			}
 
-			/**
-			 * Fires pre-load password form shortcode.
-			 *
-			 * @since 2.0
-			 * @hook  um_pre_{$mode}_shortcode
-			 *
-			 * @param {array} $args Form shortcode pre-loading.
-			 *
-			 * @example <caption>Make any custom action pre-load password form shortcode.</caption>
-			 * function my_pre_password_shortcode( $args ) {
-			 *     // your code here
-			 * }
-			 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_password_shortcode', 10, 1 );
-			 */
-			do_action( "um_pre_{$mode}_shortcode", $args );
+			UM()->fields()->set_id = $args['form_id'];
 
-			/**
-			 * Fires pre-load password form shortcode.
-			 *
-			 * @since 2.0
-			 * @hook  um_before_form_is_loaded
-			 *
-			 * @param {array} $args Form shortcode pre-loading.
-			 *
-			 * @example <caption>Make any custom action pre-load password form shortcode.</caption>
-			 * function my_before_form_is_loaded( $args ) {
-			 *     // your code here
-			 * }
-			 * add_action( 'um_before_form_is_loaded', 'my_before_form_is_loaded', 10, 1 );
-			 */
+			ob_start();
+
+			/** This filter is documented in includes/core/class-shortcodes.php */
+			do_action( "um_pre_{$args['mode']}_shortcode", $args );
+			/** This filter is documented in includes/core/class-shortcodes.php */
 			do_action( 'um_before_form_is_loaded', $args );
+			/** This filter is documented in includes/core/class-shortcodes.php */
+			do_action( "um_before_{$args['mode']}_form_is_loaded", $args );
 
-			/**
-			 * Fires pre-load password form shortcode.
-			 *
-			 * @since 2.0
-			 * @hook  um_before_{$mode}_form_is_loaded
-			 *
-			 * @param {array} $args Form shortcode pre-loading.
-			 *
-			 * @example <caption>Make any custom action pre-load password form shortcode.</caption>
-			 * function my_before_form_is_loaded( $args ) {
-			 *     // your code here
-			 * }
-			 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_before_form_is_loaded', 10, 1 );
-			 */
-			do_action( "um_before_{$mode}_form_is_loaded", $args );
-
-			UM()->shortcodes()->template_load( $template, $args );
+			UM()->shortcodes()->template_load( $args['template'], $args );
 
 			if ( ! is_admin() && ! defined( 'DOING_AJAX' ) ) {
 				UM()->shortcodes()->dynamic_css( $args );
 			}
 
-			$output = ob_get_clean();
-			return $output;
+			return ob_get_clean();
 		}
 
-
 		/**
 		 * Check if a legitimate password reset request is in action
 		 *
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 802ec4ff..236192ae 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -757,50 +757,65 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			}
 
 			/**
-			 * Fires pre-load form shortcode.
+			 * Fires before loading form shortcode.
 			 *
-			 * @since 2.0
+			 * Note: $mode can be 'profile', 'login', 'register', 'account'.
+			 *
+			 * @since 1.3.x
 			 * @hook  um_pre_{$mode}_shortcode
 			 *
-			 * @param {array} $args Form shortcode pre-loading.
+			 * @param {array} $args Form shortcode arguments.
 			 *
-			 * @example <caption>Make any custom action on pre-load form shortcode.</caption>
-			 * function my_pre_shortcode( $args ) {
+			 * @example <caption>Make any custom action before loading a registration form shortcode.</caption>
+			 * function my_pre_register_shortcode( $args ) {
 			 *     // your code here
 			 * }
-			 * add_action( 'um_pre_{$mode}_shortcode', 'my_pre_shortcode', 10, 1 );
+			 * add_action( 'um_pre_register_shortcode', 'my_pre_register_shortcode' );
+			 * @example <caption>Make any custom action before loading a login form shortcode.</caption>
+			 * function my_pre_login_shortcode( $args ) {
+			 *     // your code here
+			 * }
+			 * add_action( 'um_pre_login_shortcode', 'my_pre_login_shortcode' );
+			 * @example <caption>Make any custom action before loading a password reset form shortcode.</caption>
+			 * function my_pre_password_shortcode( $args ) {
+			 *     // your code here
+			 * }
+			 * add_action( 'um_pre_password_shortcode', 'my_pre_password_shortcode' );
+			 * @example <caption>Make any custom action before loading a profile form shortcode.</caption>
+			 * function my_pre_profile_shortcode( $args ) {
+			 *     // your code here
+			 * }
+			 * add_action( 'um_pre_profile_shortcode', 'my_pre_profile_shortcode' );
+			 * @example <caption>Make any custom action before loading an account form shortcode.</caption>
+			 * function my_pre_account_shortcode( $args ) {
+			 *     // your code here
+			 * }
+			 * add_action( 'um_pre_account_shortcode', 'my_pre_account_shortcode' );
 			 */
 			do_action( "um_pre_{$mode}_shortcode", $args );
-
 			/**
-			 * Fires pre-load form shortcode.
+			 * Fires before loading form shortcode.
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
 			 * @hook  um_before_form_is_loaded
 			 *
-			 * @param {array} $args Form shortcode pre-loading.
+			 * @param {array} $args Form shortcode arguments.
 			 *
-			 * @example <caption>Make any custom action on pre-load form shortcode.</caption>
+			 * @example <caption>Make any custom action before loading UM form shortcode.</caption>
 			 * function my_pre_shortcode( $args ) {
 			 *     // your code here
 			 * }
 			 * add_action( 'um_before_form_is_loaded', 'my_pre_shortcode', 10, 1 );
 			 */
 			do_action( 'um_before_form_is_loaded', $args );
-
 			/**
-			 * Fires pre-load form shortcode.
+			 * Fires before loading a form shortcode.
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
+			 * @todo Deprecate since 2.7.0. Use `um_pre_{$mode}_shortcode` or `um_before_form_is_loaded` instead.
 			 * @hook  um_before_{$mode}_form_is_loaded
 			 *
-			 * @param {array} $args Form shortcode pre-loading.
-			 *
-			 * @example <caption>Make any custom action on pre-load form shortcode.</caption>
-			 * function my_pre_shortcode( $args ) {
-			 *     // your code here
-			 * }
-			 * add_action( 'um_before_{$mode}_form_is_loaded', 'my_pre_shortcode', 10, 1 );
+			 * @param {array} $args Form shortcode arguments.
 			 */
 			do_action( "um_before_{$mode}_form_is_loaded", $args );
 
@@ -808,7 +823,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 
 			$this->dynamic_css( $args );
 
-			if ( um_get_requested_user() || 'logout' === $mode ) {
+			if ( 'logout' === $mode || um_get_requested_user() ) {
 				um_reset_user();
 			}
 
@@ -828,11 +843,9 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			 */
 			do_action( 'um_after_everything_output' );
 
-			$output = ob_get_clean();
-			return $output;
+			return ob_get_clean();
 		}
 
-
 		/**
 		 * Get dynamic CSS args
 		 *

From c2757d824b859e775ccd88b764101346587be488 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 17:04:58 +0300
Subject: [PATCH 26/37] - review `ajax_muted_action()`;

---
 includes/core/class-form.php | 50 ++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/includes/core/class-form.php b/includes/core/class-form.php
index e6007bcd..fbbbeed0 100644
--- a/includes/core/class-form.php
+++ b/includes/core/class-form.php
@@ -63,7 +63,6 @@ if ( ! class_exists( 'um\core\Form' ) ) {
 			add_action( 'init', array( &$this, 'field_declare' ), 10 );
 		}
 
-
 		/**
 		 *
 		 */
@@ -71,41 +70,36 @@ if ( ! class_exists( 'um\core\Form' ) ) {
 			UM()->check_ajax_nonce();
 
 			// phpcs:disable WordPress.Security.NonceVerification
+			if ( ! isset( $_REQUEST['hook'] ) ) {
+				die( esc_html__( 'Invalid hook', 'ultimate-member' ) );
+			}
+
 			if ( isset( $_REQUEST['user_id'] ) ) {
 				$user_id = absint( $_REQUEST['user_id'] );
 			}
-
-			if ( isset( $_REQUEST['hook'] ) ) {
-				$hook = sanitize_key( $_REQUEST['hook'] );
+			if ( ! isset( $user_id ) || ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
+				die( esc_html__( 'You can not edit this user.', 'ultimate-member' ) );
 			}
 
-			if ( ! UM()->roles()->um_current_user_can( 'edit', $user_id ) ) {
-				die( esc_html__( 'You can not edit this user', 'ultimate-member' ) );
-			}
-
-			switch ( $hook ) {
-				default:
-					/**
-					 * Fires on AJAX muted action.
-					 *
-					 * @since 2.0
-					 * @hook  um_run_ajax_function__{$hook}
-					 *
-					 * @param {array} $request Request.
-					 *
-					 * @example <caption>Make any custom action on AJAX muted action.</caption>
-					 * function my_run_ajax_function( $request ) {
-					 *     // your code here
-					 * }
-					 * add_action( 'um_run_ajax_function__{$hook}', 'my_run_ajax_function', 10, 1 );
-					 */
-					do_action( "um_run_ajax_function__{$hook}", $_REQUEST );
-					break;
-			}
+			$hook = sanitize_key( $_REQUEST['hook'] );
+			/**
+			 * Fires on AJAX muted action.
+			 *
+			 * @since 1.3.x
+			 * @hook  um_run_ajax_function__{$hook}
+			 *
+			 * @param {array} $request Request.
+			 *
+			 * @example <caption>Make any custom action on AJAX muted action.</caption>
+			 * function my_run_ajax_function( $request ) {
+			 *     // your code here
+			 * }
+			 * add_action( 'um_run_ajax_function__{$hook}', 'my_run_ajax_function', 10, 1 );
+			 */
+			do_action( "um_run_ajax_function__{$hook}", $_REQUEST );
 			// phpcs:enable WordPress.Security.NonceVerification
 		}
 
-
 		/**
 		 *
 		 */

From 863fa6aebc422198ab4d2e523c49019f5975dda0 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 17:16:41 +0300
Subject: [PATCH 27/37] - review `ajax_paginate()`;

---
 includes/core/class-query.php | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/includes/core/class-query.php b/includes/core/class-query.php
index 1b1ef124..9f795db3 100644
--- a/includes/core/class-query.php
+++ b/includes/core/class-query.php
@@ -25,16 +25,12 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 		 */
 		public $roles = array();
 
-
 		/**
 		 * Query constructor.
 		 */
 		public function __construct() {
-
-
 		}
 
-
 		/**
 		 * Ajax pagination for posts
 		 */
@@ -42,28 +38,25 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 			UM()->check_ajax_nonce();
 
 			// phpcs:disable WordPress.Security.NonceVerification
-			$hook = '';
-			if ( isset( $_REQUEST['hook'] ) ) {
-				$hook = $_REQUEST['hook'];
-			}
-			if ( ! empty( $_REQUEST['args'] ) ) {
-				$args = $_REQUEST['args'];
-			} else {
-				$args = array();
+			if ( ! isset( $_REQUEST['hook'] ) ) {
+				wp_send_json_error( __( 'Invalid hook.', 'ultimate-member' ) );
 			}
+			$hook = sanitize_key( $_REQUEST['hook'] );
+
+			$args = ! empty( $_REQUEST['args'] ) ? $_REQUEST['args'] : array();
 			// phpcs:enable WordPress.Security.NonceVerification
 
 			ob_start();
 
 			/**
-			 * Fires on posts loading by AJAX.
+			 * Fires on posts loading by AJAX in User Profile tabs.
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
 			 * @hook  um_ajax_load_posts__{$hook}
 			 *
 			 * @param {array} $args Request.
 			 *
-			 * @example <caption>Make any custom action on posts loading by AJAX.</caption>
+			 * @example <caption>Make any custom action on when posts loading by AJAX in User Profile.</caption>
 			 * function my_ajax_load_posts( $args ) {
 			 *     // your code here
 			 * }
@@ -72,11 +65,10 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 			do_action( "um_ajax_load_posts__{$hook}", $args );
 
 			$output = ob_get_clean();
-
+			// @todo: investigate using WP_KSES
 			die( $output );
 		}
 
-
 		/**
 		 * Get wp pages
 		 *

From 8749b2cf5e5c0497c35936a2d85d3f72fd539147 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 18:00:25 +0300
Subject: [PATCH 28/37] - review `load()`;

---
 includes/core/class-fields.php     |  83 ++++++++++----------
 includes/core/class-shortcodes.php | 119 ++++++++++++++++-------------
 2 files changed, 107 insertions(+), 95 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 3da26800..4ac9e7ab 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -3552,47 +3552,50 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Radio */
 				case 'radio':
-					if ( isset( $options ) ) {
-						/**
-						 * Filters extend radio field options.
-						 *
-						 * @since 2.0
-						 * @hook  um_radio_field_options
-						 *
-						 * @param {array}   $options  Radio Field Options.
-						 * @param {array}   $data     Field Data.
-						 *
-						 * @return {array}  $options  Radio Field Options.
-						 *
-						 * @example <caption>Extend radio field options.</caption>
-						 * function my_radio_field_options( $options, $data ) {
-						 *     // your code here
-						 *     return $options;
-						 * }
-						 * add_filter( 'um_radio_field_options', 'my_radio_field_options', 10, 2 );
-						 */
-						$options = apply_filters( 'um_radio_field_options', $options, $data );
-
-						/**
-						 * Filters extend radio field options by field $key.
-						 *
-						 * @since 2.0
-						 * @hook  um_radio_field_options_{$key}
-						 *
-						 * @param {array}   $options  Radio Field Options.
-						 *
-						 * @return {array}  $options  Radio Field Options.
-						 *
-						 * @example <caption>Extend radio field options.</caption>
-						 * function my_radio_field_options( $options ) {
-						 *     // your code here
-						 *     return $options;
-						 * }
-						 * add_filter( 'um_radio_field_options_{$key}', 'my_radio_field_options', 10, 1 );
-						 */
-						$options = apply_filters( "um_radio_field_options_{$key}", $options );
+					$options = array();
+					if ( isset( $data['options'] ) && is_array( $data['options'] ) ) {
+						$options = $data['options'];
 					}
 
+					/**
+					 * Filters extend radio field options.
+					 *
+					 * @since 2.0
+					 * @hook  um_radio_field_options
+					 *
+					 * @param {array}   $options  Radio Field Options.
+					 * @param {array}   $data     Field Data.
+					 *
+					 * @return {array}  $options  Radio Field Options.
+					 *
+					 * @example <caption>Extend radio field options.</caption>
+					 * function my_radio_field_options( $options, $data ) {
+					 *     // your code here
+					 *     return $options;
+					 * }
+					 * add_filter( 'um_radio_field_options', 'my_radio_field_options', 10, 2 );
+					 */
+					$options = apply_filters( 'um_radio_field_options', $options, $data );
+
+					/**
+					 * Filters extend radio field options by field $key.
+					 *
+					 * @since 2.0
+					 * @hook  um_radio_field_options_{$key}
+					 *
+					 * @param {array}   $options  Radio Field Options.
+					 *
+					 * @return {array}  $options  Radio Field Options.
+					 *
+					 * @example <caption>Extend radio field options.</caption>
+					 * function my_radio_field_options( $options ) {
+					 *     // your code here
+					 *     return $options;
+					 * }
+					 * add_filter( 'um_radio_field_options_{$key}', 'my_radio_field_options', 10, 1 );
+					 */
+					$options = apply_filters( "um_radio_field_options_{$key}", $options );
+
 					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
@@ -3920,7 +3923,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		 * @return array
 		 */
 		function get_available_roles( $form_key, $options = array() ) {
-			if ( $form_key != 'role' ) {
+			if ( 'role' !== $form_key ) {
 				return $options;
 			}
 
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 236192ae..06bd3b30 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -582,7 +582,6 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			}
 		}
 
-
 		/**
 		 * Shortcode
 		 *
@@ -590,11 +589,10 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 *
 		 * @return string
 		 */
-		function ultimatemember( $args = array() ) {
+		public function ultimatemember( $args = array() ) {
 			return $this->load( $args );
 		}
 
-
 		/**
 		 * Load a module with global function
 		 *
@@ -606,15 +604,15 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			$defaults = array();
 			$args     = wp_parse_args( $args, $defaults );
 
-			// when to not continue
-			$this->form_id = isset( $args['form_id'] ) ? $args['form_id'] : null;
-			if ( ! $this->form_id ) {
-				return;
+			// When to not continue.
+			if ( ! array_key_exists( 'form_id', $args ) ) {
+				return '';
 			}
+			$this->form_id = $args['form_id'];
 
 			$this->form_status = get_post_status( $this->form_id );
 			if ( 'publish' !== $this->form_status ) {
-				return;
+				return '';
 			}
 
 			// get data into one global array
@@ -624,21 +622,21 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			ob_start();
 
 			/**
-			 * Filters change arguments on load shortcode
+			 * Filters arguments for loading Ultimate Member shortcodes.
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
 			 * @hook  um_pre_args_setup
 			 *
-			 * @param {array}  $post_data  $_POST data.
+			 * @param {array} $args Data for loading shortcode.
 			 *
-			 * @return {array} $post_data data.
+			 * @return {array} Data for loading shortcode.
 			 *
 			 * @example <caption>Change arguments on load shortcode.</caption>
-			 * function my_pre_args_setup( $post_data ) {
+			 * function my_pre_args_setup( $args ) {
 			 *     // your code here
-			 *     return $post_data;
+			 *     return $args;
 			 * }
-			 * add_filter( 'um_pre_args_setup', 'my_pre_args_setup', 10, 1 );
+			 * add_filter( 'um_pre_args_setup', 'my_pre_args_setup' );
 			 */
 			$args = apply_filters( 'um_pre_args_setup', $args );
 
@@ -676,82 +674,93 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 					$args = array_merge( $this->get_css_args( $args ), $args );
 				}
 			}
-			// filter for arguments
 
 			/**
-			 * Filters change arguments on load shortcode
+			 * Filters change arguments on load shortcode.
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
 			 * @hook  um_shortcode_args_filter
 			 *
-			 * @param {array}  $post_data  Shortcode arguments.
+			 * @param {array} $args Shortcode arguments.
 			 *
-			 * @return {array} $post_data Shortcode arguments.
+			 * @return {array} Shortcode arguments.
 			 *
 			 * @example <caption>Change arguments on load shortcode.</caption>
 			 * function my_shortcode_args( $args ) {
 			 *     // your code here
 			 *     return $args;
 			 * }
-			 * add_filter( 'um_shortcode_args_filter', 'my_shortcode_args', 10, 1 );
+			 * add_filter( 'um_shortcode_args_filter', 'my_shortcode_args' );
 			 */
 			$args = apply_filters( 'um_shortcode_args_filter', $args );
 
 			if ( ! array_key_exists( 'mode', $args ) || ! array_key_exists( 'template', $args ) ) {
-				return;
+				ob_get_clean();
+				return '';
 			}
 			$mode = $args['mode'];
 
-			//not display on admin preview
+			// Not display on admin preview.
 			if ( empty( $_POST['act_id'] ) || 'um_admin_preview_form' !== sanitize_key( $_POST['act_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-
+				/**
+				 * Filters the ability to show registration form for the logged-in users.
+				 * Set it to true for displaying registration form for the logged-in users.
+				 *
+				 * @since 2.1.20
+				 * @hook um_registration_for_loggedin_users
+				 *
+				 * @param {bool}  $show Show registration form for the logged-in users. By default, it's false
+				 * @param {array} $args Shortcode arguments.
+				 *
+				 * @return {bool} Show registration form for the logged-in users.
+				 *
+				 * @example <caption>Show registration form for the logged-in users for all UM registration forms on your website.</caption>
+				 * add_filter( 'um_registration_for_loggedin_users', '__return_true' );
+				 */
 				$enable_loggedin_registration = apply_filters( 'um_registration_for_loggedin_users', false, $args );
 
-				if ( 'register' === $mode && is_user_logged_in() && ! $enable_loggedin_registration ) {
+				if ( ! $enable_loggedin_registration && 'register' === $mode && is_user_logged_in() ) {
 					ob_get_clean();
-					return __( 'You are already registered', 'ultimate-member' );
+					return __( 'You are already registered.', 'ultimate-member' );
 				}
 			}
 
-			if ( ! is_user_logged_in() && isset( $args['is_block'] ) && 1 === (int) $args['is_block'] && 'profile' === $mode ) {
-				return;
+			if ( isset( $args['is_block'] ) && 1 === (int) $args['is_block'] && 'profile' === $mode && ! is_user_logged_in() ) {
+				ob_get_clean();
+				return '';
 			}
 
-			// for profiles only
+			// For profiles only.
 			if ( 'profile' === $mode && um_profile_id() ) {
-
-				//set requested user if it's not setup from permalinks (for not profile page in edit mode)
+				// Set requested user if it's not setup from permalinks (for not profile page in edit mode).
 				if ( ! um_get_requested_user() ) {
 					um_set_requested_user( um_profile_id() );
 				}
 
-				if ( ! empty( $args['use_custom_settings'] ) ) { // Option "Apply custom settings to this form"
-					if ( ! empty( $args['role'] ) ) { // Option "Make this profile form role-specific"
+				if ( ! empty( $args['use_custom_settings'] ) && ! empty( $args['role'] ) ) {
+					// Option "Apply custom settings to this form". Option "Make this profile form role-specific".
+					// Show the first Profile Form with role selected, don't show profile forms below the page with other role-specific setting.
+					if ( empty( $this->profile_role ) ) {
+						$current_user_roles = UM()->roles()->get_all_user_roles( um_profile_id() );
 
-						// show the first Profile Form with role selected, don't show profile forms below the page with other role-specific setting
-						if ( empty( $this->profile_role ) ) {
-							$current_user_roles = UM()->roles()->get_all_user_roles( um_profile_id() );
-
-							if ( empty( $current_user_roles ) ) {
-								ob_get_clean();
-								return '';
-							} elseif ( is_array( $args['role'] ) ) {
-								if ( ! count( array_intersect( $args['role'], $current_user_roles ) ) ) {
-									ob_get_clean();
-									return '';
-								}
-							} else {
-								if ( ! in_array( $args['role'], $current_user_roles ) ) {
-									ob_get_clean();
-									return '';
-								}
-							}
-
-							$this->profile_role = $args['role'];
-						} elseif ( $this->profile_role !== $args['role'] ) {
+						if ( empty( $current_user_roles ) ) {
 							ob_get_clean();
 							return '';
 						}
+						if ( is_array( $args['role'] ) ) {
+							if ( ! count( array_intersect( $args['role'], $current_user_roles ) ) ) {
+								ob_get_clean();
+								return '';
+							}
+						} elseif ( ! in_array( $args['role'], $current_user_roles, true ) ) {
+							ob_get_clean();
+							return '';
+						}
+
+						$this->profile_role = $args['role'];
+					} elseif ( $this->profile_role !== $args['role'] ) {
+						ob_get_clean();
+						return '';
 					}
 				}
 			}
@@ -833,7 +842,7 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			 * @since 2.0
 			 * @hook  um_after_everything_output
 			 *
-			 * @param {array} $args Form shortcode pre-loading.
+			 * @param {array} $args Form shortcode arguments.
 			 *
 			 * @example <caption>Make any custom action after load shortcode content.</caption>
 			 * function my_pre_shortcode() {

From 03e5424867b1b1b85f16cb15e8571bbb91a74691 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 20:46:23 +0300
Subject: [PATCH 29/37] - review `dynamic_css()`;

---
 assets/dynamic_css/dynamic-directory.php | 38 ++++++++++++++++++
 assets/dynamic_css/dynamic-global.php    | 21 ++++++++++
 assets/dynamic_css/dynamic-profile.php   | 37 ++++++++++++++++++
 assets/dynamic_css/dynamic_directory.php | 45 ----------------------
 assets/dynamic_css/dynamic_global.php    | 17 --------
 assets/dynamic_css/dynamic_profile.php   | 49 ------------------------
 includes/core/class-shortcodes.php       | 40 ++++++++++---------
 7 files changed, 118 insertions(+), 129 deletions(-)
 create mode 100644 assets/dynamic_css/dynamic-directory.php
 create mode 100644 assets/dynamic_css/dynamic-global.php
 create mode 100644 assets/dynamic_css/dynamic-profile.php
 delete mode 100644 assets/dynamic_css/dynamic_directory.php
 delete mode 100644 assets/dynamic_css/dynamic_global.php
 delete mode 100644 assets/dynamic_css/dynamic_profile.php

diff --git a/assets/dynamic_css/dynamic-directory.php b/assets/dynamic_css/dynamic-directory.php
new file mode 100644
index 00000000..31f12f1c
--- /dev/null
+++ b/assets/dynamic_css/dynamic-directory.php
@@ -0,0 +1,38 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( empty( $args['css_profile_card_bg'] ) && empty( $args['css_card_thickness'] ) &&
+	empty( $args['css_profile_card_text'] ) && empty( $args['css_card_bordercolor'] ) &&
+	empty( $args['css_img_bordercolor'] ) ) {
+	return;
+}
+?>
+<style>
+	<?php if ( ! empty( $args['css_profile_card_bg'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member {
+			background: <?php echo esc_attr( $args['css_profile_card_bg'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_card_thickness'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member {
+			border-width: <?php echo esc_attr( $args['css_card_thickness'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_profile_card_text'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member-card * {
+			color: <?php echo esc_attr( $args['css_profile_card_text'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_card_bordercolor'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member {
+			border-color: <?php echo esc_attr( $args['css_card_bordercolor'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( ! empty( $args['css_img_bordercolor'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?> .um-member-photo img {
+			border-color: <?php echo esc_attr( $args['css_img_bordercolor'] ); ?>;
+		}
+	<?php } ?>
+</style>
diff --git a/assets/dynamic_css/dynamic-global.php b/assets/dynamic_css/dynamic-global.php
new file mode 100644
index 00000000..641ebf62
--- /dev/null
+++ b/assets/dynamic_css/dynamic-global.php
@@ -0,0 +1,21 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! isset( $args['max_width'] ) && ! isset( $args['align'] ) ) {
+	return;
+}
+?>
+<style>
+	<?php if ( isset( $args['max_width'] ) && $args['max_width'] ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um {
+			max-width: <?php echo esc_attr( $args['max_width'] ); ?>;
+		}
+	<?php } ?>
+	<?php if ( isset( $args['align'] ) && in_array( $args['align'], array( 'left', 'right' ), true ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um {
+			margin-<?php echo esc_attr( $args['align'] ); ?>: 0px !important;
+		}
+	<?php } ?>
+</style>
diff --git a/assets/dynamic_css/dynamic-profile.php b/assets/dynamic_css/dynamic-profile.php
new file mode 100644
index 00000000..14803fd2
--- /dev/null
+++ b/assets/dynamic_css/dynamic-profile.php
@@ -0,0 +1,37 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+if ( ! isset( $args['photosize'] ) || 'original' === $args['photosize'] ) {
+	$args['photosize'] = um_get_metadefault( 'profile_photosize' ); // Cannot be more than metadefault value.
+}
+
+$args['photosize'] = absint( $args['photosize'] );
+
+$photosize_up = ( $args['photosize'] / 2 ) + 10;
+$meta_padding = ( $args['photosize'] + 60 ) . 'px';
+?>
+<style>
+	<?php if ( ! empty( $args['area_max_width'] ) ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-body {
+			max-width: <?php echo esc_attr( $args['area_max_width'] ); ?>;
+		}
+	<?php } ?>
+	.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-photo a.um-profile-photo-img {
+		width: <?php echo esc_attr( $args['photosize'] ); ?>px;
+		height: <?php echo esc_attr( $args['photosize'] ); ?>px;
+	}
+	.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-photo a.um-profile-photo-img {
+		top: -<?php echo esc_attr( $photosize_up ); ?>px;
+	}
+	<?php if ( is_rtl() ) { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-meta {
+			padding-right: <?php echo esc_attr( $meta_padding ); ?>;
+		}
+	<?php } else { ?>
+		.um-<?php echo esc_attr( $args['form_id'] ); ?>.um .um-profile-meta {
+			padding-left: <?php echo esc_attr( $meta_padding ); ?>;
+		}
+	<?php } ?>
+</style>
diff --git a/assets/dynamic_css/dynamic_directory.php b/assets/dynamic_css/dynamic_directory.php
deleted file mode 100644
index f1105145..00000000
--- a/assets/dynamic_css/dynamic_directory.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<style type="text/css">
-<?php
-
-if ( isset( $css_profile_card_bg ) && ! empty( $css_profile_card_bg ) ) {
-
-print ".um-$form_id .um-member {
-	background: $css_profile_card_bg;
-}";
-
-}
-
-if ( isset( $css_card_thickness ) && ! empty(  $css_card_thickness  ) ) {
-
-print ".um-$form_id .um-member {
-	border-width: $css_card_thickness;
-}";
-
-}
-
-if ( isset( $css_profile_card_text ) && ! empty( $css_profile_card_text ) ) {
-
-print ".um-$form_id .um-member-card * {
-	color: $css_profile_card_text;
-}";
-
-}
-
-if ( isset( $css_card_bordercolor ) && ! empty( $css_card_bordercolor ) ) {
-
-print ".um-$form_id .um-member {
-	border-color: $css_card_bordercolor;
-}";
-
-}
-
-if ( isset( $css_img_bordercolor ) && ! empty( $css_img_bordercolor ) ) {
-
-print ".um-$form_id .um-member-photo img {
-	border-color: $css_img_bordercolor;
-}";
-
-}
-
-?>
-</style>
\ No newline at end of file
diff --git a/assets/dynamic_css/dynamic_global.php b/assets/dynamic_css/dynamic_global.php
deleted file mode 100644
index 2e867156..00000000
--- a/assets/dynamic_css/dynamic_global.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<style type="text/css">
-<?php
-
-if ( isset( $max_width ) && $max_width ) {
-print ".um-$form_id.um {
-	max-width: {$max_width};
-}";
-}
-
-if ( isset( $align ) && in_array( $align, array( 'left', 'right' ) ) ) {
-print ".um-$form_id.um {
-	margin-$align: 0px !important;
-}";
-}
-
-?>
-</style>
diff --git a/assets/dynamic_css/dynamic_profile.php b/assets/dynamic_css/dynamic_profile.php
deleted file mode 100644
index ae7309d2..00000000
--- a/assets/dynamic_css/dynamic_profile.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
-
-<style type="text/css">
-
-	<?php if ( ! $photosize || $photosize == 'original' ) {
-		//cannot be more than metadefault value
-		$photosize = um_get_metadefault( 'profile_photosize' );
-	}
-	$photosize = filter_var( $photosize, FILTER_SANITIZE_NUMBER_INT );
-
-	$photosize_up = ( $photosize / 2 ) + 10;
-	$meta_padding = ( $photosize + 60 ) . 'px';
-
-	if ( $area_max_width ) {
-		print "
-		.um-$form_id.um .um-profile-body {
-			max-width: $area_max_width;
-		}
-		";
-	}
-
-	print "
-	.um-$form_id.um .um-profile-photo a.um-profile-photo-img {
-		width: ".$photosize."px;
-		height: ".$photosize."px;
-	}
-	";
-
-	print "
-	.um-$form_id.um .um-profile-photo a.um-profile-photo-img {
-		top: -".$photosize_up."px;
-	}
-	";
-
-	if ( is_rtl() ) {
-		print "
-		.um-$form_id.um .um-profile-meta {
-			padding-right: $meta_padding;
-		}
-		";
-	} else {
-		print "
-		.um-$form_id.um .um-profile-meta {
-			padding-left: $meta_padding;
-		}
-		";
-	}
-	?>
-</style>
\ No newline at end of file
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 06bd3b30..3b15dbeb 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -861,15 +861,20 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 * @param $args
 		 * @return array
 		 */
-		function get_css_args( $args ) {
+		public function get_css_args( $args ) {
 			$arr = um_styling_defaults( $args['mode'] );
-			$arr = array_merge( $arr, array( 'form_id' => $args['form_id'], 'mode' => $args['mode'] ) );
+			$arr = array_merge(
+				$arr,
+				array(
+					'form_id' => $args['form_id'],
+					'mode'    => $args['mode'],
+				)
+			);
 			return $arr;
 		}
 
-
 		/**
-		 * Load dynamic css
+		 * Load dynamic CSS.
 		 *
 		 * @param array $args
 		 *
@@ -877,31 +882,31 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 		 */
 		public function dynamic_css( $args = array() ) {
 			/**
-			 * Filters turn on for disable global dynamic CSS for fix the issue #306
+			 * Filters for disable global dynamic CSS. It's false by default, set it to true to disable.
 			 *
 			 * @since 2.0
 			 * @hook  um_disable_dynamic_global_css
 			 *
-			 * @param {bool}  $disable  Disable global CSS.
+			 * @param {bool} $disable Disable global CSS.
 			 *
-			 * @return {bool} $disable Disable global CSS.
+			 * @return {bool} Disable global CSS.
 			 *
-			 * @example <caption>Turn on for disable global dynamic CSS.</caption>
-			 * function my_disable_dynamic_global_css( $disable ) {
-			 *     // your code here
-			 *     return $disable;
-			 * }
-			 * add_filter( 'um_disable_dynamic_global_css', 'my_disable_dynamic_global_css', 10, 1 );
+			 * @example <caption>Turn off enqueue of global dynamic CSS.</caption>
+			 * add_filter( 'um_disable_dynamic_global_css', '__return_true' );
 			 */
 			$disable_css = apply_filters( 'um_disable_dynamic_global_css', false );
 			if ( $disable_css ) {
 				return '';
 			}
 
-			include_once um_path . 'assets/dynamic_css/dynamic_global.php';
+			if ( empty( $args['form_id'] ) ) {
+				return '';
+			}
 
-			if ( isset( $args['mode'] ) && in_array( $args['mode'], array( 'profile', 'directory' ), true ) ) {
-				$file = um_path . 'assets/dynamic_css/dynamic_' . $args['mode'] . '.php';
+			include_once UM_PATH . 'assets/dynamic_css/dynamic-global.php';
+
+			if ( array_key_exists( 'mode', $args ) && in_array( $args['mode'], array( 'profile', 'directory' ), true ) ) {
+				$file = UM_PATH . 'assets/dynamic_css/dynamic-' . $args['mode'] . '.php';
 
 				if ( file_exists( $file ) ) {
 					include_once $file;
@@ -911,14 +916,13 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			return '';
 		}
 
-
 		/**
 		 * Loads a template file
 		 *
 		 * @param $template
 		 * @param array $args
 		 */
-		function template_load( $template, $args = array() ) {
+		public function template_load( $template, $args = array() ) {
 			if ( is_array( $args ) ) {
 				$this->set_args = $args;
 			}

From c05f0c4b1eb75012c44aa45628b11427fe7b1da5 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 21:13:54 +0300
Subject: [PATCH 30/37] - review `do_ajax_action()`; - make
 `add_field_from_list()` function as private; - make `duplicate_field()`
 function as private;

---
 includes/core/class-fields.php | 210 +++++++++++++++------------------
 1 file changed, 95 insertions(+), 115 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 4ac9e7ab..a7a733ca 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -277,14 +277,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			UM()->query()->update_attr( 'custom_fields', $form_id, $fields );
 		}
 
-
 		/**
 		 * Deletes a field in form only
 		 *
-		 * @param  integer $id
-		 * @param  integer $form_id
+		 * @param string $id
+		 * @param int    $form_id
 		 */
-		function delete_field_from_form( $id, $form_id ) {
+		public function delete_field_from_form( $id, $form_id ) {
 			$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
 
 			if ( isset( $fields[ $id ] ) ) {
@@ -324,13 +323,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			}
 		}
 
-
 		/**
-		 * Deletes a field from custom fields
+		 * Deletes a field from custom fields.
 		 *
-		 * @param  integer $id
+		 * @param string $id
 		 */
-		function delete_field_from_db( $id ) {
+		public function delete_field_from_db( $id ) {
 			$fields = UM()->builtin()->saved_fields;
 			if ( isset( $fields[ $id ] ) ) {
 				$args = $fields[ $id ];
@@ -396,68 +394,30 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						update_post_meta( $directory_id, '_um_sortby_custom_order', '' );
 					}
 				}
-
 			}
 		}
 
-
 		/**
-		 * Quickly adds a field from custom fields
+		 * Quickly adds a field from custom fields.
 		 *
-		 * @param integer $global_id
-		 * @param integer $form_id
-		 * @param array   $position
+		 * @param string $global_id
+		 * @param int    $form_id
+		 * @param array  $position
 		 */
-		function add_field_from_list( $global_id, $form_id, $position = array() ) {
-			$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
+		private function add_field_from_list( $global_id, $form_id, $position = array() ) {
+			$fields      = UM()->query()->get_attr( 'custom_fields', $form_id );
 			$field_scope = UM()->builtin()->saved_fields;
 
 			if ( ! isset( $fields[ $global_id ] ) ) {
-
 				$count = 1;
 				if ( ! empty( $fields ) ) {
 					$count = count( $fields ) + 1;
 				}
 
-				$fields[ $global_id ] = $field_scope[ $global_id ];
+				$fields[ $global_id ]             = $field_scope[ $global_id ];
 				$fields[ $global_id ]['position'] = $count;
 
-				// set position
-				if ( $position ) {
-					foreach ( $position as $key => $val) {
-						$fields[ $global_id ][ $key ] = $val;
-					}
-				}
-
-				// add field to form
-				UM()->query()->update_attr( 'custom_fields', $form_id, $fields );
-
-			}
-		}
-
-
-		/**
-		 * Quickly adds a field from pre-defined fields
-		 *
-		 * @param integer $global_id
-		 * @param integer $form_id
-		 * @param array   $position
-		 */
-		function add_field_from_predefined( $global_id, $form_id, $position = array() ) {
-			$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
-			$field_scope = UM()->builtin()->predefined_fields;
-
-			if ( ! isset( $fields[ $global_id ] ) ) {
-
-				$count = 1;
-				if ( ! empty( $fields ) ) {
-					$count = count( $fields ) + 1;
-				}
-
-				$fields[ $global_id ] = $field_scope[ $global_id ];
-				$fields[ $global_id ]['position'] = $count;
-
-				// set position
+				// Set position.
 				if ( $position ) {
 					foreach ( $position as $key => $val ) {
 						$fields[ $global_id ][ $key ] = $val;
@@ -469,39 +429,65 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			}
 		}
 
+		/**
+		 * Quickly adds a field from pre-defined fields.
+		 *
+		 * @param string $global_id
+		 * @param int    $form_id
+		 * @param array  $position
+		 */
+		private function add_field_from_predefined( $global_id, $form_id, $position = array() ) {
+			$fields      = UM()->query()->get_attr( 'custom_fields', $form_id );
+			$field_scope = UM()->builtin()->predefined_fields;
+
+			if ( ! isset( $fields[ $global_id ] ) ) {
+				$count = 1;
+				if ( ! empty( $fields ) ) {
+					$count = count( $fields ) + 1;
+				}
+
+				$fields[ $global_id ]             = $field_scope[ $global_id ];
+				$fields[ $global_id ]['position'] = $count;
+
+				// Set position.
+				if ( $position ) {
+					foreach ( $position as $key => $val ) {
+						$fields[ $global_id ][ $key ] = $val;
+					}
+				}
+
+				// add field to form
+				UM()->query()->update_attr( 'custom_fields', $form_id, $fields );
+			}
+		}
 
 		/**
-		 * Duplicates a frield by meta key
+		 * Duplicates a field by meta key.
 		 *
-		 * @param  integer $id
-		 * @param  integer $form_id
+		 * @param string $id
+		 * @param int    $form_id
 		 */
-		function duplicate_field( $id, $form_id ) {
-			$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
+		private function duplicate_field( $id, $form_id ) {
+			$fields     = UM()->query()->get_attr( 'custom_fields', $form_id );
 			$all_fields = UM()->builtin()->saved_fields;
 
 			$inc = count( $fields ) + 1;
 
 			$duplicate = $fields[ $id ];
 
-			$new_metakey = $id . "_" . $inc;
-			$new_title = $fields[ $id ]['title'] . " #" . $inc;
+			$new_metakey  = $id . '_' . $inc;
+			$new_title    = $fields[ $id ]['title'] . ' #' . $inc;
 			$new_position = $inc;
 
-			$duplicate['title'] = $new_title;
-			$duplicate['metakey'] = $new_metakey;
+			$duplicate['title']    = $new_title;
+			$duplicate['metakey']  = $new_metakey;
 			$duplicate['position'] = $new_position;
 
-			$fields[ $new_metakey ] = $duplicate;
+			$fields[ $new_metakey ]     = $duplicate;
 			$all_fields[ $new_metakey ] = $duplicate;
 
-			// not global attributes
-			unset( $all_fields[ $new_metakey ]['in_row'] );
-			unset( $all_fields[ $new_metakey ]['in_sub_row'] );
-			unset( $all_fields[ $new_metakey ]['in_column'] );
-			unset( $all_fields[ $new_metakey ]['in_group'] );
-			unset( $all_fields[ $new_metakey ]['position'] );
-
+			// Not global attributes.
+			unset( $all_fields[ $new_metakey ]['in_row'], $all_fields[ $new_metakey ]['in_sub_row'], $all_fields[ $new_metakey ]['in_column'], $all_fields[ $new_metakey ]['in_group'], $all_fields[ $new_metakey ]['position'] );
 
 			do_action( 'um_add_new_field', $new_metakey, $duplicate );
 
@@ -4836,64 +4822,58 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			return $output;
 		}
 
-
 		/**
-		 *
+		 * Admin Builder silent AJAX handler for actions with fields.
 		 */
 		public function do_ajax_action() {
 			UM()->admin()->check_ajax_nonce();
 
-			if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) {
-				wp_send_json_error( __( 'Please login as administrator', 'ultimate-member' ) );
-			}
-
-			$output = null;
-
-			$position = array();
 			// phpcs:disable WordPress.Security.NonceVerification
-			if ( ! empty( $_POST['in_column'] ) ) {
-				$position['in_row']     = '_um_row_' . ( (int) $_POST['in_row'] + 1 );
-				$position['in_sub_row'] = isset( $_POST['in_sub_row'] ) ? $_POST['in_sub_row'] : '';
-				$position['in_column']  = isset( $_POST['in_column'] ) ? $_POST['in_column'] : '';
-				$position['in_group']   = isset( $_POST['in_group'] ) ? $_POST['in_group'] : '';
+			if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) {
+				wp_send_json_error( __( 'Please login as administrator.', 'ultimate-member' ) );
 			}
 
-			if ( isset( $_POST['act_id'] ) ) {
-				switch ( $_POST['act_id'] ) {
-					case 'um_admin_duplicate_field':
-						$this->duplicate_field( $_POST['arg1'], $_POST['arg2'] );
-						break;
+			if ( ! isset( $_POST['act_id'] ) ) {
+				wp_send_json_error( __( 'Invalid action.', 'ultimate-member' ) );
+			}
 
-					case 'um_admin_remove_field_global':
-						$this->delete_field_from_db( $_POST['arg1'] );
-						break;
+			$position = array(
+				'in_row'     => '_um_row_' . ( absint( $_POST['in_row'] ) + 1 ),
+				'in_sub_row' => isset( $_POST['in_sub_row'] ) ? absint( $_POST['in_sub_row'] ) : '',
+				'in_column'  => isset( $_POST['in_column'] ) ? absint( $_POST['in_column'] ) : '',
+				'in_group'   => isset( $_POST['in_group'] ) ? absint( $_POST['in_group'] ) : '',
+			);
 
-					case 'um_admin_remove_field':
-						$this->delete_field_from_form( $_POST['arg1'], $_POST['arg2'] );
-						break;
-
-					case 'um_admin_add_field_from_predefined':
-						$this->add_field_from_predefined( $_POST['arg1'], $_POST['arg2'], $position );
-						break;
-
-					case 'um_admin_add_field_from_list':
-						$this->add_field_from_list( $_POST['arg1'], $_POST['arg2'], $position );
-						break;
-				}
+			switch ( sanitize_key( $_POST['act_id'] ) ) {
+				case 'um_admin_duplicate_field':
+					// arg1 is a field metakey(id)
+					// arg2 is a form ID.
+					$this->duplicate_field( sanitize_text_field( $_POST['arg1'] ), absint( $_POST['arg2'] ) );
+					break;
+				case 'um_admin_remove_field_global':
+					// arg1 is a field metakey(id)
+					$this->delete_field_from_db( sanitize_text_field( $_POST['arg1'] ) );
+					break;
+				case 'um_admin_remove_field':
+					// arg1 is a field metakey(id)
+					// arg2 is a form ID.
+					$this->delete_field_from_form( sanitize_text_field( $_POST['arg1'] ), absint( $_POST['arg2'] ) );
+					break;
+				case 'um_admin_add_field_from_predefined':
+					// arg1 is a field metakey(id)
+					// arg2 is a form ID.
+					$this->add_field_from_predefined( sanitize_text_field( $_POST['arg1'] ), absint( $_POST['arg2'] ), $position );
+					break;
+				case 'um_admin_add_field_from_list':
+					// arg1 is a field metakey(id)
+					// arg2 is a form ID.
+					$this->add_field_from_list( sanitize_text_field( $_POST['arg1'] ), absint( $_POST['arg2'] ), $position );
+					break;
 			}
 			// phpcs:enable WordPress.Security.NonceVerification
-
-			if ( is_array( $output ) ) {
-				print_r( $output );
-			} else {
-				echo $output;
-			}
-			die;
-
+			wp_send_json_success();
 		}
 
-
-
 		/**
 		 * Get rendered field attributes
 		 *

From d3f6fb13943bfde6bcfd36e5eece787410d8ba7f Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 21:21:18 +0300
Subject: [PATCH 31/37] - fixed `delete_field_from_db()`; - fixed
 `do_ajax_action()` and `$in_row` attribute;

---
 includes/core/class-fields.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index a7a733ca..a4b91554 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -351,6 +351,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				foreach ( $directories as $directory_id ) {
 					// Frontend filters
 					$directory_search_fields = get_post_meta( $directory_id, '_um_search_fields', true );
+					$directory_search_fields = ! is_array( $directory_search_fields ) ? array() : $directory_search_fields;
 					$directory_search_fields = array_values( array_diff( $directory_search_fields, array( $id ) ) );
 					update_post_meta( $directory_id, '_um_search_fields', $directory_search_fields );
 
@@ -363,16 +364,19 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					// display in tagline
 					$directory_reveal_fields = get_post_meta( $directory_id, '_um_reveal_fields', true );
+					$directory_reveal_fields = ! is_array( $directory_reveal_fields ) ? array() : $directory_reveal_fields;
 					$directory_reveal_fields = array_values( array_diff( $directory_reveal_fields, array( $id ) ) );
 					update_post_meta( $directory_id, '_um_reveal_fields', $directory_reveal_fields );
 
 					// extra user information section
 					$directory_tagline_fields = get_post_meta( $directory_id, '_um_tagline_fields', true );
+					$directory_tagline_fields = ! is_array( $directory_tagline_fields ) ? array() : $directory_tagline_fields;
 					$directory_tagline_fields = array_values( array_diff( $directory_tagline_fields, array( $id ) ) );
 					update_post_meta( $directory_id, '_um_tagline_fields', $directory_tagline_fields );
 
 					// Custom fields selected in "Choose field(s) to enable in sorting"
 					$directory_sorting_fields = get_post_meta( $directory_id, '_um_sorting_fields', true );
+					$directory_sorting_fields = ! is_array( $directory_sorting_fields ) ? array() : $directory_sorting_fields;
 					foreach ( $directory_sorting_fields as $key => $sorting_data ) {
 						if ( is_array( $sorting_data ) && array_key_exists( $id, $sorting_data ) ) {
 							unset( $directory_sorting_fields[ $key ] );
@@ -4837,8 +4841,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				wp_send_json_error( __( 'Invalid action.', 'ultimate-member' ) );
 			}
 
+			$in_row   = isset( $_POST['in_row'] ) ? absint( $_POST['in_row'] ) : 0;
 			$position = array(
-				'in_row'     => '_um_row_' . ( absint( $_POST['in_row'] ) + 1 ),
+				'in_row'     => '_um_row_' . ( $in_row + 1 ),
 				'in_sub_row' => isset( $_POST['in_sub_row'] ) ? absint( $_POST['in_sub_row'] ) : '',
 				'in_column'  => isset( $_POST['in_column'] ) ? absint( $_POST['in_column'] ) : '',
 				'in_group'   => isset( $_POST['in_group'] ) ? absint( $_POST['in_group'] ) : '',

From d5a6cc8674eca49e59fb7ab70ef586ab7a7f18f6 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 21:29:41 +0300
Subject: [PATCH 32/37] - review `make()`;

---
 includes/core/class-query.php | 52 +++++++++++++++--------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/includes/core/class-query.php b/includes/core/class-query.php
index 9f795db3..9d7b0381 100644
--- a/includes/core/class-query.php
+++ b/includes/core/class-query.php
@@ -1,25 +1,23 @@
 <?php
 namespace um\core;
 
-// Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\Query' ) ) {
 
-
 	/**
 	 * Class Query
 	 * @package um\core
 	 */
 	class Query {
 
-
 		/**
 		 * @var array
 		 */
 		public $wp_pages = array();
 
-
 		/**
 		 * @var array
 		 */
@@ -74,7 +72,7 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 		 *
 		 * @return array|string
 		 */
-		function wp_pages() {
+		public function wp_pages() {
 			global $wpdb;
 
 			if( isset( $this->wp_pages ) && ! empty( $this->wp_pages ) ){
@@ -107,13 +105,12 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 			return $array;
 		}
 
-
 		/**
 		 * Get all forms
 		 *
 		 * @return mixed
 		 */
-		function forms() {
+		public function forms() {
 			$results = array();
 
 			$args = array(
@@ -130,16 +127,14 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 			return $results;
 		}
 
-
 		/**
 		 * Do custom queries
 		 *
-		 * @param $args
+		 * @param array $args
 		 *
 		 * @return array|bool|int|\WP_Query
 		 */
 		public function make( $args ) {
-
 			$defaults = array(
 				'post_type'   => 'post',
 				'post_status' => array( 'publish' ),
@@ -150,40 +145,37 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 				return false;
 			}
 
-			if ( 'comment' === $args['post_type'] ) { // comments
-
+			if ( 'comment' === $args['post_type'] ) {
+				// Comments query.
 				unset( $args['post_type'] );
-
 				/**
-				 * Filters extend excluded comment types
+				 * Filters excluded comment types.
 				 *
-				 * @since 2.0
+				 * @since 1.3.x
 				 * @hook  um_excluded_comment_types
 				 *
-				 * @param {array}  $types  Comment Types.
+				 * @param {array} $types Comment Types.
 				 *
-				 * @return {array} $types Comment Types.
+				 * @return {array} Comment Types.
 				 *
 				 * @example <caption>Extend excluded comment types.</caption>
 				 * function my_excluded_comment_types( $types ) {
 				 *     // your code here
 				 *     return $types;
 				 * }
-				 * add_filter( 'um_excluded_comment_types', 'my_excluded_comment_types', 10, 1 );
+				 * add_filter( 'um_excluded_comment_types', 'my_excluded_comment_types' );
 				 */
 				$args['type__not_in'] = apply_filters( 'um_excluded_comment_types', array( '' ) );
 
-				$comments = get_comments( $args );
-				return $comments;
-
-			} else {
-				$custom_posts        = new \WP_Query();
-				$args['post_status'] = is_array( $args['post_status'] ) ? $args['post_status'] : explode( ',', $args['post_status'] );
-
-				$custom_posts->query( $args );
-
-				return $custom_posts;
+				return get_comments( $args );
 			}
+
+			$custom_posts        = new \WP_Query();
+			$args['post_status'] = is_array( $args['post_status'] ) ? $args['post_status'] : explode( ',', $args['post_status'] );
+
+			$custom_posts->query( $args );
+
+			return $custom_posts;
 		}
 
 
@@ -194,7 +186,7 @@ if ( ! class_exists( 'um\core\Query' ) ) {
 		 *
 		 * @return array
 		 */
-		function get_recent_users($number = 5){
+		function get_recent_users( $number = 5 ) {
 			$args = array( 'fields' => 'ID', 'number' => $number, 'orderby' => 'user_registered', 'order' => 'desc' );
 
 			$users = new \WP_User_Query( $args );

From 435592771c524737f11d6c1b757840604e0f6b28 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Mon, 26 Jun 2023 23:51:02 +0300
Subject: [PATCH 33/37] - review `new_row_output()`;

---
 includes/core/class-fields.php | 133 ++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 67 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index a4b91554..40106726 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -4720,109 +4720,108 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			return $output;
 		}
 
-
 		/**
-		 * Get new row in form
+		 * Get new row in form.
 		 *
-		 * @param  string $row_id
-		 * @param  array  $row_array
+		 * @param string $row_id
+		 * @param array  $row_array
 		 *
 		 * @return string
 		 */
 		public function new_row_output( $row_id, $row_array ) {
-			$output = null;
+			$output = '';
 
-			$padding      = ( isset( $row_array['padding'] ) ) ? $row_array['padding'] : '';
-			$margin       = ( isset( $row_array['margin'] ) ) ? $row_array['margin'] : '';
-			$background   = ( isset( $row_array['background'] ) ) ? $row_array['background'] : '';
-			$text_color   = ( isset( $row_array['text_color'] ) ) ? $row_array['text_color'] : '';
-			$borderradius = ( isset( $row_array['borderradius'] ) ) ? $row_array['borderradius'] : '';
-			$border       = ( isset( $row_array['border'] ) ) ? $row_array['border'] : '';
-			$bordercolor  = ( isset( $row_array['bordercolor'] ) ) ? $row_array['bordercolor'] : '';
-			$borderstyle  = ( isset( $row_array['borderstyle'] ) ) ? $row_array['borderstyle'] : '';
-			$heading      = ( isset( $row_array['heading'] ) ) ? $row_array['heading'] : '';
-			$css_class    = ( isset( $row_array['css_class'] ) ) ? $row_array['css_class'] : '';
+			$background   = array_key_exists( 'background', $row_array ) ? $row_array['background'] : '';
+			$text_color   = array_key_exists( 'text_color', $row_array ) ? $row_array['text_color'] : '';
+			$padding      = array_key_exists( 'padding', $row_array ) ? $row_array['padding'] : '';
+			$margin       = array_key_exists( 'margin', $row_array ) ? $row_array['margin'] : '';
+			$border       = array_key_exists( 'border', $row_array ) ? $row_array['border'] : '';
+			$borderradius = array_key_exists( 'borderradius', $row_array ) ? $row_array['borderradius'] : '';
+			$borderstyle  = array_key_exists( 'borderstyle', $row_array ) ? $row_array['borderstyle'] : '';
+			$bordercolor  = array_key_exists( 'bordercolor', $row_array ) ? $row_array['bordercolor'] : '';
+			$heading      = ! empty( $row_array['heading'] );
+			$css_class    = array_key_exists( 'css_class', $row_array ) ? $row_array['css_class'] : '';
 
-			$css_padding                  = '';
-			$css_margin                   = '';
-			$css_background               = '';
-			$css_borderradius             = '';
-			$css_border                   = '';
-			$css_bordercolor              = '';
-			$css_borderstyle              = '';
-			$css_heading_background_color = '';
-			$css_heading_padding          = '';
-			$css_heading_text_color       = '';
-			$css_heading_borderradius     = '';
-			$css_text_color               = '';
+			$css_borderradius = '';
 
-			// row css rules
-			if ( $padding ) {
-				$css_padding = 'padding: ' . $padding . ';';
-			}
-			if ( $margin ) {
-				$css_margin = 'margin: ' . $margin . ';';
-			} else {
-				$css_margin = 'margin: 0 0 30px 0;';
+			// Row CSS rules.
+			$css_background = '';
+			if ( ! empty( $background ) ) {
+				$css_background = 'background-color: ' . esc_attr( $background ) . ';';
 			}
 
-			if ( $background ) {
-				$css_background = 'background-color: ' . $background . ';';
-			}
-			if ( $borderradius ) {
-				$css_borderradius = 'border-radius: 0px 0px ' . $borderradius . ' ' . $borderradius . ';';
-			}
-			if ( $border ) {
-				$css_border = 'border-width: ' . $border . ';';
-			}
-			if ( $bordercolor ) {
-				$css_bordercolor = 'border-color: ' . $bordercolor . ';';
-			}
-			if ( $borderstyle ) {
-				$css_borderstyle = 'border-style: ' . $borderstyle . ';';
-			}
-			if ( $text_color ) {
-				$css_text_color = 'color: ' . $text_color . ' !important;';
+			$css_text_color = '';
+			if ( ! empty( $text_color ) ) {
+				$css_text_color = 'color: ' . esc_attr( $text_color ) . ' !important;';
 				$css_class     .= ' um-customized-row';
 			}
 
-			// show the heading
-			if ( $heading ) {
+			$css_padding = '';
+			if ( ! empty( $padding ) ) {
+				$css_padding = 'padding: ' . esc_attr( $padding ) . ';';
+			}
 
+			$css_margin = 'margin: 0 0 30px 0;';
+			if ( ! empty( $margin ) ) {
+				$css_margin = 'margin: ' . esc_attr( $margin ) . ';';
+			}
+
+			$css_border = '';
+			if ( ! empty( $border ) ) {
+				$css_border = 'border-width: ' . esc_attr( $border ) . ';';
+			}
+
+			$css_borderstyle = '';
+			if ( ! empty( $borderstyle ) ) {
+				$css_borderstyle = 'border-style: ' . esc_attr( $borderstyle ) . ';';
+			}
+
+			$css_bordercolor = '';
+			if ( ! empty( $bordercolor ) ) {
+				$css_bordercolor = 'border-color: ' . esc_attr( $bordercolor ) . ';';
+			}
+
+			// Show the heading.
+			if ( $heading ) {
+				if ( ! empty( $borderradius ) ) {
+					$css_borderradius = 'border-radius: 0px 0px ' . esc_attr( $borderradius ) . ' ' . esc_attr( $borderradius ) . ';';
+				}
+
+				$css_heading_background_color = '';
+				$css_heading_padding          = '';
 				if ( ! empty( $row_array['heading_background_color'] ) ) {
 					$css_heading_background_color = 'background-color: ' . $row_array['heading_background_color'] . ';';
 					$css_heading_padding          = 'padding: 10px 15px;';
 				}
 
-				$css_heading_borderradius = empty( $borderradius ) ? '' : "border-radius: $borderradius $borderradius 0px 0px;";
+				$css_heading_borderradius = ! empty( $borderradius ) ? 'border-radius: ' . esc_attr( $borderradius ) . ' ' . esc_attr( $borderradius ) . ' 0px 0px;' : '';
 				$css_heading_border       = $css_border . $css_borderstyle . $css_bordercolor . $css_heading_borderradius . 'border-bottom-width: 0px;';
 				$css_heading_margin       = $css_margin . 'margin-bottom: 0px;';
-				$css_heading_text_color   = empty( $row_array['heading_text_color'] ) ? '' : 'color: ' . $row_array['heading_text_color'] . ';';
-				$css_icon_color           = empty( $row_array['icon_color'] ) ? '' : 'color: ' . $row_array['icon_color'] . ';';
+				$css_heading_text_color   = ! empty( $row_array['heading_text_color'] ) ? 'color: ' . esc_attr( $row_array['heading_text_color'] ) . ';' : '';
 
-				$output .= '<div class="um-row-heading" style="' . $css_heading_margin . $css_heading_padding . $css_heading_border . $css_heading_background_color . $css_heading_text_color . '">';
+				$output .= '<div class="um-row-heading" style="' . esc_attr( $css_heading_margin . $css_heading_padding . $css_heading_border . $css_heading_background_color . $css_heading_text_color ) . '">';
 
 				if ( ! empty( $row_array['icon'] ) ) {
-					$output .= '<span class="um-row-heading-icon" style="' . $css_icon_color . '"><i class="' . $row_array['icon'] . '"></i></span>';
+					$css_icon_color = ! empty( $row_array['icon_color'] ) ? 'color: ' . esc_attr( $row_array['icon_color'] ) . ';' : '';
+					$output        .= '<span class="um-row-heading-icon" style="' . esc_attr( $css_icon_color ) . '"><i class="' . esc_attr( $row_array['icon'] ) . '"></i></span>';
 				}
+
 				if ( ! empty( $row_array['heading_text'] ) ) {
-					$output .= htmlspecialchars( $row_array['heading_text'] );
+					$output .= esc_html( $row_array['heading_text'] );
 				}
 
 				$output .= '</div>';
 
 				$css_border .= 'border-top-width: 0px;';
 				$css_margin .= 'margin-top: 0px;';
-
 			} else {
-
-				// no heading
-				$css_borderradius = empty( $borderradius ) ? '' : "border-radius: $borderradius;";
-
+				// No heading.
+				if ( ! empty( $borderradius ) ) {
+					$css_borderradius = 'border-radius: ' . esc_attr( $borderradius ) . ';';
+				}
 			}
 
-			$output .= '<div class="um-row ' . $row_id . ' ' . $css_class . '" style="' . $css_padding . $css_background . $css_margin . $css_border . $css_borderstyle . $css_bordercolor . $css_borderradius . $css_text_color . '">';
-
+			$output .= '<div class="um-row ' . esc_attr( $row_id . ' ' . $css_class ) . '" style="' . esc_attr( $css_padding . $css_background . $css_margin . $css_border . $css_borderstyle . $css_bordercolor . $css_borderradius . $css_text_color ) . '">';
 			return $output;
 		}
 

From 06cd68eabf61ed49040748443cb590e24a2d9b11 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Tue, 27 Jun 2023 01:34:16 +0300
Subject: [PATCH 34/37] - review `view_field()`; - hookdocs for
 `um_change_role_data` hook; - fixed notice in `role_data()` - fixed notice in
 `edit_field()` - fixed notice in `is_selected()`

---
 includes/core/class-fields.php             | 261 +++++++++++----------
 includes/core/class-roles-capabilities.php |  52 ++--
 2 files changed, 174 insertions(+), 139 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 40106726..cfed96a9 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -1026,7 +1026,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				$value = '';
 			}
 
-
 			/**
 			 * UM hook
 			 *
@@ -1044,19 +1043,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			return apply_filters( 'um_field_value', $value, $default, $key, $type, $data );
 		}
 
-
 		/**
-		 * Checks if an option is selected
+		 * Checks if an option is selected.
 		 *
 		 * is used by Select, Multiselect and Checkbox fields
 		 *
-		 * @param  string $key
-		 * @param  string $value
-		 * @param  array  $data
+		 * @param string $key
+		 * @param string $value
+		 * @param array  $data
 		 *
 		 * @return boolean
 		 */
-		function is_selected( $key, $value, $data ) {
+		public function is_selected( $key, $value, $data ) {
 			global $wpdb;
 
 			/**
@@ -1116,19 +1114,19 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$value = (int) $value;
 				}
 
-				if ( strstr( $key, 'role_' ) || $key == 'role' ) {
-					$field_value = strtolower( UM()->roles()->get_editable_priority_user_role( um_user( 'ID' ) ) );
-
+				if ( strstr( $key, 'role_' ) || 'role' === $key ) {
 					$role_keys = get_option( 'um_roles', array() );
-
 					if ( ! empty( $role_keys ) ) {
-						if ( in_array( $field_value, $role_keys ) ) {
-							$field_value = 'um_' . $field_value;
+						$field_value = UM()->roles()->get_editable_priority_user_role( um_user( 'ID' ) );
+						if ( ! empty( $field_value ) ) {
+							$field_value = strtolower( $field_value );
+							if ( in_array( $field_value, $role_keys, true ) ) {
+								$field_value = 'um_' . $field_value;
+							}
 						}
 					}
 				}
 
-
 				/**
 				 * UM hook
 				 *
@@ -1242,7 +1240,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			return false;
 		}
 
-
 		/**
 		 * Checks if a radio button is selected
 		 *
@@ -3701,47 +3698,50 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Checkbox */
 				case 'checkbox':
-					if ( isset( $options ) ) {
-						/**
-						 * Filters extend checkbox options.
-						 *
-						 * @since 2.0
-						 * @hook  um_checkbox_field_options
-						 *
-						 * @param {array}   $options  Checkbox Options.
-						 * @param {array}   $data     Field Data.
-						 *
-						 * @return {array}  $options  Checkbox Options.
-						 *
-						 * @example <caption>Extend checkbox options.</caption>
-						 * function um_checkbox_field_options( $options, $data ) {
-						 *     // your code here
-						 *     return $options;
-						 * }
-						 * add_filter( 'um_checkbox_field_options', 'um_checkbox_field_options', 10, 2 );
-						 */
-						$options = apply_filters( 'um_checkbox_field_options', $options, $data );
-
-						/**
-						 * Filters extend checkbox options by field $key.
-						 *
-						 * @since 2.0
-						 * @hook  um_checkbox_field_options_{$key}
-						 *
-						 * @param {array}   $options  Checkbox Options.
-						 *
-						 * @return {array}  $options  Checkbox Options.
-						 *
-						 * @example <caption>Extend checkbox options.</caption>
-						 * function my_checkbox_options( $options ) {
-						 *     // your code here
-						 *     return $options;
-						 * }
-						 * add_filter( 'um_checkbox_field_options_{$key}', 'my_checkbox_options', 10, 1 );
-						 */
-						$options = apply_filters( "um_checkbox_field_options_{$key}", $options );
+					$options = array();
+					if ( isset( $data['options'] ) && is_array( $data['options'] ) ) {
+						$options = $data['options'];
 					}
 
+					/**
+					 * Filters extend checkbox options.
+					 *
+					 * @since 2.0
+					 * @hook  um_checkbox_field_options
+					 *
+					 * @param {array}   $options  Checkbox Options.
+					 * @param {array}   $data     Field Data.
+					 *
+					 * @return {array}  $options  Checkbox Options.
+					 *
+					 * @example <caption>Extend checkbox options.</caption>
+					 * function um_checkbox_field_options( $options, $data ) {
+					 *     // your code here
+					 *     return $options;
+					 * }
+					 * add_filter( 'um_checkbox_field_options', 'um_checkbox_field_options', 10, 2 );
+					 */
+					$options = apply_filters( 'um_checkbox_field_options', $options, $data );
+
+					/**
+					 * Filters extend checkbox options by field $key.
+					 *
+					 * @since 2.0
+					 * @hook  um_checkbox_field_options_{$key}
+					 *
+					 * @param {array}   $options  Checkbox Options.
+					 *
+					 * @return {array}  $options  Checkbox Options.
+					 *
+					 * @example <caption>Extend checkbox options.</caption>
+					 * function my_checkbox_options( $options ) {
+					 *     // your code here
+					 *     return $options;
+					 * }
+					 * add_filter( 'um_checkbox_field_options_{$key}', 'my_checkbox_options', 10, 1 );
+					 */
+					$options = apply_filters( "um_checkbox_field_options_{$key}", $options );
+
 					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
@@ -4242,13 +4242,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		public function view_field( $key, $data, $rule = false ) {
 			$output = '';
 
-			// get whole field data
+			// Get whole field data.
 			if ( is_array( $data ) ) {
 				$data = $this->get_field( $key );
 			}
 
 			//hide if empty type
-			if ( ! isset( $data['type'] ) ) {
+			if ( ! array_key_exists( 'type', $data ) || empty( $data['type'] ) ) {
 				return '';
 			}
 			$type = $data['type'];
@@ -4257,15 +4257,22 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				return '';
 			}
 
-			//invisible on profile page
-			if ( 'edit' === $data['visibility'] || 'password' === $type ) {
+			// Invisible on profile page.
+			if ( 'password' === $type || ( array_key_exists( 'visibility', $data ) && 'edit' === $data['visibility'] ) ) {
 				return '';
 			}
 
-			//hide if empty
+			// Disable these fields in profile view only.
+			if ( 'user_password' === $key && 'profile' === $this->set_mode ) {
+				return '';
+			}
+
+			$default = array_key_exists( 'default', $data ) ? $data['default'] : false;
+
+			// Hide if empty.
 			$fields_without_metakey = UM()->builtin()->get_fields_without_metakey();
 			if ( ! in_array( $type, $fields_without_metakey, true ) ) {
-				$_field_value = $this->field_value( $key, $data['classes'], $data );
+				$_field_value = $this->field_value( $key, $default, $data );
 
 				if ( ! isset( $_field_value ) || '' === $_field_value ) {
 					return '';
@@ -4276,30 +4283,27 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				return '';
 			}
 
-			// disable these fields in profile view only
-			if ( in_array( $key, array( 'user_password' ), true ) && 'profile' === $this->set_mode ) {
-				return '';
-			}
-
 			if ( ! um_field_conditions_are_met( $data ) ) {
 				return '';
 			}
 
-			if ( isset( $data['classes'] ) ) {
+			$classes = '';
+			if ( ! empty( $data['classes'] ) ) {
 				$classes = explode( ' ', $data['classes'] );
 			}
 
-			switch ( $type ) {
+			$conditional = '';
+			if ( ! empty( $data['conditional'] ) ) {
+				$conditional = $data['conditional'];
+			}
 
+			switch ( $type ) {
 				/* Default */
 				default:
-					$_field_value = $this->field_value( $key, $data['default'], $data );
+					$_field_value = $this->field_value( $key, $default, $data );
 
-					if ( ! in_array( $type, $fields_without_metakey, true ) && ( ! isset( $_field_value ) || '' === $_field_value ) ) {
-						$output = '';
-					} else {
-
-						$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					if ( ( isset( $_field_value ) && '' !== $_field_value ) || in_array( $type, $fields_without_metakey, true ) ) {
+						$output .= '<div ' . esc_html( $this->get_atts( $key, $classes, $conditional, $data ) ) . '>';
 
 						if ( isset( $data['label'] ) || ! empty( $data['icon'] ) ) {
 
@@ -4310,8 +4314,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= $this->field_label( $data['label'], $key, $data );
 						}
 
-						$res = $this->field_value( $key, $data['default'], $data );
-
+						$res = $_field_value;
 						if ( ! empty( $res ) ) {
 							$res = stripslashes( $res );
 						}
@@ -4326,19 +4329,20 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						$data['is_view_field'] = true;
+
 						/**
-						 * Filters change field HTML on view mode
+						 * Filters the inner field HTML on view mode.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_view_field
 						 *
-						 * @param {string}  $output  Field HTML.
-						 * @param {string}  $data    Field Data.
-						 * @param {string}  $type    Field Type.
+						 * @param {string} $output  Field inner HTML.
+						 * @param {array}  $data    Field Data.
+						 * @param {string} $type    Field Type.
 						 *
-						 * @return {array} $output Field HTML.
+						 * @return {string} Field inner HTML.
 						 *
-						 * @example <caption>Change field HTML on view mode.</caption>
+						 * @example <caption>Change field's inner HTML on view mode.</caption>
 						 * function my_view_field( $output, $data, $type ) {
 						 *     // your code here
 						 *     return $output;
@@ -4346,17 +4350,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						 * add_filter( 'um_view_field', 'my_view_field', 10, 3 );
 						 */
 						$res = apply_filters( 'um_view_field', $res, $data, $type );
-
 						/**
-						 * Filters field HTML on view mode by field type
+						 * Filters the inner field HTML on view mode by field type {$type}.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_view_field_value_{$type}
 						 *
-						 * @param {string}  $output  Field HTML.
-						 * @param {string}  $data    Field Data.
+						 * @param {string} $output Field inner HTML.
+						 * @param {array}  $data   Field Data.
 						 *
-						 * @return {array} $output Field HTML.
+						 * @return {string} Field inner HTML.
 						 *
 						 * @example <caption>Change field HTML on view mode by field type.</caption>
 						 * function my_view_field( $output, $data ) {
@@ -4384,79 +4387,92 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 
 					break;
-
 					/* HTML */
 				case 'block':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $data['content'] . '</div>';
+					$content = array_key_exists( 'content', $data ) ? $data['content'] : '';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
-
 					/* Shortcode */
 				case 'shortcode':
-					$content = str_replace( '{profile_id}', um_profile_id(), $data['content'] );
-					if ( version_compare( get_bloginfo( 'version' ), '5.4', '<' ) ) {
-						$content = do_shortcode( $content );
-					} else {
-						$content = apply_shortcodes( $content );
-					}
+					$content = array_key_exists( 'content', $data ) ? $data['content'] : '';
+					$content = str_replace( '{profile_id}', um_profile_id(), $content );
+					$content = apply_shortcodes( $content );
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $content . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
-
 					/* Gap/Space */
 				case 'spacing':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'height' => $data['spacing'] ) ) . '></div>';
+					$field_style = array();
+					if ( array_key_exists( 'spacing', $data ) ) {
+						$field_style = array( 'height' => $data['spacing'] );
+					}
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, $field_style ) . '></div>';
 					break;
-
 					/* A line divider */
 				case 'divider':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'border-bottom' => $data['borderwidth'] . 'px ' . $data['borderstyle'] . ' ' . $data['bordercolor'] ) ) . '>';
-					if ( $data['divider_text'] ) {
+					$border_style = '';
+					if ( array_key_exists( 'borderwidth', $data ) ) {
+						$border_style .= $data['borderwidth'] . 'px';
+					}
+					if ( array_key_exists( 'borderstyle', $data ) ) {
+						$border_style .= ' ' . $data['borderstyle'];
+					}
+					if ( array_key_exists( 'bordercolor', $data ) ) {
+						$border_style .= ' ' . $data['bordercolor'];
+					}
+					$field_style = array();
+					if ( ! empty( $border_style ) ) {
+						$field_style = array( 'border-bottom' => $border_style );
+					}
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, $field_style ) . '>';
+					if ( ! empty( $data['divider_text'] ) ) {
 						$output .= '<div class="um-field-divider-text"><span>' . $data['divider_text'] . '</span></div>';
 					}
 					$output .= '</div>';
 					break;
-
 					/* Rating */
 				case 'rating':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) || ! empty( $data['icon'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
+					$number = 5;
+					if ( array_key_exists( 'number', $data ) && in_array( absint( $data['number'] ), array( 5, 10 ), true ) ) {
+						$number = $data['number'];
+					}
 					ob_start();
 					?>
 
 					<div class="um-field-area">
 						<div class="um-field-value">
 							<div class="um-rating-readonly um-raty" id="<?php echo esc_attr( $key ); ?>"
-								data-key="<?php echo esc_attr( $key ); ?>" data-number="<?php echo esc_attr( $data['number'] ); ?>"
-								data-score="<?php echo $this->field_value( $key, $data['default'], $data ); ?>"></div>
+								data-key="<?php echo esc_attr( $key ); ?>" data-number="<?php echo esc_attr( $number ); ?>"
+								data-score="<?php echo esc_attr( $this->field_value( $key, $default, $data ) ); ?>"></div>
 						</div>
 					</div>
 
 					<?php
 					$output .= ob_get_clean();
 					$output .= '</div>';
-
 					break;
-
 			}
 
-			// Custom filter for field output
+			// Custom filter for field output.
 			if ( isset( $this->set_mode ) ) {
 				/**
-				 * Filters field HTML by field $key
+				 * Filters outer field HTML by field $key.
 				 *
-				 * @since 2.0
+				 * @since 1.3.x
 				 * @hook  um_{$key}_form_show_field
 				 *
-				 * @param {string}  $output  Field HTML.
-				 * @param {string}  $mode    Field Mode.
+				 * @param {string} $output Field outer HTML.
+				 * @param {string} $mode   Field Mode.
 				 *
-				 * @return {array} $output Field HTML.
+				 * @return {string} Field outer HTML.
 				 *
-				 * @example <caption>Change field HTML by field $key.</caption>
+				 * @example <caption>Change field outer HTML by field $key.</caption>
 				 * function my_form_show_field( $output, $mode ) {
 				 *     // your code here
 				 *     return $output;
@@ -4464,19 +4480,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				 * add_filter( 'um_{$key}_form_show_field', 'my_form_show_field', 10, 2 );
 				 */
 				$output = apply_filters( "um_{$key}_form_show_field", $output, $this->set_mode );
-
 				/**
-				 * Filters field HTML by field $type
+				 * Filters outer field HTML by field $type.
 				 *
-				 * @since 2.0
+				 * @since 1.3.x
 				 * @hook  um_{$type}_form_show_field
 				 *
-				 * @param {string}  $output  Field HTML.
-				 * @param {string}  $mode    Field Mode.
+				 * @param {string} $output Field outer HTML.
+				 * @param {string} $mode   Field Mode.
 				 *
-				 * @return {array} $output Field HTML.
+				 * @return {string} Field outer HTML.
 				 *
-				 * @example <caption>Change field HTML by field $type.</caption>
+				 * @example <caption>Change field outer HTML by field $type.</caption>
 				 * function my_form_show_field( $output, $mode ) {
 				 *     // your code here
 				 *     return $output;
diff --git a/includes/core/class-roles-capabilities.php b/includes/core/class-roles-capabilities.php
index 9b60c143..6e0cb8a9 100644
--- a/includes/core/class-roles-capabilities.php
+++ b/includes/core/class-roles-capabilities.php
@@ -592,19 +592,24 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
 
 
 		/**
-		 * Get role data
+		 * Get role data.
+		 *
+		 * @param int $role_id Role ID.
 		 *
-		 * @param int $roleID Role ID
 		 * @return array
 		 */
-		function role_data( $roleID ) {
-			if ( strpos( $roleID, 'um_' ) === 0 ) {
-				$roleID = substr( $roleID, 3 );
-				$role_data = get_option( "um_role_{$roleID}_meta", array() );
+		public function role_data( $role_id ) {
+			if ( empty( $role_id ) ) {
+				return array();
+			}
+
+			if ( strpos( $role_id, 'um_' ) === 0 ) {
+				$role_id   = substr( $role_id, 3 );
+				$role_data = get_option( "um_role_{$role_id}_meta", array() );
 			}
 
 			if ( empty( $role_data ) ) {
-				$role_data = get_option( "um_role_{$roleID}_meta", array() );
+				$role_data = get_option( "um_role_{$role_id}_meta", array() );
 			}
 
 			if ( ! $role_data ) {
@@ -612,21 +617,36 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
 			}
 
 			$temp = array();
-			foreach ( $role_data as $key=>$value ) {
+			foreach ( $role_data as $key => $value ) {
 				if ( strpos( $key, '_um_' ) === 0 ) {
-					$key = preg_replace('/_um_/', '', $key, 1);
+					$key = preg_replace( '/_um_/', '', $key, 1 );
 				}
-
-				//$key = str_replace( '_um_', '', $key, $count );
 				$temp[ $key ] = $value;
 			}
-
-			$temp = apply_filters( 'um_change_role_data', $temp, $roleID );
-
-			return $temp;
+			/**
+			 * Filters the Ultimate Member related user role data.
+			 *
+			 * @since 2.0
+			 * @hook  um_change_role_data
+			 *
+			 * @param {array}  $role_data Role data.
+			 * @param {string} $role_id   Role ID.
+			 *
+			 * @return {array} Role data.
+			 *
+			 * @example <caption>Set {some_capability_key} capability for subscriber user role.</caption>
+			 * function my_change_role_data( $role_data, $role_id ) {
+			 *     // your code here
+			 *     if ( 'subscriber' === $role_id ) {
+			 *          $role_data['{some_capability_key}'] = true;
+			 *     }
+			 *     return $role_data;
+			 * }
+			 * add_filter( 'um_change_role_data', 'my_change_role_data', 10, 2 );
+			 */
+			return apply_filters( 'um_change_role_data', $temp, $role_id );
 		}
 
-
 		/**
 		 * Query for UM roles
 		 *

From 190a04c171cfb212dc7a793f0739fbfc47483011 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Tue, 27 Jun 2023 03:15:37 +0300
Subject: [PATCH 35/37] - partially review `edit_field()`;

---
 includes/core/class-fields.php | 245 +++++++++++++++------------------
 1 file changed, 110 insertions(+), 135 deletions(-)

diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index cfed96a9..89a5313d 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -48,7 +48,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 		/**
 		 * @var array
 		 */
-		public $field_icons = array();
+		public $field_icons = '';
 
 		/**
 		 * @var array
@@ -2089,14 +2089,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			return $arr_restricted_fields;
 		}
 
-
 		/**
 		 * Gets a field in 'input mode'
 		 *
 		 * @param string $key
-		 * @param array $data
-		 * @param bool $rule
-		 * @param array $args
+		 * @param array  $data
+		 * @param bool   $rule
+		 * @param array  $args
 		 *
 		 * @return string|null
 		 * @throws \Exception
@@ -2116,11 +2115,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				$_um_profile_id = um_user( 'ID' );
 			}
 
-			if ( ! is_user_logged_in() && isset( $data['is_block'] ) && 1 === (int) $data['is_block'] ) {
+			if ( isset( $data['is_block'] ) && 1 === (int) $data['is_block'] && ! is_user_logged_in() ) {
 				$_um_profile_id = 0;
 			}
 
-			// get whole field data
+			// Get whole field data.
 			if ( isset( $data ) && is_array( $data ) ) {
 				$origin_data = $this->get_field( $key );
 				if ( is_array( $origin_data ) ) {
@@ -2132,6 +2131,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			if ( ! isset( $data['type'] ) ) {
 				return '';
 			}
+			$type = $data['type'];
 
 			if ( isset( $data['in_group'] ) && '' !== $data['in_group'] && 'group' !== $rule ) {
 				return '';
@@ -2151,19 +2151,17 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			}
 
 			// required user permission 'required_perm' - it's field attribute predefined in the field data in code
-			if ( isset( $data['required_perm'] ) ) {
-				if ( ! UM()->roles()->um_user_can( $data['required_perm'] ) ) {
-					return '';
-				}
+			if ( isset( $data['required_perm'] ) && ! UM()->roles()->um_user_can( $data['required_perm'] ) ) {
+				return '';
 			}
 
 			// fields that need to be disabled in edit mode (profile) (email, username, etc.)
 			$arr_restricted_fields = $this->get_restricted_fields_for_edit( $_um_profile_id );
-			if ( in_array( $key, $arr_restricted_fields, true ) && true === $this->editing && 'profile' === $this->set_mode ) {
+			if ( true === $this->editing && 'profile' === $this->set_mode && in_array( $key, $arr_restricted_fields, true ) ) {
 				return '';
 			}
 
-			if ( 'view' === $data['visibility'] && 'register' !== $this->set_mode ) {
+			if ( 'register' !== $this->set_mode && array_key_exists( 'visibility', $data ) && 'view' === $data['visibility'] ) {
 				return '';
 			}
 
@@ -2175,8 +2173,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			// Stop return empty values build field attributes:
 
-			if ( 'view' === $data['visibility'] && 'register' === $this->set_mode ) {
-
+			if ( 'register' === $this->set_mode && array_key_exists( 'visibility', $data ) && 'view' === $data['visibility'] ) {
 				um_fetch_user( get_current_user_id() );
 				if ( ! um_user( 'can_edit_everyone' ) ) {
 					$disabled = ' disabled="disabled" ';
@@ -2199,38 +2196,56 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				}
 			}
 
+			/**
+			 * Filters a field disabled attribute.
+			 *
+			 * @since 2.0
+			 * @hook  um_is_field_disabled
+			 *
+			 * @param {string} $disabled Disable global CSS.
+			 * @param {array}  $data     Field data.
+			 *
+			 * @return {string} Set string to ' disabled="disabled" ' to make a field disabled.
+			 *
+			 * @example <caption>Make a field disabled on the edit mode.</caption>
+			 * function my_is_field_disabled( $disabled, $data ) {
+			 *     $disabled = ' disabled="disabled" ';
+			 *     return $disabled;
+			 * }
+			 * add_filter( 'um_is_field_disabled', 'my_is_field_disabled', 10, 2 );
+			 */
 			$disabled = apply_filters( 'um_is_field_disabled', $disabled, $data );
 
-			if ( ! isset( $data['autocomplete'] ) ) {
-				$autocomplete = 'off';
-			} else {
-				$autocomplete = $data['autocomplete'];
-			}
+			$autocomplete = array_key_exists( 'autocomplete', $data ) ? $data['autocomplete'] : 'off';
 
-			if ( isset( $data['classes'] ) ) {
+			$classes = '';
+			if ( array_key_exists( 'classes', $data ) ) {
 				$classes = explode( ' ', $data['classes'] );
-			} else {
-				$classes = '';
 			}
 
 			um_fetch_user( $_um_profile_id );
 
-			if ( ! isset( $data['type'] ) ) {
-				return '';
+			$input       = array_key_exists( 'input', $data ) ? $data['input'] : 'text';
+			$default     = array_key_exists( 'default', $data ) ? $data['default'] : false;
+			$validate    = array_key_exists( 'validate', $data ) ? $data['validate'] : '';
+			$placeholder = array_key_exists( 'placeholder', $data ) ? $data['placeholder'] : '';
+
+			$conditional = '';
+			if ( ! empty( $data['conditional'] ) ) {
+				$conditional = $data['conditional'];
 			}
-			$type = $data['type'];
 
 			/**
-			 * Filters change field type.
+			 * Filters a field type on the edit mode.
 			 *
-			 * @since 2.0
+			 * @since 1.3.x
 			 * @hook  um_hook_for_field_{$type}
 			 *
 			 * @param {string} $type Field Type.
 			 *
-			 * @return {string} $type Field Type.
+			 * @return {string} Field Type.
 			 *
-			 * @example <caption>Change field type.</caption>
+			 * @example <caption>Change a field type.</caption>
 			 * function my_field_type( $type ) {
 			 *     // your code here
 			 *     return $type;
@@ -2239,13 +2254,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			 */
 			$type = apply_filters( "um_hook_for_field_{$type}", $type );
 			switch ( $type ) {
-
 				case 'textarea':
 				case 'multiselect':
-					$field_id    = $field_name = $key;
-					$field_value = $this->field_value( $key, $data['default'], $data );
+					$field_id    = $key;
+					$field_name  = $key;
+					$field_value = $this->field_value( $key, $default, $data );
 					break;
-
 				case 'select':
 				case 'radio':
 					$form_key = str_replace( array( 'role_select', 'role_radio' ), 'role', $key );
@@ -2262,13 +2276,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			 * @since 2.0.13
 			 * @hook  um_completeness_field_id
 			 *
-			 * @param {int}    $field_id  Field id.
-			 * @param {array}  $data      Field Data.
-			 * @param {array}  $args      Optional field arguments.
+			 * @param {string} $field_id Field id.
+			 * @param {array}  $data     Field Data.
+			 * @param {array}  $args     Optional field arguments.
 			 *
-			 * @return {int} $field_id Field id.
+			 * @return {string} Field id.
 			 *
-			 * @example <caption>Change core id.</caption>
+			 * @example <caption>Change field core id.</caption>
 			 * function function_name( $field_id, $data, $args ) {
 			 *     // your code here
 			 *     return $field_id;
@@ -2282,18 +2296,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Default: Integration */
 				default:
-					$mode = ( isset( $this->set_mode ) ) ? $this->set_mode : 'no_mode';
+					$mode = isset( $this->set_mode ) ? $this->set_mode : 'no_mode';
 
 					/**
 					 * Filters change field html by $mode and field $type
 					 *
-					 * @since 2.0
+					 * @since 1.3.x
 					 * @hook  um_edit_field_{$mode}_{$type}
 					 *
-					 * @param {string} $output  Field HTML.
-					 * @param {array}  $data      Field Data.
+					 * @param {string} $output Field HTML.
+					 * @param {array}  $data   Field Data.
 					 *
-					 * @return {int} $output Field HTML.
+					 * @return {string} Field HTML.
 					 *
 					 * @example <caption>Change field html by $mode and field $type.</caption>
 					 * function my_edit_field_html( $output, $data ) {
@@ -2311,7 +2325,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 				case 'vimeo_video':
 				case 'spotify':
 				case 'soundcloud_track':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2320,14 +2334,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '<div class="um-field-area">';
 
 					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-						$output .= '<div class="um-field-icon"><i class="' . $data['icon'] . '"></i></div>';
+						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 					}
 
 					$field_name  = $key . $form_suffix;
-					$field_value = $this->field_value( $key, $data['default'], $data );
-					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
+					$field_value = $this->field_value( $key, $default, $data );
 
-					$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . esc_html( $disabled ) . ' class="' . esc_html( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2343,47 +2356,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
-				/* Text */
+				/* Text and Tel */
 				case 'text':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
-
-					if ( isset( $data['label'] ) ) {
-						$output .= $this->field_label( $data['label'], $key, $data );
-					}
-
-					$output .= '<div class="um-field-area">';
-
-					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
-						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
-					}
-
-					$field_name  = $key . $form_suffix;
-					$field_value = $this->field_value( $key, $data['default'], $data );
-					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
-
-					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
-
-						</div>';
-
-					if ( ! empty( $disabled ) ) {
-						$output .= $this->disabled_hidden_field( $field_name, $field_value );
-					}
-
-					if ( $this->is_error( $key ) ) {
-						$output .= $this->field_error( $this->show_error( $key ) );
-					} elseif ( $this->is_notice( $key ) ) {
-						$output .= $this->field_notice( $this->show_notice( $key ) );
-					}
-
-					$output .= '</div>';
-					break;
-
-				/* Tel */
 				case 'tel':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2392,16 +2368,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '<div class="um-field-area">';
 
 					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 					}
 
 					$field_name  = $key . $form_suffix;
-					$field_value = $this->field_value( $key, $data['default'], $data );
-					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
+					$field_value = $this->field_value( $key, $default, $data );
 
-					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . esc_html( $disabled ) . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2417,10 +2390,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Number */
 				case 'number':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2429,9 +2401,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '<div class="um-field-area">';
 
 					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 					}
 
 					$number_limit = '';
@@ -2442,10 +2412,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$number_limit .= ' max="' . esc_attr( $data['max'] ) . '" ';
 					}
 
-					$field_value = $this->field_value( $key, $data['default'], $data );
-					$field_value = ! is_null( $field_value ) ? htmlspecialchars( $field_value ) : null;
+					$field_name  = $key . $form_suffix;
+					$field_value = $this->field_value( $key, $default, $data );
 
-					$output .= '<input ' . $disabled . ' class="' . $this->get_class( $key, $data ) . '" type="number" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" ' . $number_limit . ' />
+					$output .= '<input ' . esc_html( $disabled ) . ' class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="number" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" ' . esc_html( $number_limit ) . ' />
 
 						</div>';
 
@@ -2457,7 +2427,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Password */
 				case 'password':
 					$original_key = $key;
@@ -2466,21 +2435,21 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$key = $original_key;
 
-						$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 						if ( isset( $data['label'] ) ) {
 							$output .= $this->field_label( $data['label'], $key, $data );
 						}
 
+						$field_name = $key . $form_suffix;
+
 						$output .= '<div class="um-field-area">';
 
 						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 						}
 
-						$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
+						$output .= '<input class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 							</div>';
 
@@ -2491,13 +2460,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						$output .= '</div>';
-
 					} else {
-
 						if ( UM()->account()->current_password_is_required( 'password' ) && ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
 
 							$key     = 'current_' . $original_key;
-							$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+							$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 							if ( isset( $data['label'] ) ) {
 								$output .= $this->field_label( __( 'Current Password', 'ultimate-member' ), $key, $data );
@@ -2506,9 +2473,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= '<div class="um-field-area">';
 
 							if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 							}
 
 							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
@@ -2527,7 +2492,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$key = $original_key;
 
-						$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 						if ( 'account' === $this->set_mode && um_is_core_page( 'account' ) || 'password' === $this->set_mode && um_is_core_page( 'password-reset' ) ) {
 
@@ -2826,18 +2791,34 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* Gap/Space */
 				case 'spacing':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'height' => $data['spacing'] ) ) . '></div>';
+					$field_style = array();
+					if ( array_key_exists( 'spacing', $data ) ) {
+						$field_style = array( 'height' => $data['spacing'] );
+					}
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, $field_style ) . '></div>';
 					break;
-
 				/* A line divider */
 				case 'divider':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data, array( 'border-bottom' => $data['borderwidth'] . 'px ' . $data['borderstyle'] . ' ' . $data['bordercolor'] ) ) . '>';
-					if ( $data['divider_text'] ) {
+					$border_style = '';
+					if ( array_key_exists( 'borderwidth', $data ) ) {
+						$border_style .= $data['borderwidth'] . 'px';
+					}
+					if ( array_key_exists( 'borderstyle', $data ) ) {
+						$border_style .= ' ' . $data['borderstyle'];
+					}
+					if ( array_key_exists( 'bordercolor', $data ) ) {
+						$border_style .= ' ' . $data['bordercolor'];
+					}
+					$field_style = array();
+					if ( ! empty( $border_style ) ) {
+						$field_style = array( 'border-bottom' => $border_style );
+					}
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, $field_style ) . '>';
+					if ( ! empty( $data['divider_text'] ) ) {
 						$output .= '<div class="um-field-divider-text"><span>' . esc_html( $data['divider_text'] ) . '</span></div>';
 					}
 					$output .= '</div>';
 					break;
-
 				/* Single Image Upload */
 				case 'image':
 					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
@@ -3841,21 +3822,17 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 				/* HTML */
 				case 'block':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $data['content'] . '</div>';
+					$content = array_key_exists( 'content', $data ) ? $data['content'] : '';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
-
 				/* Shortcode */
 				case 'shortcode':
-					$content = str_replace( '{profile_id}', um_profile_id(), $data['content'] );
-					if ( version_compare( get_bloginfo( 'version' ), '5.4', '<' ) ) {
-						$content = do_shortcode( $content );
-					} else {
-						$content = apply_shortcodes( $content );
-					}
+					$content = array_key_exists( 'content', $data ) ? $data['content'] : '';
+					$content = str_replace( '{profile_id}', um_profile_id(), $content );
+					$content = apply_shortcodes( $content );
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>' . $content . '</div>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
-
 				/* Unlimited Group */
 				case 'group':
 					$fields = $this->get_fields_in_group( $key );
@@ -3873,23 +3850,21 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$output .= '</div>';
 
 					}
-
 					break;
-
 			}
 
-			// Custom filter for field output
+			// Custom filter for field output.
 			if ( isset( $this->set_mode ) ) {
 				/**
 				 * Filters change field HTML on edit mode by field $key.
 				 *
-				 * @since 2.0
-				 * @hook  my_form_edit_field
+				 * @since 1.3.x
+				 * @hook  um_{$key}_form_edit_field
 				 *
-				 * @param {array}   $output   Field HTML.
-				 * @param {array}   $mode     Field Mode.
+				 * @param {string} $output Field HTML.
+				 * @param {string} $mode   Field Mode.
 				 *
-				 * @return {array}  $output  Field HTML.
+				 * @return {string} Field HTML.
 				 *
 				 * @example <caption>Change field HTML.</caption>
 				 * function um_checkbox_field_options( $output, $mode ) {
@@ -4426,7 +4401,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data, $field_style ) . '>';
 					if ( ! empty( $data['divider_text'] ) ) {
-						$output .= '<div class="um-field-divider-text"><span>' . $data['divider_text'] . '</span></div>';
+						$output .= '<div class="um-field-divider-text"><span>' . esc_html( $data['divider_text'] ) . '</span></div>';
 					}
 					$output .= '</div>';
 					break;

From 6f9109adca417cd92e8dfc5a30b388b80c8990e3 Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Wed, 28 Jun 2023 20:56:09 +0300
Subject: [PATCH 36/37] - review `edit_field()`;

---
 includes/class-functions.php       |  18 +-
 includes/core/class-fields.php     | 566 +++++++++++++----------------
 includes/core/class-shortcodes.php |  17 +-
 includes/core/um-actions-form.php  |  19 +-
 4 files changed, 296 insertions(+), 324 deletions(-)

diff --git a/includes/class-functions.php b/includes/class-functions.php
index 2399bf0b..0a1aed80 100644
--- a/includes/class-functions.php
+++ b/includes/class-functions.php
@@ -171,14 +171,23 @@ if ( ! class_exists( 'UM_Functions' ) ) {
 		 *
 		 * @return string|void
 		 */
-		function get_template( $template_name, $basename = '', $t_args = array(), $echo = false ) {
+		public function get_template( $template_name, $basename = '', $t_args = array(), $echo = false ) {
 			if ( ! empty( $t_args ) && is_array( $t_args ) ) {
-				extract( $t_args );
+				/*
+				 * This use of extract() cannot be removed. There are many possible ways that
+				 * templates could depend on variables that it creates existing, and no way to
+				 * detect and deprecate it.
+				 *
+				 * Passing the EXTR_SKIP flag is the safest option, ensuring globals and
+				 * function variables cannot be overwritten.
+				 */
+				// phpcs:ignore WordPress.PHP.DontExtract.extract_extract
+				extract( $t_args, EXTR_SKIP );
 			}
 
 			$path = '';
 			if ( $basename ) {
-				// use '/' instead of "DIRECTORY_SEPARATOR", because wp_normalize_path makes the correct replace
+				// use '/' instead of "DIRECTORY_SEPARATOR", because wp_normalize_path makes the correct replacement
 				$array = explode( '/', wp_normalize_path( trim( $basename ) ) );
 				$path  = $array[0];
 			}
@@ -189,7 +198,6 @@ if ( ! class_exists( 'UM_Functions' ) ) {
 				return;
 			}
 
-
 			/**
 			 * UM hook
 			 *
@@ -240,7 +248,7 @@ if ( ! class_exists( 'UM_Functions' ) ) {
 			 * ?>
 			 */
 			do_action( 'um_before_template_part', $template_name, $path, $located, $t_args );
-			include( $located );
+			include $located;
 
 			/**
 			 * UM hook
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 89a5313d..ccab2037 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -2293,8 +2293,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 			/* Begin by field type */
 			switch ( $type ) {
-
-				/* Default: Integration */
+				// Default case for integration.
 				default:
 					$mode = isset( $this->set_mode ) ? $this->set_mode : 'no_mode';
 
@@ -2318,7 +2317,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 */
 					$output .= apply_filters( "um_edit_field_{$mode}_{$type}", $output, $data );
 					break;
-
 				/* Other fields */
 				case 'googlemap':
 				case 'youtube_video':
@@ -2340,7 +2338,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$field_name  = $key . $form_suffix;
 					$field_value = $this->field_value( $key, $default, $data );
 
-					$output .= '<input ' . esc_html( $disabled ) . ' class="' . esc_html( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . $disabled . ' class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2374,7 +2372,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$field_name  = $key . $form_suffix;
 					$field_value = $this->field_value( $key, $default, $data );
 
-					$output .= '<input ' . esc_html( $disabled ) . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+					$output .= '<input ' . $disabled . ' autocomplete="' . esc_attr( $autocomplete ) . '" class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2415,7 +2413,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$field_name  = $key . $form_suffix;
 					$field_value = $this->field_value( $key, $default, $data );
 
-					$output .= '<input ' . esc_html( $disabled ) . ' class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="number" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" ' . esc_html( $number_limit ) . ' />
+					$output .= '<input ' . $disabled . ' class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="number" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" ' . $number_limit . ' />
 
 						</div>';
 
@@ -2432,7 +2430,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$original_key = $key;
 
 					if ( 'single_user_password' === $key ) {
-
 						$key = $original_key;
 
 						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
@@ -2441,15 +2438,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= $this->field_label( $data['label'], $key, $data );
 						}
 
-						$field_name = $key . $form_suffix;
-
 						$output .= '<div class="um-field-area">';
 
 						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
 							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 						}
 
-						$output .= '<input class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . $this->field_value( $key, $default, $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
+						$field_name  = $key . $form_suffix;
+						$field_value = $this->field_value( $key, $default, $data );
+
+						$output .= '<input class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 							</div>';
 
@@ -2461,7 +2459,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$output .= '</div>';
 					} else {
-						if ( UM()->account()->current_password_is_required( 'password' ) && ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
+						if ( ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) && UM()->account()->current_password_is_required( 'password' ) ) {
 
 							$key     = 'current_' . $original_key;
 							$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
@@ -2476,7 +2474,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 							}
 
-							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
+							$field_name  = $key . $form_suffix;
+							$field_value = $this->field_value( $key, $default, $data );
+
+							$output .= '<input class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 								</div>';
 
@@ -2494,7 +2495,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
-						if ( 'account' === $this->set_mode && um_is_core_page( 'account' ) || 'password' === $this->set_mode && um_is_core_page( 'password-reset' ) ) {
+						if ( ( 'account' === $this->set_mode && um_is_core_page( 'account' ) ) || ( 'password' === $this->set_mode && um_is_core_page( 'password-reset' ) ) ) {
 
 							$output .= $this->field_label( __( 'New Password', 'ultimate-member' ), $key, $data );
 
@@ -2507,9 +2508,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$output .= '<div class="um-field-area">';
 
 						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 							$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 						}
 
 						$name = $key . $form_suffix;
@@ -2517,7 +2516,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$name = $key;
 						}
 
-						$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
+						$field_value = $this->field_value( $key, $default, $data );
+
+						$output .= '<input class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2532,7 +2533,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						if ( 'login' !== $this->set_mode && isset( $data['force_confirm_pass'] ) && 1 === $data['force_confirm_pass'] ) {
 
 							$key     = 'confirm_' . $original_key;
-							$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+							$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 							if ( ! empty( $data['label_confirm_pass'] ) ) {
 								$label_confirm_pass = __( $data['label_confirm_pass'], 'ultimate-member' );
@@ -2546,9 +2547,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$output .= '<div class="um-field-area">';
 
 							if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 								$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 							}
 
 							$name = $key . $form_suffix;
@@ -2556,17 +2555,17 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 								$name = $key;
 							}
 
-							if ( ! empty( $label_confirm_pass ) ) {
-								$placeholder = $label_confirm_pass;
-							} elseif ( ! empty( $data['placeholder'] ) && ! isset( $data['label'] ) ) {
+							if ( ! empty( $data['label_confirm_pass'] ) ) {
+								$placeholder = __( $data['label_confirm_pass'], 'ultimate-member' );;
+							} elseif ( ! empty( $placeholder ) && ! isset( $data['label'] ) ) {
 								/* translators: 1: placeholder. */
-								$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['placeholder'] );
+								$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $placeholder );
 							} elseif ( isset( $data['label'] ) ) {
 								/* translators: 1: label. */
 								$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] );
 							}
 
-							$output .= '<input class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />';
+							$output .= '<input class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $name ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $this->field_value( $key, $default, $data ) ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />';
 
 							$output .= '</div>';
 
@@ -2577,15 +2576,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							}
 
 							$output .= '</div>';
-
 						}
 					}
-
 					break;
-
 				/* URL */
 				case 'url':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2594,12 +2590,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '<div class="um-field-area">';
 
 					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 					}
 
-					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $this->field_value( $key, $data['default'], $data ) ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" />
+					$field_name  = $key . $form_suffix;
+					$field_value = $this->field_value( $key, $default, $data );
+
+					$output .= '<input  ' . $disabled . '  class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" />
 
 						</div>';
 
@@ -2611,10 +2608,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Date */
 				case 'date':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2623,13 +2619,11 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '<div class="um-field-area">';
 
 					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 					}
 
 					// Normalise date format.
-					$value = $this->field_value( $key, $data['default'], $data );
+					$value = $this->field_value( $key, $default, $data );
 					if ( $value ) {
 						// numeric (either unix or YYYYMMDD). ACF uses Ymd format of date inside the meta tables.
 						if ( is_numeric( $value ) && strlen( $value ) !== 8 ) {
@@ -2641,7 +2635,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$value = date( 'Y/m/d', $unixtimestamp );
 					}
 
-					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . esc_attr( $value ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" data-range="' . esc_attr( $data['range'] ) . '" data-years="' . esc_attr( $data['years'] ) . '" data-years_x="' . esc_attr( $data['years_x'] ) . '" data-disabled_weekdays="' . esc_attr( $data['disabled_weekdays'] ) . '" data-date_min="' . esc_attr( $data['date_min'] ) . '" data-date_max="' . esc_attr( $data['date_max'] ) . '" data-format="' . esc_attr( $data['js_format'] ) . '" data-value="' . esc_attr( $value ) . '" />
+					$field_name = $key . $form_suffix;
+
+					$output .= '<input ' . $disabled . '  class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" data-range="' . esc_attr( $data['range'] ) . '" data-years="' . esc_attr( $data['years'] ) . '" data-years_x="' . esc_attr( $data['years_x'] ) . '" data-disabled_weekdays="' . esc_attr( $data['disabled_weekdays'] ) . '" data-date_min="' . esc_attr( $data['date_min'] ) . '" data-date_max="' . esc_attr( $data['date_max'] ) . '" data-format="' . esc_attr( $data['js_format'] ) . '" data-value="' . esc_attr( $value ) . '" />
 
 						</div>';
 
@@ -2653,10 +2649,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Time */
 				case 'time':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2665,12 +2660,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '<div class="um-field-area">';
 
 					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
-
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
-
 					}
 
-					$output .= '<input  ' . $disabled . '  class="' . $this->get_class( $key, $data ) . '" type="' . esc_attr( $data['input'] ) . '" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '"  data-format="' . esc_attr( $data['js_format'] ) . '" data-intervals="' . esc_attr( $data['intervals'] ) . '" data-value="' . $this->field_value( $key, $data['default'], $data ) . '" />
+					$field_name  = $key . $form_suffix;
+					$field_value = $this->field_value( $key, $default, $data );
+
+					$output .= '<input  ' . $disabled . '  class="' . esc_attr( $this->get_class( $key, $data ) ) . '" type="' . esc_attr( $input ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" placeholder="' . esc_attr( $placeholder ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '"  data-format="' . esc_attr( $data['js_format'] ) . '" data-intervals="' . esc_attr( $data['intervals'] ) . '" data-value="' . esc_attr( $field_value ) . '" />
 
 						</div>';
 
@@ -2682,20 +2678,22 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Row */
 				case 'row':
 					$output .= '';
 					break;
-
 				/* Textarea */
 				case 'textarea':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
+					$field_id    = $key;
+					$field_name  = $key;
+					$field_value = $this->field_value( $key, $default, $data );
+
 					$output .= '<div class="um-field-area">';
 
 					if ( isset( $data['html'] ) && 0 !== $data['html'] && 'description' !== $key ) {
@@ -2716,23 +2714,24 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						/**
-						 * Filters change WP Editor options for textarea init.
+						 * Filters WP Editor options for textarea init.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_form_fields_textarea_settings
 						 *
-						 * @param {array}  $textarea_settings  WP Editor settings.
+						 * @param {array} $textarea_settings WP Editor settings.
+						 * @param {array} $data              Field data. Since 2.6.5
 						 *
-						 * @return {array} $textarea_settings  WP Editor settings.
+						 * @return {array} WP Editor settings.
 						 *
 						 * @example <caption>Change WP Editor options.</caption>
-						 * function function_name( $textarea_settings ) {
+						 * function function_name( $textarea_settings, $data ) {
 						 *     // your code here
 						 *     return $textarea_settings;
 						 * }
-						 * add_filter( 'um_form_fields_textarea_settings', 'function_name', 10, 1 );
+						 * add_filter( 'um_form_fields_textarea_settings', 'function_name', 10, 2 );
 						 */
-						$textarea_settings = apply_filters( 'um_form_fields_textarea_settings', $textarea_settings );
+						$textarea_settings = apply_filters( 'um_form_fields_textarea_settings', $textarea_settings, $data );
 
 						// turn on the output buffer
 						ob_start();
@@ -2742,13 +2741,13 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 						// add the contents of the buffer to the output variable
 						$output .= ob_get_clean();
-						$output .= '<br /><span class="description">' . $data['placeholder'] . '</span>';
+						$output .= '<br /><span class="description">' . esc_html( $placeholder ) . '</span>';
 					} else {
 						$textarea_field_value = '';
 						if ( ! empty( $field_value ) ) {
 							$textarea_field_value = ! empty( $data['html'] ) ? $field_value : wp_strip_all_tags( $field_value );
 						}
-						$output .= '<textarea  ' . $disabled . '  style="height: ' . esc_attr( $data['height'] ) . ';" class="' . $this->get_class( $key, $data ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_id ) . '" placeholder="' . esc_attr( $data['placeholder'] ) . '">' . esc_textarea( $textarea_field_value ) . '</textarea>';
+						$output .= '<textarea  ' . $disabled . '  style="height: ' . esc_attr( $data['height'] ) . ';" class="' . esc_attr( $this->get_class( $key, $data ) ) . '" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_id ) . '" placeholder="' . esc_attr( $placeholder ) . '">' . esc_textarea( $textarea_field_value ) . '</textarea>';
 					}
 
 					$output .= '</div>';
@@ -2765,10 +2764,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Rating */
 				case 'rating':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -2776,7 +2774,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '<div class="um-field-area">';
 
-					$output .= '<div class="um-rating um-raty" id="' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" data-number="' . esc_attr( $data['number'] ) . '" data-score="' . $this->field_value( $key, $data['default'], $data ) . '"></div>';
+					$output .= '<div class="um-rating um-raty" id="' . esc_attr( $key ) . '" data-key="' . esc_attr( $key ) . '" data-number="' . esc_attr( $data['number'] ) . '" data-score="' . $this->field_value( $key, $default, $data ) . '"></div>';
 					$output .= '</div>';
 
 					if ( $this->is_error( $key ) ) {
@@ -2788,7 +2786,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '</div>';
 
 					break;
-
 				/* Gap/Space */
 				case 'spacing':
 					$field_style = array();
@@ -2821,53 +2818,56 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					break;
 				/* Single Image Upload */
 				case 'image':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
 					if ( in_array( $key, array( 'profile_photo', 'cover_photo' ), true ) ) {
 						$field_value = '';
 					} else {
-						$field_value = $this->field_value( $key, $data['default'], $data );
+						$field_value = $this->field_value( $key, $default, $data );
 					}
-					$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $field_value . '" />';
+
+					$field_name = $key . $form_suffix;
+
+					$output .= '<input type="hidden" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $field_value ) . '" />';
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
 					}
-					$modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __( 'Upload Photo', 'ultimate-member' );
+					$modal_label = array_key_exists( 'label', $data ) ? $data['label'] : __( 'Upload Photo', 'ultimate-member' );
 					$output     .= '<div class="um-field-area" style="text-align: center;">';
 
 					if ( ! empty( $field_value ) && 'empty_file' !== $field_value ) {
 						if ( ! in_array( $key, array( 'profile_photo', 'cover_photo' ), true ) ) {
-							if ( isset( $this->set_mode ) && 'register' === $this->set_mode ) {
-								$image_info = get_transient( "um_{$field_value}" );
-							} else {
-								$image_info = um_user( $data['metakey'] . '_metadata' );
-							}
+//							if ( isset( $this->set_mode ) && 'register' === $this->set_mode ) {
+//								$image_info = get_transient( "um_{$field_value}" );
+//							} else {
+//								$image_info = um_user( $data['metakey'] . '_metadata' );
+//							}
 
 							if ( ( isset( $this->set_mode ) && 'register' === $this->set_mode ) || file_exists( UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $field_value ) ) {
-								$img_value = UM()->uploader()->get_core_temp_url() . '/' . $this->field_value( $key, $data['default'], $data );
+								$img_value = UM()->uploader()->get_core_temp_url() . '/' . $this->field_value( $key, $default, $data );
 							} else {
 								$img_value = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
 							}
-							$img = '<img src="' . $img_value . '" alt="" />';
+							$img = '<img src="' . esc_attr( $img_value ) . '" alt="" />';
 						} else {
 							$img = '';
 						}
-						$output .= '<div class="um-single-image-preview show ' . $data['crop_class'] . '" data-crop="' . $data['crop_data'] . '" data-key="' . $key . '">';
+						$output .= '<div class="um-single-image-preview show ' . esc_attr( $data['crop_class'] ) . '" data-crop="' . esc_attr( $data['crop_data'] ) . '" data-key="' . esc_attr( $key ) . '">';
 						if ( empty( $disabled ) ) {
 							$output .= '<a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a>';
 						}
 						$output .= $img;
 						$output .= '</div>';
 						if ( empty( $disabled ) ) {
-							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . $data['modal_size'] . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . __( 'Change photo', 'ultimate-member' ) . '</a>';
+							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . esc_attr( $data['modal_size'] ) . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . esc_html__( 'Change photo', 'ultimate-member' ) . '</a>';
 						}
 					} else {
-						$output .= '<div class="um-single-image-preview ' . $data['crop_class'] . '" data-crop="' . $data['crop_data'] . '" data-key="' . $key . '">';
+						$output .= '<div class="um-single-image-preview ' . esc_attr( $data['crop_class'] ) . '" data-crop="' . esc_attr( $data['crop_data'] ) . '" data-key="' . esc_attr( $key ) . '">';
 						if ( empty( $disabled ) ) {
 							$output .= '<a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a>';
 						}
 						$output .= '<img src="" alt="" /><div class="um-clear"></div></div>';
 						if ( empty( $disabled ) ) {
-							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . $data['modal_size'] . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . $data['button_text'] . '</a>';
+							$output .= '<a href="javascript:void(0);" data-modal="um_upload_single" data-modal-size="' . esc_attr( $data['modal_size'] ) . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . esc_html( $data['button_text'] ) . '</a>';
 						}
 					}
 					$output .= '</div>';
@@ -2882,7 +2882,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						$output .= '<div class="um-modal-hidden-content">';
-						$output .= '<div class="um-modal-header"> ' . $modal_label . '</div>';
+						$output .= '<div class="um-modal-header"> ' . esc_html( $modal_label ) . '</div>';
 						$output .= '<div class="um-modal-body">';
 						if ( isset( $this->set_id ) ) {
 							$set_id   = $this->set_id;
@@ -2892,13 +2892,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$set_mode = '';
 						}
 
+						$data_icon = '';
+						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+							$data_icon = ' data-icon="' . esc_attr( $data['icon'] ) . '"';
+						}
+
 						$nonce   = wp_create_nonce( 'um_upload_nonce-' . $this->timestamp );
-						$output .= '<div class="um-single-image-preview ' . $data['crop_class'] . '"  data-crop="' . $data['crop_data'] . '" data-ratio="' . $data['ratio'] . '" data-min_width="' . $data['min_width'] . '" data-min_height="' . $data['min_height'] . '" data-coord=""><a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a><img src="" alt="" /><div class="um-clear"></div></div><div class="um-clear"></div>';
-						$output .= '<div class="um-single-image-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-nonce="' . $nonce . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-icon="' . esc_attr( $data['icon'] ) . '" data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $data['max_size'] ) . '" data-max_size_error="' . esc_attr( $data['max_size_error'] ) . '" data-min_size_error="' . esc_attr( $data['min_size_error'] ) . '" data-extension_error="' . esc_attr( $data['extension_error'] ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $data['upload_text'] ) . '" data-max_files_error="' . esc_attr( $data['max_files_error'] ) . '" data-upload_help_text="' . esc_attr( $data['upload_help_text'] ) . '">' . $data['button_text'] . '</div>';
+						$output .= '<div class="um-single-image-preview ' . esc_attr( $data['crop_class'] ) . '"  data-crop="' . esc_attr( $data['crop_data'] ) . '" data-ratio="' . esc_attr( $data['ratio'] ) . '" data-min_width="' . esc_attr( $data['min_width'] ) . '" data-min_height="' . esc_attr( $data['min_height'] ) . '" data-coord=""><a href="javascript:void(0);" class="cancel"><i class="um-icon-close"></i></a><img src="" alt="" /><div class="um-clear"></div></div><div class="um-clear"></div>';
+						$output .= '<div class="um-single-image-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-nonce="' . esc_attr( $nonce ) . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" ' . $data_icon . ' data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $data['max_size'] ) . '" data-max_size_error="' . esc_attr( $data['max_size_error'] ) . '" data-min_size_error="' . esc_attr( $data['min_size_error'] ) . '" data-extension_error="' . esc_attr( $data['extension_error'] ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $data['upload_text'] ) . '" data-max_files_error="' . esc_attr( $data['max_files_error'] ) . '" data-upload_help_text="' . esc_attr( $data['upload_help_text'] ) . '">' . esc_html( $data['button_text'] ) . '</div>';
 						$output .= '<div class="um-modal-footer">
 									<div class="um-modal-right">
-										<a href="javascript:void(0);" class="um-modal-btn um-finish-upload image disabled" data-key="' . $key . '" data-change="' . __( 'Change photo', 'ultimate-member' ) . '" data-processing="' . __( 'Processing...', 'ultimate-member' ) . '"> ' . __( 'Apply', 'ultimate-member' ) . '</a>
-										<a href="javascript:void(0);" class="um-modal-btn alt" data-action="um_remove_modal"> ' . __( 'Cancel', 'ultimate-member' ) . '</a>
+										<a href="javascript:void(0);" class="um-modal-btn um-finish-upload image disabled" data-key="' . esc_attr( $key ) . '" data-change="' . esc_attr__( 'Change photo', 'ultimate-member' ) . '" data-processing="' . esc_attr__( 'Processing...', 'ultimate-member' ) . '">' . esc_html__( 'Apply', 'ultimate-member' ) . '</a>
+										<a href="javascript:void(0);" class="um-modal-btn alt" data-action="um_remove_modal"> ' . esc_html__( 'Cancel', 'ultimate-member' ) . '</a>
 									</div>
 									<div class="um-clear"></div>
 								</div>';
@@ -2914,19 +2919,20 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '</div>';
 
 					break;
-
 				/* Single File Upload */
 				case 'file':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
-					$output .= '<input type="hidden" name="' . esc_attr( $key . $form_suffix ) . '" id="' . esc_attr( $key . $form_suffix ) . '" value="' . $this->field_value( $key, $data['default'], $data ) . '" />';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">';
+
+					$field_name       = $key . $form_suffix;
+					$file_field_value = $this->field_value( $key, $default, $data );
+
+					$output .= '<input type="hidden" name="' . esc_attr( $field_name ) . '" id="' . esc_attr( $field_name ) . '" value="' . esc_attr( $file_field_value ) . '" />';
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
 					}
-					$modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __( 'Upload File', 'ultimate-member' );
+					$modal_label = array_key_exists( 'label', $data ) ? $data['label'] : __( 'Upload File', 'ultimate-member' );
 					$output     .= '<div class="um-field-area" style="text-align: center;">';
 
-					$file_field_value = $this->field_value( $key, $data['default'], $data );
-
 					if ( ! empty( $file_field_value ) && 'empty_file' !== $file_field_value ) {
 						$file_type = wp_check_filetype( $file_field_value );
 
@@ -2946,36 +2952,39 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$file_dir = UM()->uploader()->get_core_temp_dir() . DIRECTORY_SEPARATOR . $file_field_value;
 						} else {
 							$file_url = UM()->files()->get_download_link( $this->set_id, $key, um_user( 'ID' ) );
-							$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $this->field_value( $key, $data['default'], $data );
+							$file_dir = UM()->uploader()->get_upload_base_dir() . um_user( 'ID' ) . DIRECTORY_SEPARATOR . $file_field_value;
 						}
 
-						//multisite fix for old customers
+						// Multisite fix for old customers.
 						if ( ! file_exists( $file_dir ) && is_multisite() ) {
 							$file_dir = str_replace( DIRECTORY_SEPARATOR . 'sites' . DIRECTORY_SEPARATOR . get_current_blog_id() . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $file_dir );
 						}
 
 						if ( file_exists( $file_dir ) ) {
-							$output .= "<div class=\"um-single-file-preview show\" data-key=\"{$key}\">";
+							$output .= '<div class="um-single-file-preview show" data-key="' . esc_attr( $key ) . '">';
 							if ( empty( $disabled ) ) {
-								$output .= "<a href=\"#\" class=\"cancel\"><i class=\"um-icon-close\"></i></a>";
+								$output .= '<a href="#" class="cancel"><i class="um-icon-close"></i></a>';
 							}
-							$output .= "<div class=\"um-single-fileinfo\">
-											<a href=\"{$file_url}\" target=\"_blank\">
-												<span class=\"icon\" style=\"background:" . UM()->files()->get_fonticon_bg_by_ext( $file_type['ext'] ) . "\"><i class=\"" . UM()->files()->get_fonticon_by_ext( $file_type['ext'] ) . "\"></i></span>
-												<span class=\"filename\">{$file_field_name}</span>
-											</a>
-										</div></div>";
+
+							$fonticon_bg = UM()->files()->get_fonticon_bg_by_ext( $file_type['ext'] );
+							$fonticon    = UM()->files()->get_fonticon_by_ext( $file_type['ext'] );
+
+							$output .= '<div class="um-single-fileinfo">';
+							$output .= '<a href="' . esc_attr( $file_url ) . '" target="_blank">';
+							$output .= '<span class="icon" style="background:' . esc_attr( $fonticon_bg ) . '"><i class="' . esc_attr( $fonticon ) . '"></i></span>';
+							$output .= '<span class="filename">' . esc_html( $file_field_name ) . '</span>';
+							$output .= '</a></div></div>';
 						} else {
-							$output .= "<div class=\"um-single-file-preview show\" data-key=\"{$key}\">" . __('This file has been removed.','ultimate-member') . "</div>";
+							$output .= '<div class="um-single-file-preview show" data-key="' . esc_attr( $key ) . '">' . esc_html__( 'This file has been removed.', 'ultimate-member' ) . '</div>';
 						}
 
 						if ( empty( $disabled ) ) {
-							$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$data['modal_size']}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">" . __( 'Change file', 'ultimate-member' ) . "</a>";
+							$output .= '<a href="#" data-modal="um_upload_single" data-modal-size="' . esc_attr( $data['modal_size'] ) . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . esc_html__( 'Change file', 'ultimate-member' ) . '</a>';
 						}
 					} else {
-						$output .= "<div class=\"um-single-file-preview\" data-key=\"{$key}\"></div>";
+						$output .= '<div class="um-single-file-preview" data-key="' . esc_attr( $key ) . '"></div>';
 						if ( empty( $disabled ) ) {
-							$output .= "<a href=\"#\" data-modal=\"um_upload_single\" data-modal-size=\"{$data['modal_size']}\" data-modal-copy=\"1\" class=\"um-button um-btn-auto-width\">{$data['button_text']}</a>";
+							$output .= '<a href="#" data-modal="um_upload_single" data-modal-size="' . esc_attr( $data['modal_size'] ) . '" data-modal-copy="1" class="um-button um-btn-auto-width">' . esc_html( $data['button_text'] ) . '</a>';
 						}
 					}
 					$output .= '</div>';
@@ -2990,7 +2999,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						}
 
 						$output .= '<div class="um-modal-hidden-content">';
-						$output .= '<div class="um-modal-header"> ' . $modal_label . '</div>';
+						$output .= '<div class="um-modal-header"> ' . esc_html( $modal_label ) . '</div>';
 						$output .= '<div class="um-modal-body">';
 						if ( isset( $this->set_id ) ) {
 							$set_id   = $this->set_id;
@@ -3008,12 +3017,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 											</a>
 										</div>
 								</div>';
+
+						$data_icon = '';
+						if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+							$data_icon = ' data-icon="' . esc_attr( $data['icon'] ) . '"';
+						}
+
 						$nonce   = wp_create_nonce( 'um_upload_nonce-' . $this->timestamp );
-						$output .= '<div class="um-single-file-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-nonce="' . $nonce . '" data-icon="' . esc_attr( $data['icon'] ) . '" data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $data['max_size'] ) . '" data-max_size_error="' . esc_attr( $data['max_size_error'] ) . '" data-min_size_error="' . esc_attr( $data['min_size_error'] ) . '" data-extension_error="' . esc_attr( $data['extension_error'] ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $data['upload_text'] ) . '" data-max_files_error="' . esc_attr( $data['max_files_error'] ) . '" data-upload_help_text="' . esc_attr( $data['upload_help_text'] ) . '">' . $data['button_text'] . '</div>';
+						$output .= '<div class="um-single-file-upload" data-user_id="' . esc_attr( $_um_profile_id ) . '" data-timestamp="' . esc_attr( $this->timestamp ) . '" data-nonce="' . esc_attr( $nonce ) . '" ' . $data_icon . ' data-set_id="' . esc_attr( $set_id ) . '" data-set_mode="' . esc_attr( $set_mode ) . '" data-type="' . esc_attr( $type ) . '" data-key="' . esc_attr( $key ) . '" data-max_size="' . esc_attr( $data['max_size'] ) . '" data-max_size_error="' . esc_attr( $data['max_size_error'] ) . '" data-min_size_error="' . esc_attr( $data['min_size_error'] ) . '" data-extension_error="' . esc_attr( $data['extension_error'] ) . '"  data-allowed_types="' . esc_attr( $allowed_types ) . '" data-upload_text="' . esc_attr( $data['upload_text'] ) . '" data-max_files_error="' . esc_attr( $data['max_files_error'] ) . '" data-upload_help_text="' . esc_attr( $data['upload_help_text'] ) . '">' . esc_html( $data['button_text'] ) . '</div>';
 						$output .= '<div class="um-modal-footer">
 									<div class="um-modal-right">
-										<a href="javascript:void(0);" class="um-modal-btn um-finish-upload file disabled" data-key="' . esc_attr( $key ) . '" data-change="' . esc_attr__( 'Change file' ) . '" data-processing="' . esc_attr__( 'Processing...', 'ultimate-member' ) . '"> ' . __( 'Save', 'ultimate-member' ) . '</a>
-										<a href="javascript:void(0);" class="um-modal-btn alt" data-action="um_remove_modal"> ' . __( 'Cancel', 'ultimate-member' ) . '</a>
+										<a href="javascript:void(0);" class="um-modal-btn um-finish-upload file disabled" data-key="' . esc_attr( $key ) . '" data-change="' . esc_attr__( 'Change file', 'ultimate-member' ) . '" data-processing="' . esc_attr__( 'Processing...', 'ultimate-member' ) . '"> ' . esc_html__( 'Save', 'ultimate-member' ) . '</a>
+										<a href="javascript:void(0);" class="um-modal-btn alt" data-action="um_remove_modal"> ' . esc_html__( 'Cancel', 'ultimate-member' ) . '</a>
 									</div>
 									<div class="um-clear"></div>
 								</div>';
@@ -3029,23 +3044,26 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$output .= '</div>';
 
 					break;
-
 				/* Select dropdown */
 				case 'select':
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
+					$form_key = str_replace( array( 'role_select', 'role_radio' ), 'role', $key );
+					$field_id = $form_key;
+
+					$class = 'um-s1';
 					if ( isset( $data['allowclear'] ) && 0 === $data['allowclear'] ) {
 						$class = 'um-s2';
-					} else {
-						$class = 'um-s1';
 					}
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
-					$output .= '<div class="um-field-area ' . ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ? 'um-field-area-has-icon' : '' ) . ' ">';
-					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+					$has_icon = ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons;
+
+					$output .= '<div class="um-field-area ' . ( $has_icon ? 'um-field-area-has-icon' : '' ) . ' ">';
+					if ( $has_icon ) {
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 					}
 
@@ -3060,21 +3078,19 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 
 					if ( ! empty( $data['parent_dropdown_relationship'] ) && ! UM()->user()->preview ) {
-
-						$disabled_by_parent_option = 'disabled = disabled';
-
-						$has_parent_option = true;
+						$has_parent_option         = true;
+						$disabled_by_parent_option = ' disabled="disabled" ';
 
 						/**
-						 * Filters change parent dropdown relationship by $form_key.
+						 * Filters parent dropdown relationship by $form_key.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_custom_dropdown_options_parent__{$form_key}
 						 *
 						 * @param {string}  $parent  Parent dropdown relationship.
 						 * @param {array}   $data    Field Data.
 						 *
-						 * @return {array} $parent  Parent dropdown relationship.
+						 * @return {string} Parent dropdown relationship.
 						 *
 						 * @example <caption>Change parent dropdown relationship.</caption>
 						 * function function_name( $parent, $data ) {
@@ -3084,16 +3100,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						 * add_filter( 'um_custom_dropdown_options_parent__{$form_key}', 'function_name', 10, 2 );
 						 */
 						$parent_dropdown_relationship = apply_filters( "um_custom_dropdown_options_parent__{$form_key}", $data['parent_dropdown_relationship'], $data );
-						$atts_ajax                   .= " data-um-parent='{$parent_dropdown_relationship}' ";
+						$atts_ajax                   .= ' data-um-parent="' . esc_attr( $parent_dropdown_relationship ) . '" ';
 
-						if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option && function_exists( $data['custom_dropdown_options_source'] ) && um_user( $data['parent_dropdown_relationship'] ) ) {
+						if ( ! empty( $data['custom_dropdown_options_source'] ) && function_exists( $data['custom_dropdown_options_source'] ) && um_user( $data['parent_dropdown_relationship'] ) ) {
 							if ( ! $this->is_source_blacklisted( $data['custom_dropdown_options_source'] ) ) {
 								$options = call_user_func( $data['custom_dropdown_options_source'], $data['parent_dropdown_relationship'] );
 							}
 
 							$disabled_by_parent_option = '';
 							if ( um_user( $form_key ) ) {
-								$select_original_option_value = " data-um-original-value='" . um_user( $form_key ) . "' ";
+								$select_original_option_value = ' data-um-original-value="' . esc_attr( um_user( $form_key ) ) . '" ';
 							}
 						}
 					}
@@ -3105,7 +3121,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					// Child dropdown
 					if ( $has_parent_option ) {
-						if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option && function_exists( $data['custom_dropdown_options_source'] ) && isset( UM()->form()->post_form[ $form_key ] ) ) {
+						if ( ! empty( $data['custom_dropdown_options_source'] ) && function_exists( $data['custom_dropdown_options_source'] ) && isset( UM()->form()->post_form[ $form_key ] ) ) {
 							if ( ! $this->is_source_blacklisted( $data['custom_dropdown_options_source'] ) ) {
 								$options = call_user_func( $data['custom_dropdown_options_source'], $data['parent_dropdown_relationship'] );
 							}
@@ -3113,19 +3129,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 
 					if ( ! empty( $data['custom_dropdown_options_source'] ) ) {
-
 						/**
-						 * Filters change custom dropdown options source by $form_key.
+						 * Filters a custom dropdown options source by $form_key.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_custom_dropdown_options_source__{$form_key}
 						 *
-						 * @param {string}  $source  Dropdown options source.
-						 * @param {array}   $data    Field Data.
+						 * @param {string} $source Dropdown options source.
+						 * @param {array}  $data   Field Data.
 						 *
-						 * @return {array} $source  Parent dropdown relationship.
+						 * @return {string} Dropdown options source.
 						 *
-						 * @example <caption>Change custom dropdown options.</caption>
+						 * @example <caption>Change custom dropdown options source.</caption>
 						 * function function_name( $source, $data ) {
 						 *     // your code here
 						 *     return $source;
@@ -3134,50 +3149,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						 */
 						$ajax_source = apply_filters( "um_custom_dropdown_options_source__{$form_key}", $data['custom_dropdown_options_source'], $data );
 						$atts_ajax  .= ' data-um-ajax-source="' . esc_attr( $ajax_source ) . '" ';
-
-						/**
-						 * Filters change custom dropdown options source by $form_key.
-						 *
-						 * @since 2.0
-						 * @hook  um_custom_dropdown_options_source_url__{$form_key}
-						 *
-						 * @param {string}  $url     Dropdown options source URL.
-						 * @param {array}   $data    Field Data.
-						 *
-						 * @return {array} $url  Parent dropdown relationship.
-						 *
-						 * @example <caption>Change custom dropdown options.</caption>
-						 * function my_custom_dropdown_options_source_url( $url, $data ) {
-						 *     // your code here
-						 *     return $url;
-						 * }
-						 * add_filter( 'um_custom_dropdown_options_source_url__{$form_key}', 'my_custom_dropdown_options_source_url', 10, 2 );
-						 */
-						// todo maybe deprecate
-//						$ajax_source_url = apply_filters( "um_custom_dropdown_options_source_url__{$form_key}", admin_url( 'admin-ajax.php' ), $data );
-//						$atts_ajax .= ' data-um-ajax-url="' . esc_url( $ajax_source_url ) . '" ';
-
 					}
 
-					/**
-					 * Filters enable options pairs by field $key.
-					 *
-					 * @since 2.0
-					 * @hook  um_fields_options_enable_pairs__{$key}
-					 *
-					 * @param {string}  $options_pairs  Enable pairs.
-					 *
-					 * @return {string}  $options_pairs  Enable pairs.
-					 *
-					 * @example <caption>Enable options pairs.</caption>
-					 * function my_fields_options_enable_pairs( $options_pairs ) {
-					 *     // your code here
-					 *     return $options_pairs;
-					 * }
-					 * add_filter( 'um_fields_options_enable_pairs__{$key}', 'my_fields_options_enable_pairs', 10, 1 );
-					 */
-					$enable_options_pair = apply_filters( "um_fields_options_enable_pairs__{$key}", false );
-
 					if ( ! $has_parent_option ) {
 						if ( isset( $options ) && 'builtin' === $options ) {
 							$options = UM()->builtin()->get( $data['filter'] );
@@ -3190,19 +3163,36 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$options = $data['options'];
 						}
 
+						/**
+						 * Filters dropdown options.
+						 *
+						 * @since 2.0
+						 * @hook  um_selectbox_options
+						 *
+						 * @param {array}  $options Field options.
+						 * @param {string} $key     Field metakey.
+						 *
+						 * @return {array} Field options.
+						 *
+						 * @example <caption>Extend dropdown options.</caption>
+						 * function my_um_selectbox_options( $options, $key ) {
+						 *     // your code here
+						 *     return $options;
+						 * }
+						 * add_filter( 'um_selectbox_options', 'my_um_selectbox_options', 10, 2 );
+						 */
 						$options = apply_filters( 'um_selectbox_options', $options, $key );
-
 						if ( isset( $options ) ) {
 							/**
-							 * Filters extend dropdown dynamic options.
+							 * Filters dropdown dynamic options.
 							 *
-							 * @since 2.0
+							 * @since 1.3.x
 							 * @hook  um_select_dropdown_dynamic_options
 							 *
-							 * @param {array}  $options  Dynamic options.
-							 * @param {array}  $data     Field Data.
+							 * @param {array} $options Dynamic options.
+							 * @param {array} $data    Field Data.
 							 *
-							 * @return {array}  $options  Dynamic options.
+							 * @return {array} Dynamic options.
 							 *
 							 * @example <caption>Extend dropdown dynamic options.</caption>
 							 * function my_select_dropdown_dynamic_options( $options, $data ) {
@@ -3212,16 +3202,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							 * add_filter( 'um_select_dropdown_dynamic_options', 'my_select_dropdown_dynamic_options', 10, 2 );
 							 */
 							$options = apply_filters( 'um_select_dropdown_dynamic_options', $options, $data );
-
 							/**
-							 * Filters extend dropdown dynamic options by field $key.
+							 * Filters dropdown dynamic options by field $key.
 							 *
-							 * @since 2.0
+							 * @since 1.3.x
 							 * @hook  um_select_dropdown_dynamic_options_{$key}
 							 *
-							 * @param {array}  $options  Dynamic options.
+							 * @param {array} $options Dynamic options.
 							 *
-							 * @return {array}  $options  Dynamic options.
+							 * @return {array} Dynamic options.
 							 *
 							 * @example <caption>Extend dropdown dynamic options by field $key.</caption>
 							 * function my_select_dropdown_dynamic_options( $options ) {
@@ -3244,10 +3233,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 * @since 2.0
 					 * @hook  um_select_options_pair
 					 *
-					 * @param {string}  $options_pair  Enable pairs.
-					 * @param {array}   $data          Field Data.
+					 * @param {bool|null} $options_pair Enable pairs.
+					 * @param {array}     $data         Field Data.
 					 *
-					 * @return {array}  $options_pair  Enable pairs.
+					 * @return {bool} Enable pairs.
 					 *
 					 * @example <caption>Enable options pair.</caption>
 					 * function my_um_select_options_pair( $options_pair, $data ) {
@@ -3258,21 +3247,14 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 */
 					$options_pair = apply_filters( 'um_select_options_pair', null, $data );
 
-					// switch options pair for custom options from a callback function
+					// Switch options pair for custom options from a callback function.
 					if ( ! empty( $data['custom_dropdown_options_source'] ) ) {
 						$options_pair = true;
 					}
 
 					$field_value = '';
 
-					if ( ! empty( $data['placeholder'] ) && is_string( $data['placeholder'] ) ) {
-						$placeholder = strip_tags( $data['placeholder'] );
-					} else {
-						$placeholder = '';
-					}
-
-					$output .= '<select data-default="' . $data['default'] . '" ' . $disabled . ' ' . $select_original_option_value . ' ' . $disabled_by_parent_option . '  name="' . esc_attr( $form_key ) . '" id="' . esc_attr( $field_id ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . '" style="width: 100%" data-placeholder="' . esc_attr( $placeholder ) . '" ' . $atts_ajax . '>';
-
+					$output .= '<select data-default="' . esc_attr( $default ) . '" ' . $disabled . ' ' . $select_original_option_value . ' ' . $disabled_by_parent_option . '  name="' . esc_attr( $form_key ) . '" id="' . esc_attr( $field_id ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" class="' . esc_attr( $this->get_class( $key, $data, $class ) ) . '" style="width: 100%" data-placeholder="' . esc_attr( $placeholder ) . '" ' . $atts_ajax . '>';
 					$output .= '<option value=""></option>';
 
 					// add options
@@ -3284,19 +3266,17 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$option_value                 = $v;
 							$um_field_checkbox_item_title = $v;
 
-							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ), true ) || ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
-								$option_value                 = $k;
-								$um_field_checkbox_item_title = $v;
+							if ( ( ! is_numeric( $k ) && 'role' === $form_key ) || ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
+								$option_value = $k;
 							}
 
 							if ( isset( $options_pair ) ) {
-								$option_value                 = $k;
-								$um_field_checkbox_item_title = $v;
+								$option_value = $k;
 							}
 
 							$option_value = $this->filter_field_non_utf8_value( $option_value );
 
-							$output .= '<option value="' . $option_value . '" ';
+							$output .= '<option value="' . esc_attr( $option_value ) . '" ';
 
 							if ( $this->is_selected( $form_key, $option_value, $data ) ) {
 								$output     .= 'selected';
@@ -3306,7 +3286,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 								$field_value = $v;
 							}
 
-							$output .= '>' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</option>';
+							$output .= '>' . esc_html__( $um_field_checkbox_item_title, 'ultimate-member' ) . '</option>';
 						}
 					}
 
@@ -3326,52 +3306,57 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Multi-Select dropdown */
 				case 'multiselect':
-					$max_selections = ( isset( $data['max_selections'] ) ) ? absint( $data['max_selections'] ) : 0;
+					$options = array();
+					if ( isset( $data['options'] ) && is_array( $data['options'] ) ) {
+						$options = $data['options'];
+					}
+					$max_selections = isset( $data['max_selections'] ) ? absint( $data['max_selections'] ) : 0;
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$field_id   = $key;
+					$field_name = $key;
 
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
+
+					$class = 'um-s1';
 					if ( isset( $data['allowclear'] ) && 0 === $data['allowclear'] ) {
 						$class = 'um-s2';
-					} else {
-						$class = 'um-s1';
 					}
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
 					}
 
-					$field_icon        = false;
-					$field_icon_output = '';
-
 					/**
-					 * Filters change multiselect keyword data.
+					 * Filters multiselect keyword data.
 					 *
-					 * @since 2.0
+					 * @since 1.3.x
 					 * @hook  um_multiselect_option_value
 					 *
-					 * @param {int}      $keyword  Option Value.
-					 * @param {string}   $type     Field Type.
+					 * @param {int}    $keyword If 1 - keyword is enabled. It's 0 by default.
+					 * @param {string} $type    Field Type.
 					 *
-					 * @return {int}  $keyword  Option Value.
+					 * @return {int} Enabled keyword.
 					 *
-					 * @example <caption>Change multiselect keyword data.</caption>
+					 * @example <caption>Change multiselect keyword data. Enable it.</caption>
 					 * function my_multiselect_option_value( $keyword, $type ) {
 					 *     // your code here
+					 *     $keyword = 1;
 					 *     return $keyword;
 					 * }
 					 * add_filter( 'um_multiselect_option_value', 'my_multiselect_option_value', 10, 2 );
 					 */
-					$use_keyword = apply_filters( 'um_multiselect_option_value', 0, $data['type'] );
+					$use_keyword = apply_filters( 'um_multiselect_option_value', 0, $type );
 
-					$output .= '<div class="um-field-area ' . ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ? 'um-field-area-has-icon' : '' ) . ' ">';
-					if ( ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons ) {
+					$has_icon = ! empty( $data['icon'] ) && isset( $this->field_icons ) && 'field' === $this->field_icons;
+
+					$output .= '<div class="um-field-area ' . ( $has_icon ? 'um-field-area-has-icon' : '' ) . ' ">';
+					if ( $has_icon ) {
 						$output .= '<div class="um-field-icon"><i class="' . esc_attr( $data['icon'] ) . '"></i></div>';
 					}
 
-					$output .= '<select  ' . $disabled . ' multiple="multiple" name="' . esc_attr( $field_name ) . '[]" id="' . esc_attr( $field_id ) . '" data-maxsize="' . esc_attr( $max_selections ) . '" data-validate="' . esc_attr( $data['validate'] ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . ' um-user-keyword_' . $use_keyword . '" style="width: 100%" data-placeholder="' . esc_attr( $data['placeholder'] ) . '">';
+					$output .= '<select  ' . $disabled . ' multiple="multiple" name="' . esc_attr( $field_name ) . '[]" id="' . esc_attr( $field_id ) . '" data-maxsize="' . esc_attr( $max_selections ) . '" data-validate="' . esc_attr( $validate ) . '" data-key="' . esc_attr( $key ) . '" class="' . $this->get_class( $key, $data, $class ) . ' um-user-keyword_' . $use_keyword . '" style="width: 100%" data-placeholder="' . esc_attr( $placeholder ) . '">';
 
 					if ( isset( $options ) && 'builtin' === $options ) {
 						$options = UM()->builtin()->get( $data['filter'] );
@@ -3383,15 +3368,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					if ( isset( $options ) ) {
 						/**
-						 * Filters extend multiselect options.
+						 * Filters multiselect options.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_multiselect_options
 						 *
-						 * @param {array}   $options  Multiselect Options.
-						 * @param {array}   $data     Field Data.
+						 * @param {array} $options Multiselect Options.
+						 * @param {array} $data    Field Data.
 						 *
-						 * @return {array}  $options  Multiselect Options.
+						 * @return {array} Multiselect Options.
 						 *
 						 * @example <caption>Extend multiselect options.</caption>
 						 * function my_multiselect_options( $options, $data ) {
@@ -3401,11 +3386,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						 * add_filter( 'um_multiselect_options', 'my_multiselect_options', 10, 2 );
 						 */
 						$options = apply_filters( 'um_multiselect_options', $options, $data );
-
 						/**
-						 * Filters extend multiselect options by field $key.
+						 * Filters multiselect options by field $key.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_multiselect_options_{$key}
 						 *
 						 * @param {array}   $options  Multiselect Options.
@@ -3420,17 +3404,16 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						 * add_filter( 'um_multiselect_options_{$key}', 'my_multiselect_options', 10, 2 );
 						 */
 						$options = apply_filters( "um_multiselect_options_{$key}", $options );
-
 						/**
-						 * Filters extend multiselect options by field $type.
+						 * Filters multiselect options by field $type.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_multiselect_options_{$type}
 						 *
-						 * @param {array}   $options  Multiselect Options.
-						 * @param {array}   $data     Field Data.
+						 * @param {array} $options Multiselect Options.
+						 * @param {array} $data    Field Data.
 						 *
-						 * @return {array}  $options  Multiselect Options.
+						 * @return {array} Multiselect Options.
 						 *
 						 * @example <caption>Extend multiselect options.</caption>
 						 * function my_multiselect_options( $options, $data ) {
@@ -3442,32 +3425,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						$options = apply_filters( "um_multiselect_options_{$type}", $options, $data );
 					}
 
-					/**
-					 * Filters enable options pair by field $data.
-					 *
-					 * @since 2.0
-					 * @hook  um_multiselect_options_{$type}
-					 *
-					 * @param {null}    $options_pair  Enable pairs.
-					 * @param {array}   $data          Field Data.
-					 *
-					 * @return {array}  $options_pair  Enable pairs.
-					 *
-					 * @example <caption>Enable options pair.</caption>
-					 * function my_um_select_options_pair( $options_pair, $data ) {
-					 *     // your code here
-					 *     return $options_pair;
-					 * }
-					 * add_filter( 'um_select_options_pair', 'my_um_select_options_pair', 10, 2 );
-					 */
+					/** This filter is documented in includes/core/class-fields.php */
 					$use_keyword = apply_filters( 'um_select_options_pair', null, $data );
 
-					// switch options pair for custom options from a callback function
+					// Switch options pair for custom options from a callback function.
 					if ( ! empty( $data['custom_dropdown_options_source'] ) ) {
 						$use_keyword = true;
 					}
 
-					// add an empty option!
+					// Add an empty option!
 					$output .= '<option value=""></option>';
 
 					$arr_selected = array();
@@ -3481,20 +3447,19 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$opt_value                    = $v;
 
 							if ( $use_keyword ) {
-								$um_field_checkbox_item_title = $v;
-								$opt_value                    = $k;
+								$opt_value = $k;
 							}
 
 							$opt_value = $this->filter_field_non_utf8_value( $opt_value );
 
-							$output .= '<option value="' . $opt_value . '" ';
+							$output .= '<option value="' . esc_attr( $opt_value ) . '" ';
 							if ( $this->is_selected( $key, $opt_value, $data ) ) {
 
 								$output                    .= 'selected';
 								$arr_selected[ $opt_value ] = $opt_value;
 							}
 
-							$output .= '>' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</option>';
+							$output .= '>' . esc_html__( $um_field_checkbox_item_title, 'ultimate-member' ) . '</option>';
 
 						}
 					}
@@ -3517,24 +3482,25 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Radio */
 				case 'radio':
+					$form_key = str_replace( array( 'role_select', 'role_radio' ), 'role', $key );
+
 					$options = array();
 					if ( isset( $data['options'] ) && is_array( $data['options'] ) ) {
 						$options = $data['options'];
 					}
 
 					/**
-					 * Filters extend radio field options.
+					 * Filters radio field options.
 					 *
-					 * @since 2.0
+					 * @since 1.3.x
 					 * @hook  um_radio_field_options
 					 *
-					 * @param {array}   $options  Radio Field Options.
-					 * @param {array}   $data     Field Data.
+					 * @param {array} $options Radio Field Options.
+					 * @param {array} $data    Field Data.
 					 *
-					 * @return {array}  $options  Radio Field Options.
+					 * @return {array} Radio Field Options.
 					 *
 					 * @example <caption>Extend radio field options.</caption>
 					 * function my_radio_field_options( $options, $data ) {
@@ -3544,16 +3510,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 * add_filter( 'um_radio_field_options', 'my_radio_field_options', 10, 2 );
 					 */
 					$options = apply_filters( 'um_radio_field_options', $options, $data );
-
 					/**
-					 * Filters extend radio field options by field $key.
+					 * Filters radio field options by field $key.
 					 *
-					 * @since 2.0
+					 * @since 1.3.x
 					 * @hook  um_radio_field_options_{$key}
 					 *
-					 * @param {array}   $options  Radio Field Options.
+					 * @param {array} $options Radio Field Options.
 					 *
-					 * @return {array}  $options  Radio Field Options.
+					 * @return {array} Radio Field Options.
 					 *
 					 * @example <caption>Extend radio field options.</caption>
 					 * function my_radio_field_options( $options ) {
@@ -3563,8 +3528,9 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 * add_filter( 'um_radio_field_options_{$key}', 'my_radio_field_options', 10, 1 );
 					 */
 					$options = apply_filters( "um_radio_field_options_{$key}", $options );
+					$options = $this->get_available_roles( $form_key, $options );
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -3572,9 +3538,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '<div class="um-field-area">';
 
-					$options = $this->get_available_roles( $form_key, $options );
-
-					// add options
+					// Add options.
 					$i           = 0;
 					$field_value = array();
 
@@ -3584,10 +3548,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 * @since 2.0
 					 * @hook  um_radio_options_pair__{$key}
 					 *
-					 * @param {null}    $options_pair  Enable pairs.
-					 * @param {array}   $data          Field Data.
+					 * @param {bool}  $options_pair Enable pairs.
+					 * @param {array} $data         Field Data.
 					 *
-					 * @return {array}  $options_pair  Enable pairs.
+					 * @return {bool} Enable pairs.
 					 *
 					 * @example <caption>Enable options pair.</caption>
 					 * function my_radio_field_options( $options ) {
@@ -3606,14 +3570,12 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 							$um_field_checkbox_item_title = $v;
 							$option_value                 = $v;
 
-							if ( ! is_numeric( $k ) && in_array( $form_key, array( 'role' ), true ) || ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
-								$um_field_checkbox_item_title = $v;
-								$option_value                 = $k;
+							if ( ( ! is_numeric( $k ) && 'role' === $form_key ) || ( 'account' === $this->set_mode || um_is_core_page( 'account' ) ) ) {
+								$option_value = $k;
 							}
 
 							if ( $options_pair ) {
-								$um_field_checkbox_item_title = $v;
-								$option_value                 = $k;
+								$option_value = $k;
 							}
 
 							$i++;
@@ -3639,7 +3601,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 							$option_value = $this->filter_field_non_utf8_value( $option_value );
 
-							$output .= '<input ' . $disabled . ' type="radio" name="' . ( ( 'role' === $form_key ) ? esc_attr( $form_key ) : esc_attr( $form_key ) . '[]' ) . '" value="' . $option_value . '" ';
+							$output .= '<input ' . $disabled . ' type="radio" name="' . ( ( 'role' === $form_key ) ? esc_attr( $form_key ) : esc_attr( $form_key ) . '[]' ) . '" value="' . esc_attr( $option_value ) . '" ';
 
 							if ( $this->is_radio_checked( $key, $option_value, $data ) ) {
 								$output             .= 'checked';
@@ -3676,7 +3638,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* Checkbox */
 				case 'checkbox':
 					$options = array();
@@ -3685,15 +3646,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					}
 
 					/**
-					 * Filters extend checkbox options.
+					 * Filters checkbox options.
 					 *
-					 * @since 2.0
+					 * @since 1.3.x
 					 * @hook  um_checkbox_field_options
 					 *
-					 * @param {array}   $options  Checkbox Options.
-					 * @param {array}   $data     Field Data.
+					 * @param {array} $options Checkbox Options.
+					 * @param {array} $data    Field Data.
 					 *
-					 * @return {array}  $options  Checkbox Options.
+					 * @return {array} Checkbox Options.
 					 *
 					 * @example <caption>Extend checkbox options.</caption>
 					 * function um_checkbox_field_options( $options, $data ) {
@@ -3703,16 +3664,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 * add_filter( 'um_checkbox_field_options', 'um_checkbox_field_options', 10, 2 );
 					 */
 					$options = apply_filters( 'um_checkbox_field_options', $options, $data );
-
 					/**
-					 * Filters extend checkbox options by field $key.
+					 * Filters checkbox options by field $key.
 					 *
-					 * @since 2.0
+					 * @since 1.3.x
 					 * @hook  um_checkbox_field_options_{$key}
 					 *
-					 * @param {array}   $options  Checkbox Options.
+					 * @param {array} $options Checkbox Options.
 					 *
-					 * @return {array}  $options  Checkbox Options.
+					 * @return {array} Checkbox Options.
 					 *
 					 * @example <caption>Extend checkbox options.</caption>
 					 * function my_checkbox_options( $options ) {
@@ -3723,7 +3683,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					 */
 					$options = apply_filters( "um_checkbox_field_options_{$key}", $options );
 
-					$output .= '<div ' . $this->get_atts( $key, $classes, $data['conditional'], $data ) . '>';
+					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 					if ( isset( $data['label'] ) ) {
 						$output .= $this->field_label( $data['label'], $key, $data );
@@ -3731,9 +3691,8 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '<div class="um-field-area">';
 
-					// add options
+					// Add options.
 					$i = 0;
-
 					foreach ( $options as $k => $v ) {
 
 						$v = rtrim( $v );
@@ -3781,15 +3740,15 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						/**
 						 * Filters change Checkbox item title.
 						 *
-						 * @since 2.0
+						 * @since 1.3.x
 						 * @hook  um_field_checkbox_item_title
 						 *
-						 * @param {array}    $um_field_checkbox_item_title  Item Title.
-						 * @param {string}   $key                           Field Key.
-						 * @param {string}   $v                             Field Value.
-						 * @param {array}    $data                          Field Data.
+						 * @param {string} $um_field_checkbox_item_title Item Title.
+						 * @param {string} $key                          Field Key.
+						 * @param {string} $v                            Field Value.
+						 * @param {array}  $data                         Field Data.
 						 *
-						 * @return {array}  $um_field_checkbox_item_title  Item Title.
+						 * @return {string} Item Title.
 						 *
 						 * @example <caption>Change Checkbox item title.</caption>
 						 * function um_checkbox_field_options( $um_field_checkbox_item_title, $key, $v, $data ) {
@@ -3800,7 +3759,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 						 */
 						$um_field_checkbox_item_title = apply_filters( 'um_field_checkbox_item_title', $um_field_checkbox_item_title, $key, $v, $data );
 
-						$output .= '<span class="um-field-checkbox-option">' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</span>';
+						$output .= '<span class="um-field-checkbox-option">' . esc_html__( $um_field_checkbox_item_title, 'ultimate-member' ) . '</span>';
 						$output .= '</label>';
 
 						if ( 0 === $i % 2 ) {
@@ -3819,10 +3778,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 
 					$output .= '</div>';
 					break;
-
 				/* HTML */
 				case 'block':
 					$content = array_key_exists( 'content', $data ) ? $data['content'] : '';
+					// @todo WP_KSES for $content
 					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
 				/* Shortcode */
@@ -3830,7 +3789,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$content = array_key_exists( 'content', $data ) ? $data['content'] : '';
 					$content = str_replace( '{profile_id}', um_profile_id(), $content );
 					$content = apply_shortcodes( $content );
-
+					// @todo WP_KSES for $content
 					$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>' . $content . '</div>';
 					break;
 				/* Unlimited Group */
@@ -3838,7 +3797,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$fields = $this->get_fields_in_group( $key );
 					if ( ! empty( $fields ) ) {
 
-						$output .= '<div class="um-field-group" data-max_entries="' . $data['max_entries'] . '">
+						$output .= '<div class="um-field-group" data-max_entries="' . esc_attr( $data['max_entries'] ) . '">
 								<div class="um-field-group-head"><i class="um-icon-plus"></i>' . esc_html__( $data['label'], 'ultimate-member' ) . '</div>';
 						$output .= '<div class="um-field-group-body"><a href="javascript:void(0);" class="um-field-group-cancel"><i class="um-icon-close"></i></a>';
 
@@ -3879,7 +3838,6 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			return $output;
 		}
 
-
 		/**
 		 * Filter for user roles
 		 *
@@ -4278,7 +4236,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 					$_field_value = $this->field_value( $key, $default, $data );
 
 					if ( ( isset( $_field_value ) && '' !== $_field_value ) || in_array( $type, $fields_without_metakey, true ) ) {
-						$output .= '<div ' . esc_html( $this->get_atts( $key, $classes, $conditional, $data ) ) . '>';
+						$output .= '<div ' . $this->get_atts( $key, $classes, $conditional, $data ) . '>';
 
 						if ( isset( $data['label'] ) || ! empty( $data['icon'] ) ) {
 
diff --git a/includes/core/class-shortcodes.php b/includes/core/class-shortcodes.php
index 3b15dbeb..f1b6bb78 100644
--- a/includes/core/class-shortcodes.php
+++ b/includes/core/class-shortcodes.php
@@ -297,16 +297,23 @@ if ( ! class_exists( 'um\core\Shortcodes' ) ) {
 			if ( isset( $this->set_args ) && is_array( $this->set_args ) ) {
 				$args = $this->set_args;
 
-				unset( $args['file'] );
-				unset( $args['theme_file'] );
-				unset( $args['tpl'] );
+				unset( $args['file'], $args['theme_file'], $args['tpl'] );
 
 				$args = apply_filters( 'um_template_load_args', $args, $tpl );
 
-				extract( $args );
+				/*
+				 * This use of extract() cannot be removed. There are many possible ways that
+				 * templates could depend on variables that it creates existing, and no way to
+				 * detect and deprecate it.
+				 *
+				 * Passing the EXTR_SKIP flag is the safest option, ensuring globals and
+				 * function variables cannot be overwritten.
+				 */
+				// phpcs:ignore WordPress.PHP.DontExtract.extract_extract
+				extract( $args, EXTR_SKIP );
 			}
 
-			$file = um_path . "templates/{$tpl}.php";
+			$file       = UM_PATH . "templates/{$tpl}.php";
 			$theme_file = get_stylesheet_directory() . "/ultimate-member/templates/{$tpl}.php";
 			if ( file_exists( $theme_file ) ) {
 				$file = $theme_file;
diff --git a/includes/core/um-actions-form.php b/includes/core/um-actions-form.php
index 3c4eae9f..e8eea188 100644
--- a/includes/core/um-actions-form.php
+++ b/includes/core/um-actions-form.php
@@ -416,8 +416,8 @@ function um_check_conditions_on_submit( $condition, $fields, $args, $reset = fal
  */
 function um_submit_form_errors_hook_( $args ) {
 	$form_id = $args['form_id'];
-	$mode = $args['mode'];
-	$fields = unserialize( $args['custom_fields'] );
+	$mode    = $args['mode'];
+	$fields  = unserialize( $args['custom_fields'] );
 
 	$um_profile_photo = um_profile('profile_photo');
 	if ( get_post_meta( $form_id, '_um_profile_photo_required', true ) && ( empty( $args['profile_photo'] ) && empty( $um_profile_photo ) ) ) {
@@ -425,12 +425,12 @@ function um_submit_form_errors_hook_( $args ) {
 	}
 
 	if ( ! empty( $fields ) ) {
-
-		$can_edit = false;
-		$current_user_roles = [];
+		$can_edit           = false;
+		$current_user_roles = array();
 		if ( is_user_logged_in() ) {
-
-			$can_edit = UM()->roles()->um_current_user_can( 'edit', $args['user_id'] );
+			if ( array_key_exists( 'user_id', $args ) ) {
+				$can_edit = UM()->roles()->um_current_user_can( 'edit', $args['user_id'] );
+			}
 
 			um_fetch_user( get_current_user_id() );
 			$current_user_roles = um_user( 'roles' );
@@ -439,7 +439,7 @@ function um_submit_form_errors_hook_( $args ) {
 
 		foreach ( $fields as $key => $array ) {
 
-			if ( $mode == 'profile' ) {
+			if ( 'profile' === $mode ) {
 				$restricted_fields = UM()->fields()->get_restricted_fields_for_edit();
 				if ( is_array( $restricted_fields ) && in_array( $key, $restricted_fields ) ) {
 					continue;
@@ -447,7 +447,7 @@ function um_submit_form_errors_hook_( $args ) {
 			}
 
 			$can_view = true;
-			if ( isset( $array['public'] ) && $mode != 'register' ) {
+			if ( isset( $array['public'] ) && 'register' !== $mode ) {
 
 				switch ( $array['public'] ) {
 					case '1': // Everyone
@@ -491,7 +491,6 @@ function um_submit_form_errors_hook_( $args ) {
 				continue;
 			}
 
-
 			/**
 			 * UM hook
 			 *

From 3e35529c8d845ef4d0411d801f8c9f7d1fc0537d Mon Sep 17 00:00:00 2001
From: Mykyta Synelnikov <nsinelnikov.work@gmail.com>
Date: Wed, 28 Jun 2023 21:38:09 +0300
Subject: [PATCH 37/37] - remove `extract()` from REST API classes;

---
 includes/core/rest/class-api-v1.php | 337 ++++++++++-----------------
 includes/core/rest/class-api-v2.php | 341 ++++++++--------------------
 2 files changed, 214 insertions(+), 464 deletions(-)

diff --git a/includes/core/rest/class-api-v1.php b/includes/core/rest/class-api-v1.php
index e7de1394..a3aee5c2 100644
--- a/includes/core/rest/class-api-v1.php
+++ b/includes/core/rest/class-api-v1.php
@@ -1,9 +1,9 @@
 <?php
 namespace um\core\rest;
 
-
-if ( ! defined( 'ABSPATH' ) ) exit;
-
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 
@@ -19,7 +19,6 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 		 */
 		const VERSION = '1.0';
 
-
 		/**
 		 * REST_API constructor.
 		 */
@@ -29,7 +28,6 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 			add_filter( 'query_vars', array( $this, 'query_vars' ) );
 		}
 
-
 		/**
 		 * Registers query vars for API access
 		 *
@@ -59,7 +57,6 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 			return $vars;
 		}
 
-
 		/**
 		 * Validate the API request
 		 */
@@ -89,11 +86,9 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 						$this->invalid_auth();
 					}
 				}
-
 			}
 		}
 
-
 		/**
 		 * Retrieve the user ID based on the public key provided
 		 *
@@ -116,10 +111,10 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 
 			if ( false === $user ) {
 				$user = $wpdb->get_var( $wpdb->prepare(
-					"SELECT user_id 
-					FROM $wpdb->usermeta 
-					WHERE meta_key = 'um_user_public_key' AND 
-					      meta_value = %s 
+					"SELECT user_id
+					FROM $wpdb->usermeta
+					WHERE meta_key = 'um_user_public_key' AND
+					      meta_value = %s
 					LIMIT 1",
 					$key
 				) );
@@ -134,106 +129,82 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 			return false;
 		}
 
-
 		/**
-		 * Process Get users API Request
+		 * Process Get users API Request.
 		 *
-		 * @param $args
+		 * @param array $args
 		 *
 		 * @return array
 		 */
 		public function get_users( $args ) {
-			/**
-			 * @var int $number
-			 * @var string $orderby
-			 * @var string $order
-			 * @var string $include
-			 * @var string $exclude
-			 */
-			extract( $args );
-
 			$response = array();
 
-			if ( ! $number ) {
-				$number = 10;
-			}
+			$number  = array_key_exists( 'number', $args ) && is_numeric( $args['number'] ) ? absint( $args['number'] ) : 10;
+			$orderby = array_key_exists( 'orderby', $args ) ? sanitize_key( $args['orderby'] ) : 'user_registered';
+			$order   = array_key_exists( 'order', $args ) ? sanitize_key( $args['order'] ) : 'desc';
 
-			if ( ! $orderby ) {
-				$orderby = 'user_registered';
-			}
+			$loop_a = array(
+				'number'  => $number,
+				'orderby' => $orderby,
+				'order'   => $order,
+			);
 
-			if ( ! $order ) {
-				$order = 'desc';
-			}
-
-			$loop_a = array( 'number' => $number, 'orderby' => $orderby, 'order' => $order );
-
-			if ( $include ) {
-				$include = explode(',', $include );
+			if ( array_key_exists( 'include', $args ) ) {
+				$include           = explode( ',', sanitize_text_field( $args['include'] ) );
 				$loop_a['include'] = $include;
 			}
 
-			if ( $exclude ) {
-				$exclude = explode(',', $exclude );
+			if ( array_key_exists( 'exclude', $args ) ) {
+				$exclude           = explode( ',', sanitize_text_field( $args['exclude'] ) );
 				$loop_a['exclude'] = $exclude;
 			}
 
 			$loop = get_users( $loop_a );
 
 			foreach ( $loop as $user ) {
-
-				unset( $user->data->user_status );
-				unset( $user->data->user_activation_key );
-				unset( $user->data->user_pass );
+				unset( $user->data->user_status, $user->data->user_activation_key, $user->data->user_pass );
 
 				um_fetch_user( $user->ID );
 
 				foreach ( $user as $key => $val ) {
-					if ( $key != 'data' ) {
+					if ( 'data' !== $key ) {
 						continue;
 					}
 
-					$key = 'profile';
-					$val->roles = $user->roles;
-					$val->first_name = um_user('first_name');
-					$val->last_name = um_user('last_name');
-					$val->account_status = um_user('account_status');
-					$val->profile_pic_original = um_get_user_avatar_url('', 'original');
-					$val->profile_pic_normal = um_get_user_avatar_url('', 200);
-					$val->profile_pic_small = um_get_user_avatar_url('', 40);
-					$val->cover_photo = $this->getsrc( um_user('cover_photo', 1000) );
+					$val->roles                = $user->roles;
+					$val->first_name           = um_user( 'first_name' );
+					$val->last_name            = um_user( 'last_name' );
+					$val->account_status       = um_user( 'account_status' );
+					$val->profile_pic_original = um_get_user_avatar_url( '', 'original' );
+					$val->profile_pic_normal   = um_get_user_avatar_url( '', 200 );
+					$val->profile_pic_small    = um_get_user_avatar_url( '', 40 );
+					$val->cover_photo          = $this->getsrc( um_user( 'cover_photo', 1000 ) );
 
 					/**
-					 * UM hook
+					 * Filters the output data for Rest API userdata call.
 					 *
-					 * @type filter
-					 * @title um_rest_userdata
-					 * @description Change output data for Rest API userdata call
-					 * @input_vars
-					 * [{"var":"$value","type":"array","desc":"Output Data"},
-					 * {"var":"$user_id","type":"string","desc":"User ID"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage
-					 * <?php add_filter( 'um_rest_userdata', 'function_name', 10, 2 ); ?>
-					 * @example
-					 * <?php
-					 * add_filter( 'um_rest_userdata', 'my_rest_userdata', 10, 2 );
-					 * function my_rest_userdata( $value, $user_id ) {
+					 * @param {mixed} $val      User data value.
+					 * @param {int}   $user_id  User ID.
+					 *
+					 * @return {mixed} User data value.
+					 *
+					 * @since 2.0
+					 * @hook um_rest_userdata
+					 *
+					 * @example <caption>Force change the output data for Rest API userdata call.</caption>
+					 * function my_custom_um_rest_userdata( $value, $user_id  ) {
 					 *     // your code here
-					 *     return $value;
+					 *     return $response;
 					 * }
-					 * ?>
+					 * add_filter( 'um_rest_userdata', 'my_custom_um_rest_userdata', 10, 2 );
 					 */
-					$val = apply_filters( 'um_rest_userdata', $val, $user->ID );
-					$response[ $user->ID ] = $val;
+					$response[ $user->ID ] = apply_filters( 'um_rest_userdata', $val, $user->ID );
 				}
 			}
 
 			return $response;
 		}
 
-
 		/**
 		 * Update user API query
 		 *
@@ -242,26 +213,28 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 		 * @return array
 		 */
 		public function update_user( $args ) {
-			/**
-			 * @var int $id
-			 * @var string $data
-			 * @var string $value
-			 */
-			extract( $args );
-
 			$response = array();
-			$error = array();
+			$error    = array();
 
-			if ( ! $id ) {
+			if ( empty( $args['id'] ) ) {
 				$error['error'] = __( 'You must provide a user ID', 'ultimate-member' );
 				return $error;
 			}
 
-			if ( ! $data ) {
+			if ( empty( $args['data'] ) ) {
 				$error['error'] = __( 'You need to provide data to update', 'ultimate-member' );
 				return $error;
 			}
 
+			if ( ! array_key_exists( 'value', $args ) ) {
+				$error['error'] = __( 'You need to provide value to update', 'ultimate-member' );
+				return $error;
+			}
+
+			$id    = absint( $args['id'] );
+			$data  = sanitize_text_field( $args['data'] );
+			$value = sanitize_text_field( $args['value'] );
+
 			um_fetch_user( $id );
 
 			switch ( $data ) {
@@ -271,35 +244,16 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 					break;
 				case 'role':
 					$wp_user_object = new \WP_User( $id );
-					$old_roles = $wp_user_object->roles;
+					$old_roles      = $wp_user_object->roles;
 					$wp_user_object->set_role( $value );
 
-					/**
-					 * UM hook
-					 *
-					 * @type action
-					 * @title um_after_member_role_upgrade
-					 * @description Action after user role was changed
-					 * @input_vars
-					 * [{"var":"$new_roles","type":"array","desc":"New User Roles"},
-					 * {"var":"$old_roles","type":"array","desc":"Old roles"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_action( 'um_after_member_role_upgrade', 'function_name', 10, 2 );
-					 * @example
-					 * <?php
-					 * add_action( 'um_after_member_role_upgrade', 'my_after_member_role_upgrade', 10, 2 );
-					 * function my_after_member_role_upgrade( $new_roles, $old_roles ) {
-					 *     // your code here
-					 * }
-					 * ?>
-					 */
+					/** This action is documented in includes/core/class-user.php */
 					do_action( 'um_after_member_role_upgrade', array( $value ), $old_roles, $id );
 
 					$response['success'] = __( 'User role has been changed.', 'ultimate-member' );
 					break;
 				default:
-					update_user_meta( $id, $data, esc_attr( $value ) );
+					update_user_meta( $id, $data, $value );
 					$response['success'] = __( 'User meta has been changed.', 'ultimate-member' );
 					break;
 			}
@@ -307,7 +261,6 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 			return $response;
 		}
 
-
 		/**
 		 * Process delete user via API
 		 *
@@ -316,19 +269,16 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 		 * @return array
 		 */
 		public function delete_user( $args ) {
-			/**
-			 * @var int $id
-			 */
-			extract( $args );
-
 			$response = array();
-			$error = array();
+			$error    = array();
 
-			if ( ! isset( $id ) ) {
+			if ( empty( $args['id'] ) ) {
 				$error['error'] = __( 'You must provide a user ID', 'ultimate-member' );
 				return $error;
 			}
 
+			$id = absint( $args['id'] );
+
 			$user = get_userdata( $id );
 			if ( ! $user ) {
 				$error['error'] = __( 'Invalid user specified', 'ultimate-member' );
@@ -343,7 +293,6 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 			return $response;
 		}
 
-
 		/**
 		 * Process Get user API Request
 		 *
@@ -352,145 +301,101 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 		 * @return array|mixed
 		 */
 		public function get_auser( $args ) {
-			/**
-			 * @var int $um_id
-			 * @var string $um_fields
-			 */
-			extract( $args );
-
 			$response = array();
-			$error = array();
+			$error    = array();
 
-			if ( ! isset( $id ) ) {
-				$error['error'] = __('You must provide a user ID','ultimate-member');
+			if ( empty( $args['id'] ) ) {
+				$error['error'] = __( 'You must provide a user ID', 'ultimate-member' );
 				return $error;
 			}
 
+			$id   = absint( $args['id'] );
 			$user = get_userdata( $id );
 			if ( ! $user ) {
-				$error['error'] = __('Invalid user specified','ultimate-member');
+				$error['error'] = __( 'Invalid user specified', 'ultimate-member' );
 				return $error;
 			}
 
-			unset( $user->data->user_status );
-			unset( $user->data->user_activation_key );
-			unset( $user->data->user_pass );
+			unset( $user->data->user_status, $user->data->user_activation_key, $user->data->user_pass );
 
 			um_fetch_user( $user->ID );
 
-			if ( isset( $fields ) && $fields ) {
-				$fields = explode(',', $fields );
-				$response['ID'] = $user->ID;
+			if ( array_key_exists( 'fields', $args ) ) {
+				$fields               = explode( ',', sanitize_text_field( $args['fields'] ) );
+				$response['ID']       = $user->ID;
 				$response['username'] = $user->user_login;
 				foreach ( $fields as $field ) {
 
 					switch ( $field ) {
-
 						default:
-							$response[ $field ] = ( um_profile( $field ) ) ? um_profile( $field ) : '';
+							$profile_data       = um_profile( $field );
+							$response[ $field ] = $profile_data ? $profile_data : '';
 
 							/**
-							 * UM hook
+							 * Filters the output data for Rest API user authentication call.
 							 *
-							 * @type filter
-							 * @title um_rest_get_auser
-							 * @description Change output data for Rest API user authentification call
-							 * @input_vars
-							 * [{"var":"$response","type":"array","desc":"Output Data"},
-							 * {"var":"$field","type":"string","desc":"Field Key"},
-							 * {"var":"$user_id","type":"int","desc":"User ID"}]
-							 * @change_log
-							 * ["Since: 2.0"]
-							 * @usage
-							 * <?php add_filter( 'um_rest_get_auser', 'function_name', 10, 3 ); ?>
-							 * @example
-							 * <?php
-							 * add_filter( 'um_rest_get_auser', 'my_rest_get_auser', 10, 3 );
-							 * function my_rest_get_auser( $response, $field, $user_id ) {
+							 * @param {array}  $response REST API response.
+							 * @param {string} $field    Field Options.
+							 * @param {int}    $user_id  User ID.
+							 *
+							 * @return {array} REST API response.
+							 *
+							 * @since 2.0
+							 * @hook um_rest_get_auser
+							 *
+							 * @example <caption>Force change the output data for Rest API user authentication call.</caption>
+							 * function my_custom_um_rest_get_auser( $response, $field, $user_id  ) {
 							 *     // your code here
 							 *     return $response;
 							 * }
-							 * ?>
+							 * add_filter( 'um_rest_get_auser', 'my_custom_um_rest_get_auser', 10, 3 );
 							 */
 							$response = apply_filters( 'um_rest_get_auser', $response, $field, $user->ID );
 							break;
-
 						case 'cover_photo':
-							$response['cover_photo'] = $this->getsrc( um_user('cover_photo', 1000) );
+							$response['cover_photo'] = $this->getsrc( um_user( 'cover_photo', 1000 ) );
 							break;
-
 						case 'profile_pic':
-							$response['profile_pic_original'] = um_get_user_avatar_url('', 'original');
-							$response['profile_pic_normal'] = um_get_user_avatar_url('', 200);
-							$response['profile_pic_small'] = um_get_user_avatar_url('', 40);
+							$response['profile_pic_original'] = um_get_user_avatar_url( '', 'original' );
+							$response['profile_pic_normal']   = um_get_user_avatar_url( '', 200 );
+							$response['profile_pic_small']    = um_get_user_avatar_url( '', 40 );
 							break;
-
 						case 'status':
-							$response['status'] = um_user('account_status');
+							$response['status'] = um_user( 'account_status' );
 							break;
-
 						case 'role':
 							//get priority role here
 							$response['role'] = um_user( 'role' );
 							break;
-
 						case 'email':
 						case 'user_email':
-							$response['email'] = um_user('user_email');
+							$response['email'] = um_user( 'user_email' );
 							break;
-
 					}
-
 				}
 			} else {
-
 				foreach ( $user as $key => $val ) {
-					if ( $key != 'data' ) {
+					if ( 'data' !== $key ) {
 						continue;
 					}
 
-					$key = 'profile';
-					$val->roles = $user->roles;
-					$val->first_name = um_user( 'first_name' );
-					$val->last_name = um_user('last_name' );
-					$val->account_status = um_user( 'account_status' );
+					$val->roles                = $user->roles;
+					$val->first_name           = um_user( 'first_name' );
+					$val->last_name            = um_user( 'last_name' );
+					$val->account_status       = um_user( 'account_status' );
 					$val->profile_pic_original = um_get_user_avatar_url( '', 'original' );
-					$val->profile_pic_normal = um_get_user_avatar_url( '', 200 );
-					$val->profile_pic_small = um_get_user_avatar_url( '', 40 );
-					$val->cover_photo = $this->getsrc( um_user( 'cover_photo', 1000 ) );
+					$val->profile_pic_normal   = um_get_user_avatar_url( '', 200 );
+					$val->profile_pic_small    = um_get_user_avatar_url( '', 40 );
+					$val->cover_photo          = $this->getsrc( um_user( 'cover_photo', 1000 ) );
 
-					/**
-					 * UM hook
-					 *
-					 * @type filter
-					 * @title um_rest_userdata
-					 * @description Change output data for Rest API userdata call
-					 * @input_vars
-					 * [{"var":"$value","type":"array","desc":"Output Data"},
-					 * {"var":"$user_id","type":"string","desc":"User ID"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage
-					 * <?php add_filter( 'um_rest_userdata', 'function_name', 10, 2 ); ?>
-					 * @example
-					 * <?php
-					 * add_filter( 'um_rest_userdata', 'my_rest_userdata', 10, 2 );
-					 * function my_rest_userdata( $value, $user_id ) {
-					 *     // your code here
-					 *     return $value;
-					 * }
-					 * ?>
-					 */
-					$val = apply_filters( 'um_rest_userdata', $val, $user->ID );
-					$response = $val;
+					/** This filter is documented in includes/core/rest/class-api-v1.php */
+					$response = apply_filters( 'um_rest_userdata', $val, $user->ID );
 				}
-
 			}
 
 			return $response;
 		}
 
-
 		/**
 		 * Get source
 		 *
@@ -499,13 +404,12 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 		 * @return string
 		 */
 		public function getsrc( $image ) {
-			if (preg_match('/<img.+?src(?: )*=(?: )*[\'"](.*?)[\'"]/si', $image, $arrResult)) {
-				return $arrResult[1];
+			if ( preg_match( '/<img.+?src(?: )*=(?: )*[\'"](.*?)[\'"]/si', $image, $arr_result ) ) {
+				return $arr_result[1];
 			}
 			return '';
 		}
 
-
 		/**
 		 * Retrieve the output format
 		 */
@@ -515,27 +419,24 @@ if ( ! class_exists( 'um\core\rest\API_v1' ) ) {
 			$format = isset( $wp_query->query_vars['format'] ) ? $wp_query->query_vars['format'] : 'json';
 
 			/**
-			 * UM hook
+			 * Filters the REST API output format. JSON by default.
 			 *
-			 * @type filter
-			 * @title um_api_output_format
-			 * @description UM Rest API output format
-			 * @input_vars
-			 * [{"var":"$format","type":"string","desc":"Format"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_api_output_format', 'function_name', 10, 1 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_api_output_format', 'my_api_output_format', 10, 1 );
-			 * function my_api_output_format( $format ) {
+			 * @param {string} $format REST API output format.
+			 *
+			 * @return {string} REST API output format.
+			 *
+			 * @since 1.3.x
+			 * @hook um_api_output_format
+			 *
+			 * @example <caption>Changing the REST API output format.</caption>
+			 * function my_custom_um_api_output_format( $format ) {
 			 *     // your code here
+			 *     $format = 'xml';
 			 *     return $format;
 			 * }
-			 * ?>
+			 * add_filter( 'um_api_output_format', 'my_custom_um_api_output_format' );
 			 */
 			return apply_filters( 'um_api_output_format', $format );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/includes/core/rest/class-api-v2.php b/includes/core/rest/class-api-v2.php
index dcf875d5..3874b827 100644
--- a/includes/core/rest/class-api-v2.php
+++ b/includes/core/rest/class-api-v2.php
@@ -1,13 +1,12 @@
 <?php
 namespace um\core\rest;
 
-
-if ( ! defined( 'ABSPATH' ) ) exit;
-
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 
-
 	/**
 	 * Class API_v2
 	 * @package um\core\rest
@@ -19,7 +18,6 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 		 */
 		const VERSION = '2.0';
 
-
 		/**
 		 * REST_API constructor.
 		 */
@@ -29,7 +27,6 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 			add_filter( 'query_vars', array( $this, 'query_vars' ) );
 		}
 
-
 		/**
 		 * Registers query vars for API access
 		 *
@@ -59,7 +56,6 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 			return $vars;
 		}
 
-
 		/**
 		 * Validate the API request
 		 */
@@ -92,7 +88,6 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 			}
 		}
 
-
 		/**
 		 * Retrieve the user ID based on the public key provided
 		 *
@@ -115,10 +110,10 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 
 			if ( false === $user ) {
 				$user = $wpdb->get_var( $wpdb->prepare(
-					"SELECT user_id 
-					FROM $wpdb->usermeta 
-					WHERE meta_key = 'um_user_public_key' AND 
-					      meta_value = %s 
+					"SELECT user_id
+					FROM $wpdb->usermeta
+					WHERE meta_key = 'um_user_public_key' AND
+					      meta_value = %s
 					LIMIT 1",
 					$key
 				) );
@@ -133,107 +128,65 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 			return false;
 		}
 
-
 		/**
 		 * Process Get users API Request
 		 *
-		 * @param $args
+		 * @param array $args
 		 *
 		 * @return array
 		 */
 		public function get_users( $args ) {
-			/**
-			 * @var int $um_number
-			 * @var string $um_orderby
-			 * @var string $um_order
-			 * @var string $um_include
-			 * @var string $um_exclude
-			 */
-			extract( $args );
-
 			$response = array();
 
-			if ( ! $um_number ) {
-				$um_number = 10;
+			$number  = array_key_exists( 'um_number', $args ) && is_numeric( $args['um_number'] ) ? absint( $args['um_number'] ) : 10;
+			$orderby = array_key_exists( 'um_orderby', $args ) ? sanitize_key( $args['um_orderby'] ) : 'user_registered';
+			$order   = array_key_exists( 'um_order', $args ) ? sanitize_key( $args['um_order'] ) : 'desc';
+
+			$loop_a = array(
+				'number'  => $number,
+				'orderby' => $orderby,
+				'order'   => $order,
+			);
+
+			if ( array_key_exists( 'um_include', $args ) ) {
+				$include           = explode( ',', sanitize_text_field( $args['um_include'] ) );
+				$loop_a['include'] = $include;
 			}
 
-			if ( ! $um_orderby ) {
-				$um_orderby = 'user_registered';
-			}
-
-			if ( ! $um_order ) {
-				$um_order = 'desc';
-			}
-
-			$loop_a = array( 'number' => $um_number, 'orderby' => $um_orderby, 'order' => $um_order );
-
-			if ( $um_include ) {
-				$um_include = explode(',', $um_include );
-				$loop_a['include'] = $um_include;
-			}
-
-			if ( $um_exclude ) {
-				$um_exclude = explode(',', $um_exclude );
-				$loop_a['exclude'] = $um_exclude;
+			if ( array_key_exists( 'um_exclude', $args ) ) {
+				$exclude           = explode( ',', sanitize_text_field( $args['um_exclude'] ) );
+				$loop_a['exclude'] = $exclude;
 			}
 
 			$loop = get_users( $loop_a );
 
 			foreach ( $loop as $user ) {
-
-				unset( $user->data->user_status );
-				unset( $user->data->user_activation_key );
-				unset( $user->data->user_pass );
+				unset( $user->data->user_status, $user->data->user_activation_key, $user->data->user_pass );
 
 				um_fetch_user( $user->ID );
 
 				foreach ( $user as $key => $val ) {
-					if ( $key != 'data' ) {
+					if ( 'data' !== $key ) {
 						continue;
 					}
 
-					$key = 'profile';
-					$val->roles = $user->roles;
-					$val->first_name = um_user( 'first_name' );
-					$val->last_name = um_user( 'last_name' );
-					$val->account_status = um_user( 'account_status' );
+					$val->roles                = $user->roles;
+					$val->first_name           = um_user( 'first_name' );
+					$val->last_name            = um_user( 'last_name' );
+					$val->account_status       = um_user( 'account_status' );
 					$val->profile_pic_original = um_get_user_avatar_url( '', 'original' );
-					$val->profile_pic_normal = um_get_user_avatar_url( '', 200 );
-					$val->profile_pic_small = um_get_user_avatar_url( '', 40 );
-					$val->cover_photo = $this->getsrc( um_user( 'cover_photo', 1000 ) );
+					$val->profile_pic_normal   = um_get_user_avatar_url( '', 200 );
+					$val->profile_pic_small    = um_get_user_avatar_url( '', 40 );
+					$val->cover_photo          = $this->getsrc( um_user( 'cover_photo', 1000 ) );
 
-					/**
-					 * UM hook
-					 *
-					 * @type filter
-					 * @title um_rest_userdata
-					 * @description Change output data for Rest API userdata call
-					 * @input_vars
-					 * [{"var":"$value","type":"array","desc":"Output Data"},
-					 * {"var":"$user_id","type":"string","desc":"User ID"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage
-					 * <?php add_filter( 'um_rest_userdata', 'function_name', 10, 2 ); ?>
-					 * @example
-					 * <?php
-					 * add_filter( 'um_rest_userdata', 'my_rest_userdata', 10, 2 );
-					 * function my_rest_userdata( $value, $user_id ) {
-					 *     // your code here
-					 *     return $value;
-					 * }
-					 * ?>
-					 */
-					$val = apply_filters( 'um_rest_userdata', $val, $user->ID );
-
-					$response[ $user->ID ] = $val;
+					/** This filter is documented in includes/core/rest/class-api-v1.php */
+					$response[ $user->ID ] = apply_filters( 'um_rest_userdata', $val, $user->ID );
 				}
 			}
 
 			return $response;
 		}
 
-
 		/**
 		 * Update user API query
 		 *
@@ -242,64 +195,47 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 		 * @return array
 		 */
 		public function update_user( $args ) {
-			/**
-			 * @var int $um_id
-			 * @var string $um_data
-			 * @var string $um_value
-			 */
-			extract( $args );
-
 			$response = array();
-			$error = array();
+			$error    = array();
 
-			if ( ! $um_id ) {
+			if ( empty( $args['um_id'] ) ) {
 				$error['error'] = __( 'You must provide a user ID', 'ultimate-member' );
 				return $error;
 			}
 
-			if ( ! $um_data ) {
+			if ( empty( $args['um_data'] ) ) {
 				$error['error'] = __( 'You need to provide data to update', 'ultimate-member' );
 				return $error;
 			}
 
-			um_fetch_user( $um_id );
+			if ( ! array_key_exists( 'um_value', $args ) ) {
+				$error['error'] = __( 'You need to provide value to update', 'ultimate-member' );
+				return $error;
+			}
 
-			switch ( $um_data ) {
+			$id    = absint( $args['um_id'] );
+			$data  = sanitize_text_field( $args['um_data'] );
+			$value = sanitize_text_field( $args['um_value'] );
+
+			um_fetch_user( $id );
+
+			switch ( $data ) {
 				case 'status':
-					UM()->user()->set_status( $um_value );
+					UM()->user()->set_status( $value );
 					$response['success'] = __( 'User status has been changed.', 'ultimate-member' );
 					break;
 				case 'role':
-					$wp_user_object = new \WP_User( $um_id );
-					$old_roles = $wp_user_object->roles;
-					$wp_user_object->set_role( $um_value );
+					$wp_user_object = new \WP_User( $id );
+					$old_roles      = $wp_user_object->roles;
+					$wp_user_object->set_role( $value );
 
-					/**
-					 * UM hook
-					 *
-					 * @type action
-					 * @title um_after_member_role_upgrade
-					 * @description Action after user role was changed
-					 * @input_vars
-					 * [{"var":"$new_roles","type":"array","desc":"New User Roles"},
-					 * {"var":"$old_roles","type":"array","desc":"Old roles"}]
-					 * @change_log
-					 * ["Since: 2.0"]
-					 * @usage add_action( 'um_after_member_role_upgrade', 'function_name', 10, 2 );
-					 * @example
-					 * <?php
-					 * add_action( 'um_after_member_role_upgrade', 'my_after_member_role_upgrade', 10, 2 );
-					 * function my_after_member_role_upgrade( $new_roles, $old_roles ) {
-					 *     // your code here
-					 * }
-					 * ?>
-					 */
-					do_action( 'um_after_member_role_upgrade', array( $um_value ), $old_roles, $um_id );
+					/** This action is documented in includes/core/class-user.php */
+					do_action( 'um_after_member_role_upgrade', array( $value ), $old_roles, $id );
 
 					$response['success'] = __( 'User role has been changed.', 'ultimate-member' );
 					break;
 				default:
-					update_user_meta( $um_id, $um_data, esc_attr( $um_value ) );
+					update_user_meta( $id, $data, $value );
 					$response['success'] = __( 'User meta has been changed.', 'ultimate-member' );
 					break;
 			}
@@ -307,35 +243,31 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 			return $response;
 		}
 
-
 		/**
-		 * Process delete user via API
+		 * Process delete user via API.
 		 *
-		 * @param $args
+		 * @param array $args
 		 *
 		 * @return array
 		 */
 		public function delete_user( $args ) {
-			/**
-			 * @var int $um_id
-			 */
-			extract( $args );
-
 			$response = array();
-			$error = array();
+			$error    = array();
 
-			if ( ! isset( $um_id ) ) {
+			if ( empty( $args['um_id'] ) ) {
 				$error['error'] = __( 'You must provide a user ID', 'ultimate-member' );
 				return $error;
 			}
 
-			$user = get_userdata( $um_id );
+			$id = absint( $args['um_id'] );
+
+			$user = get_userdata( $id );
 			if ( ! $user ) {
 				$error['error'] = __( 'Invalid user specified', 'ultimate-member' );
 				return $error;
 			}
 
-			um_fetch_user( $um_id );
+			um_fetch_user( $id );
 			UM()->user()->delete();
 
 			$response['success'] = __( 'User has been successfully deleted.', 'ultimate-member' );
@@ -343,7 +275,6 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 			return $response;
 		}
 
-
 		/**
 		 * Process Get user API Request
 		 *
@@ -352,88 +283,54 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 		 * @return array
 		 */
 		public function get_auser( $args ) {
-			/**
-			 * @var int $um_id
-			 * @var string $um_fields
-			 */
-			extract( $args );
-
 			$response = array();
-			$error = array();
+			$error    = array();
 
-			if ( ! isset( $um_id ) ) {
+			if ( empty( $args['um_id'] ) ) {
 				$error['error'] = __( 'You must provide a user ID', 'ultimate-member' );
 				return $error;
 			}
 
-			$user = get_userdata( $um_id );
+			$id   = absint( $args['um_id'] );
+			$user = get_userdata( $id );
 			if ( ! $user ) {
-				$error['error'] = __('Invalid user specified','ultimate-member');
+				$error['error'] = __( 'Invalid user specified', 'ultimate-member' );
 				return $error;
 			}
 
-			unset( $user->data->user_status );
-			unset( $user->data->user_activation_key );
-			unset( $user->data->user_pass );
+			unset( $user->data->user_status, $user->data->user_activation_key, $user->data->user_pass );
 
 			um_fetch_user( $user->ID );
 
-			if ( isset( $um_fields ) && $um_fields ) {
-				$um_fields = explode(',', $um_fields );
-				$response['ID'] = $user->ID;
+			if ( array_key_exists( 'um_fields', $args ) ) {
+				$fields               = explode( ',', sanitize_text_field( $args['um_fields'] ) );
+				$response['ID']       = $user->ID;
 				$response['username'] = $user->user_login;
-				foreach ( $um_fields as $field ) {
+				foreach ( $fields as $field ) {
 
 					switch ( $field ) {
-
 						default:
-							$response[ $field ] = ( um_profile( $field ) ) ? um_profile( $field ) : '';
+							$profile_data       = um_profile( $field );
+							$response[ $field ] = $profile_data ? $profile_data : '';
 
-							/**
-							 * UM hook
-							 *
-							 * @type filter
-							 * @title um_rest_get_auser
-							 * @description Change output data for Rest API user authentification call
-							 * @input_vars
-							 * [{"var":"$response","type":"array","desc":"Output Data"},
-							 * {"var":"$field","type":"string","desc":"Field Key"},
-							 * {"var":"$user_id","type":"int","desc":"User ID"}]
-							 * @change_log
-							 * ["Since: 2.0"]
-							 * @usage
-							 * <?php add_filter( 'um_rest_get_auser', 'function_name', 10, 3 ); ?>
-							 * @example
-							 * <?php
-							 * add_filter( 'um_rest_get_auser', 'my_rest_get_auser', 10, 3 );
-							 * function my_rest_get_auser( $response, $field, $user_id ) {
-							 *     // your code here
-							 *     return $response;
-							 * }
-							 * ?>
-							 */
+							/** This filter is documented in includes/core/rest/class-api-v1.php */
 							$response = apply_filters( 'um_rest_get_auser', $response, $field, $user->ID );
 							break;
-
 						case 'cover_photo':
 							$response['cover_photo'] = $this->getsrc( um_user( 'cover_photo', 1000 ) );
 							break;
-
 						case 'profile_pic':
 							$response['profile_pic_original'] = um_get_user_avatar_url( '', 'original' );
-							$response['profile_pic_normal'] = um_get_user_avatar_url( '', 200 );
-							$response['profile_pic_small'] = um_get_user_avatar_url( '', 40 );
+							$response['profile_pic_normal']   = um_get_user_avatar_url( '', 200 );
+							$response['profile_pic_small']    = um_get_user_avatar_url( '', 40 );
 							break;
-
 						case 'status':
 							$response['status'] = um_user( 'account_status' );
 							break;
-
 						case 'role':
 							//get priority role here
 							$response['role'] = um_user( 'role' );
 							break;
-
 						case 'email':
 						case 'user_email':
 							$response['email'] = um_user( 'user_email' );
@@ -441,55 +338,28 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 					}
 				}
 			} else {
-
 				foreach ( $user as $key => $val ) {
-					if ( $key != 'data' ) {
+					if ( 'data' !== $key ) {
 						continue;
 					}
-					if ( $key == 'data' ) {
-						$key = 'profile';
-						$val->roles = $user->roles;
-						$val->first_name = um_user( 'first_name' );
-						$val->last_name = um_user( 'last_name' );
-						$val->account_status = um_user( 'account_status' );
-						$val->profile_pic_original = um_get_user_avatar_url( '', 'original' );
-						$val->profile_pic_normal = um_get_user_avatar_url( '', 200 );
-						$val->profile_pic_small = um_get_user_avatar_url( '', 40 );
-						$val->cover_photo = $this->getsrc( um_user( 'cover_photo', 1000 ) );
 
-						/**
-						 * UM hook
-						 *
-						 * @type filter
-						 * @title um_rest_userdata
-						 * @description Change output data for Rest API userdata call
-						 * @input_vars
-						 * [{"var":"$value","type":"array","desc":"Output Data"},
-						 * {"var":"$user_id","type":"string","desc":"User ID"}]
-						 * @change_log
-						 * ["Since: 2.0"]
-						 * @usage
-						 * <?php add_filter( 'um_rest_userdata', 'function_name', 10, 2 ); ?>
-						 * @example
-						 * <?php
-						 * add_filter( 'um_rest_userdata', 'my_rest_userdata', 10, 2 );
-						 * function my_rest_userdata( $value, $user_id ) {
-						 *     // your code here
-						 *     return $value;
-						 * }
-						 * ?>
-						 */
-						$val = apply_filters( 'um_rest_userdata', $val, $user->ID );
-					}
-					$response = $val;
+					$val->roles                = $user->roles;
+					$val->first_name           = um_user( 'first_name' );
+					$val->last_name            = um_user( 'last_name' );
+					$val->account_status       = um_user( 'account_status' );
+					$val->profile_pic_original = um_get_user_avatar_url( '', 'original' );
+					$val->profile_pic_normal   = um_get_user_avatar_url( '', 200 );
+					$val->profile_pic_small    = um_get_user_avatar_url( '', 40 );
+					$val->cover_photo          = $this->getsrc( um_user( 'cover_photo', 1000 ) );
+
+					/** This filter is documented in includes/core/rest/class-api-v1.php */
+					$response = apply_filters( 'um_rest_userdata', $val, $user->ID );
 				}
-
 			}
 
 			return $response;
 		}
 
-
 		/**
 		 * Get source
 		 *
@@ -498,13 +368,12 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 		 * @return string
 		 */
 		public function getsrc( $image ) {
-			if (preg_match('/<img.+?src(?: )*=(?: )*[\'"](.*?)[\'"]/si', $image, $arrResult)) {
-				return $arrResult[1];
+			if ( preg_match( '/<img.+?src(?: )*=(?: )*[\'"](.*?)[\'"]/si', $image, $arr_result ) ) {
+				return $arr_result[1];
 			}
 			return '';
 		}
 
-
 		/**
 		 * Retrieve the output format
 		 */
@@ -513,28 +382,8 @@ if ( ! class_exists( 'um\core\rest\API_v2' ) ) {
 
 			$format = isset( $wp_query->query_vars['um_format'] ) ? $wp_query->query_vars['um_format'] : 'json';
 
-			/**
-			 * UM hook
-			 *
-			 * @type filter
-			 * @title um_api_output_format
-			 * @description UM Rest API output format
-			 * @input_vars
-			 * [{"var":"$format","type":"string","desc":"Format"}]
-			 * @change_log
-			 * ["Since: 2.0"]
-			 * @usage
-			 * <?php add_filter( 'um_api_output_format', 'function_name', 10, 1 ); ?>
-			 * @example
-			 * <?php
-			 * add_filter( 'um_api_output_format', 'my_api_output_format', 10, 1 );
-			 * function my_api_output_format( $format ) {
-			 *     // your code here
-			 *     return $format;
-			 * }
-			 * ?>
-			 */
+			/** This filter is documented in includes/core/rest/class-api-v1.php */
 			return apply_filters( 'um_api_output_format', $format );
 		}
 	}
-}
\ No newline at end of file
+}