From 1e5e1f298d9bbb5892485e60286011cea58e00e5 Mon Sep 17 00:00:00 2001
From: Nikita Sinelnikov <nsinelnikov.work@gmail.com>
Date: Wed, 21 Jul 2021 20:26:33 +0300
Subject: [PATCH] - fixed sanitizing types; - fixed `in_group` attribute
 sanitizing;

---
 assets/dynamic_css/dynamic_global.php        |  4 +--
 includes/admin/class-admin.php               |  8 +++---
 includes/admin/core/class-admin-dragdrop.php |  2 +-
 includes/admin/core/class-admin-settings.php |  8 +++---
 includes/core/class-builtin.php              | 26 +++++++++++---------
 readme.txt                                   |  6 +++++
 ultimate-member.php                          |  2 +-
 7 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/assets/dynamic_css/dynamic_global.php b/assets/dynamic_css/dynamic_global.php
index 101f9c15..2e867156 100644
--- a/assets/dynamic_css/dynamic_global.php
+++ b/assets/dynamic_css/dynamic_global.php
@@ -1,9 +1,9 @@
 <style type="text/css">
 <?php
 
-if ( isset( $max_width ) && $max_width) {
+if ( isset( $max_width ) && $max_width ) {
 print ".um-$form_id.um {
-	max-width: $max_width;
+	max-width: {$max_width};
 }";
 }
 
diff --git a/includes/admin/class-admin.php b/includes/admin/class-admin.php
index 537cc9d8..fe9fe234 100644
--- a/includes/admin/class-admin.php
+++ b/includes/admin/class-admin.php
@@ -405,7 +405,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) {
 						'sanitize' => 'text',
 					),
 					'_um_register_max_width'            => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'_um_register_icons'                => array(
 						'sanitize' => 'key',
@@ -432,7 +432,7 @@ if ( ! class_exists( 'um\admin\Admin' ) ) {
 						'sanitize' => 'text',
 					),
 					'_um_login_max_width'               => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'_um_login_icons'                   => array(
 						'sanitize' => 'key',
@@ -465,10 +465,10 @@ if ( ! class_exists( 'um\admin\Admin' ) ) {
 						'sanitize' => 'text',
 					),
 					'_um_profile_max_width'             => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'_um_profile_area_max_width'        => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'_um_profile_icons'                 => array(
 						'sanitize' => 'key',
diff --git a/includes/admin/core/class-admin-dragdrop.php b/includes/admin/core/class-admin-dragdrop.php
index b8675d00..330c82ca 100644
--- a/includes/admin/core/class-admin-dragdrop.php
+++ b/includes/admin/core/class-admin-dragdrop.php
@@ -131,7 +131,7 @@ if ( ! class_exists( 'um\admin\core\Admin_DragDrop' ) ) {
 				if ( 0 === strpos( $key, 'um_group_' ) ) {
 					$field_key = str_replace( 'um_group_', '', $key );
 					if ( isset( $fields[ $field_key ] ) ) {
-						$fields[ $field_key ]['in_group'] = absint( $value );
+						$fields[ $field_key ]['in_group'] = ! empty( $value ) ? absint( $value ) : '';
 					}
 				}
 			}
diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index a63f4dd7..1aff771d 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -757,10 +757,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 						'sanitize' => 'text',
 					),
 					'profile_max_width'                     => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'profile_area_max_width'                => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'profile_icons'                         => array(
 						'sanitize' => 'key',
@@ -826,7 +826,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 						'sanitize' => 'text',
 					),
 					'register_max_width'                    => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'register_align'                        => array(
 						'sanitize' => 'key',
@@ -853,7 +853,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 						'sanitize' => 'text',
 					),
 					'login_max_width'                       => array(
-						'sanitize' => 'absint',
+						'sanitize' => 'text',
 					),
 					'login_align'                           => array(
 						'sanitize' => 'key',
diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index f079113f..61371bbc 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -655,21 +655,23 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 		 * Predefined Fields
 		 */
 		function set_predefined_fields() {
-
 			global $wp_roles;
-			$role_keys = get_option( 'um_roles', array() );
-			if ( ! empty( $role_keys ) && is_array( $role_keys ) ) {
-				$role_keys = array_map( function( $item ) {
-					return 'um_' . $item;
-				}, $role_keys );
-			} else {
-				$role_keys = array();
+
+			$um_roles = array();
+			if ( ! empty( $wp_roles->roles ) ) {
+				$role_keys = get_option( 'um_roles', array() );
+				if ( ! empty( $role_keys ) && is_array( $role_keys ) ) {
+					$role_keys = array_map( function( $item ) {
+						return 'um_' . $item;
+					}, $role_keys );
+				} else {
+					$role_keys = array();
+				}
+
+				$exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
+				$um_roles = UM()->roles()->get_roles( false, $exclude_roles );
 			}
 
-			$exclude_roles = array_diff( array_keys( $wp_roles->roles ), array_merge( $role_keys, array( 'subscriber' ) ) );
-
-			$um_roles = UM()->roles()->get_roles( false, $exclude_roles );
-
 			/**
 			 * UM hook
 			 *
diff --git a/readme.txt b/readme.txt
index 51993db2..ad5893a2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -155,6 +155,12 @@ 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.2.1: July 22, 2021 =
+
+* Bugfixes:
+  - Fixed: Sanitizing `max-width` value of the Login/Registration/Profile form settings
+  - Fixed: Sanitizing `in_group` field's data
+
 = 2.2.0: July 20, 2021 =
 
 * Enhancements:
diff --git a/ultimate-member.php b/ultimate-member.php
index a17c1585..1ffe6170 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.2.0
+Version: 2.2.1-beta
 Author: Ultimate Member
 Author URI: http://ultimatemember.com/
 Text Domain: ultimate-member