From b2a67974bdf40ba3b94a9c8e27967e339daba1d4 Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Tue, 31 Oct 2017 15:49:48 +0200
Subject: [PATCH] - hotfix, removed PHP notices and warnings;

---
 includes/admin/core/um-admin-filters-fields.php |  5 +++++
 includes/admin/templates/dashboard/cache.php    |  4 ++--
 includes/core/um-actions-form.php               |  3 +++
 includes/core/um-actions-profile.php            | 14 +++++++++-----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/includes/admin/core/um-admin-filters-fields.php b/includes/admin/core/um-admin-filters-fields.php
index 69034286..8b625c0d 100644
--- a/includes/admin/core/um-admin-filters-fields.php
+++ b/includes/admin/core/um-admin-filters-fields.php
@@ -7,22 +7,27 @@
 	function um_admin_pre_save_field_to_form( $array ){
 		unset( $array['conditions'] );
 		if ( isset($array['conditional_field']) && !empty( $array['conditional_action'] ) && !empty( $array['conditional_operator'] ) ) {
+			$array['conditional_value'] = ! empty( $array['conditional_value'] ) ? $array['conditional_value'] : '';
 			$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'] );
 		}
 
 		if ( isset($array['conditional_field1']) && !empty( $array['conditional_action1'] ) && !empty( $array['conditional_operator1'] ) ) {
+			$array['conditional_value1'] = ! empty( $array['conditional_value1'] ) ? $array['conditional_value1'] : '';
 			$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'] );
 		}
 
 		if ( isset($array['conditional_field2']) && !empty( $array['conditional_action2'] ) && !empty( $array['conditional_operator2'] ) ) {
+			$array['conditional_value2'] = ! empty( $array['conditional_value2'] ) ? $array['conditional_value2'] : '';
 			$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'] );
 		}
 
 		if ( isset($array['conditional_field3']) && !empty( $array['conditional_action3'] ) && !empty( $array['conditional_operator3'] ) ) {
+			$array['conditional_value3'] = ! empty( $array['conditional_value3'] ) ? $array['conditional_value3'] : '';
 			$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'] );
 		}
 
 		if ( isset($array['conditional_field4']) && !empty( $array['conditional_action4'] ) && !empty( $array['conditional_operator4'] ) ) {
+			$array['conditional_value4'] = ! empty( $array['conditional_value4'] ) ? $array['conditional_value4'] : '';
 			$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'] );
 		}
 
diff --git a/includes/admin/templates/dashboard/cache.php b/includes/admin/templates/dashboard/cache.php
index 779c25af..e9161ec9 100644
--- a/includes/admin/templates/dashboard/cache.php
+++ b/includes/admin/templates/dashboard/cache.php
@@ -3,9 +3,9 @@
 $all_options = wp_load_alloptions();
 
 $count = 0;
-foreach( $all_options as $k => $v ) {
+foreach ( $all_options as $k => $v ) {
 	
-	if ( strstr( $k, 'um_cache_userdata_' ) ) {
+	if ( strstr( $k, 'um_cache_userdata_' ) !== false ) {
 		$count++;
 	}
 	
diff --git a/includes/core/um-actions-form.php b/includes/core/um-actions-form.php
index 7e49972a..4ce3f273 100644
--- a/includes/core/um-actions-form.php
+++ b/includes/core/um-actions-form.php
@@ -150,6 +150,9 @@
 					foreach ( $array['conditions'] as $condition ) {
                         list( $visibility, $parent_key, $op, $parent_value ) = $condition;
 
+						if ( ! isset( $args[ $parent_key ] ) )
+							continue;
+
                         $cond_value = ( $fields[ $parent_key ]['type'] == 'radio' ) ? $args[ $parent_key ][0] : $args[ $parent_key ];
 
 						if ( $visibility == 'hide' ) {
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 3c3a09db..a5ee6d2c 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -748,14 +748,17 @@
 	 * @param  integer $user_id
 	 * @param  array   $arr_files
 	 */
-	add_action( "um_before_user_upload", "um_before_user_upload", 10, 2 );
 	function um_before_user_upload( $user_id, $arr_files ) {
 		um_fetch_user( $user_id );
 
-		foreach ($arr_files as $key => $filename) {
-			if (um_user( $key )) {
-				if (basename( $filename ) != basename( um_user( $key ) ) || in_array( $old_filename, array( basename( um_user( $key ) ), basename( $filename ) ) ) || $filename == 'empty_file') {
-					$old_filename = um_user( $key );
+		foreach ( $arr_files as $key => $filename ) {
+			if ( um_user( $key ) ) {
+				$old_filename = um_user( $key );
+
+				if ( basename( $filename ) != basename( um_user( $key ) ) ||
+					in_array( $old_filename, array( basename( um_user( $key ) ), basename( $filename ) ) ) ||
+					$filename == 'empty_file' ) {
+
 					$path = UM()->files()->upload_basedir;
 					delete_user_meta( $user_id, $old_filename );
 					if (file_exists( $path . $user_id . '/' . $old_filename )) {
@@ -765,3 +768,4 @@
 			}
 		}
 	}
+	add_action( "um_before_user_upload", "um_before_user_upload", 10, 2 );
\ No newline at end of file