From 5740bc637db26821d3a228b20b0aec86d46bcc21 Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Wed, 3 Mar 2021 13:13:44 +0200
Subject: [PATCH] - fixed: PHP notices and warnings - fixed: security
 vulnerability with User Account page and password field

---
 includes/core/class-external-integrations.php |  2 +-
 includes/core/class-fields.php                |  3 +++
 includes/core/um-actions-account.php          |  4 ++++
 includes/core/um-filters-fields.php           | 13 +++++++++++++
 includes/um-short-functions.php               | 12 +++++++++---
 readme.txt                                    |  4 +++-
 ultimate-member.php                           |  2 +-
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/includes/core/class-external-integrations.php b/includes/core/class-external-integrations.php
index 262f970b..db6c1698 100644
--- a/includes/core/class-external-integrations.php
+++ b/includes/core/class-external-integrations.php
@@ -146,7 +146,7 @@ if ( ! class_exists( 'um\core\External_Integrations' ) ) {
 		 */
 		function forumwp_fix() {
 			if ( function_exists( 'FMWP' ) ) {
-				remove_filter( 'single_template', array( FMWP()->shortcodes(), 'cpt_template' ) );
+				remove_filter( 'single_template', array( FMWP()->frontend()->shortcodes(), 'cpt_template' ) );
 			}
 		}
 
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 9a9970e0..befe7ea3 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -3741,11 +3741,14 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			$sort_col = array();
 			foreach ( $arr as $key => $row ) {
 				if ( $key == 'form_id' ) {
+					unset( $arr['form_id'] );
 					continue;
 				}
 
 				if ( isset( $row[ $col ] ) ) {
 					$sort_col[ $key ] = $row[ $col ];
+				} else {
+					unset( $arr[ $key ] );
 				}
 			}
 
diff --git a/includes/core/um-actions-account.php b/includes/core/um-actions-account.php
index d445515d..7a5f4c1f 100644
--- a/includes/core/um-actions-account.php
+++ b/includes/core/um-actions-account.php
@@ -276,6 +276,10 @@ function um_submit_account_details( $args ) {
 			continue;
 		}
 
+		if ( $k == 'single_user_password' ) {
+			continue;
+		}
+
 		$changes[ $k ] = $v;
 	}
 
diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php
index 23163dfb..efa19b20 100644
--- a/includes/core/um-filters-fields.php
+++ b/includes/core/um-filters-fields.php
@@ -441,7 +441,20 @@ function um_get_custom_field_array( $array, $fields ) {
 
 	if ( ! empty( $array['conditions'] ) ) {
 		foreach ( $array['conditions'] as $key => $value ) {
+			if ( ! isset( $value[1] ) ) {
+				continue;
+			}
+
+			if ( empty( $fields[ $value[1] ] ) ) {
+				continue;
+			}
+
+			if ( empty( $fields[ $value[1] ]['metakey'] ) ) {
+				continue;
+			}
+
 			$condition_metakey = $fields[ $value[1] ]['metakey'];
+
 			if ( isset( $_POST[ $condition_metakey ] ) ) {
 				$cond_value = ( $fields[ $value[1] ]['type'] == 'radio' ) ? $_POST[ $condition_metakey ][0] : $_POST[ $condition_metakey ];
 				list( $visibility, $parent_key, $op, $parent_value ) = $value;
diff --git a/includes/um-short-functions.php b/includes/um-short-functions.php
index 2b2bff36..67c4c4f3 100644
--- a/includes/um-short-functions.php
+++ b/includes/um-short-functions.php
@@ -1555,8 +1555,14 @@ function um_can_view_field( $data ) {
 				if ( ! is_user_logged_in() ) {
 					$can_view = false;
 				} else {
-					if ( ! um_is_user_himself() && ( empty( $current_user_roles ) || ( ! empty( $data['roles'] ) && count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 ) ) ) {
-						$can_view = false;
+					if ( ! um_is_core_page( 'profile' ) ) {
+						if ( empty( $current_user_roles ) || ( ! empty( $data['roles'] ) && count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 ) ) {
+							$can_view = false;
+						}
+					} else {
+						if ( ! um_is_user_himself() && ( empty( $current_user_roles ) || ( ! empty( $data['roles'] ) && count( array_intersect( $current_user_roles, $data['roles'] ) ) <= 0 ) ) ) {
+							$can_view = false;
+						}
 					}
 				}
 				break;
@@ -1885,7 +1891,7 @@ function um_youtube_id_from_url( $url ) {
 		([\w-]{10,12})  # Allow 10-12 for 11 char youtube id.
 		$%x';
 	$result = preg_match( $pattern, $url, $matches );
-	if (false !== $result) {
+	if ( false !== $result && isset( $matches[1] ) ) {
 		return $matches[1];
 	}
 
diff --git a/readme.txt b/readme.txt
index 7f08d3f5..c9d00e94 100644
--- a/readme.txt
+++ b/readme.txt
@@ -155,9 +155,11 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
 * To learn more about version 2.1 please see this [docs](https://docs.ultimatemember.com/article/1512-upgrade-2-1-0)
 * UM2.1+ is a significant update to the Member Directories' code base from 2.0.x. Please make sure you take a full-site backup with restore point before updating the plugin
 
-= 2.1.16: March xx, 2021 =
+= 2.1.16: March 9, 2021 =
 
 * Bugfixes:
+  - Fixed PHP notices and warnings
+  - Fixed security vulnerability with User Account page and password field
   - Fixed user creating without username but based on first+last name with not-ASCII symbols
 
 = 2.1.15: December 24, 2020 =
diff --git a/ultimate-member.php b/ultimate-member.php
index 1e2d9c31..ec522c41 100644
--- a/ultimate-member.php
+++ b/ultimate-member.php
@@ -3,7 +3,7 @@
 Plugin Name: Ultimate Member
 Plugin URI: http://ultimatemember.com/
 Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
-Version: 2.1.16-alpha1
+Version: 2.1.16-beta1
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 Text Domain: ultimate-member