diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php index f4ae6f5d..8773ee3b 100644 --- a/includes/admin/core/class-admin-metabox.php +++ b/includes/admin/core/class-admin-metabox.php @@ -1130,7 +1130,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) { } } - update_post_meta( $post_id, '_um_search_filters_gmt', intval( $_POST['um-gmt-offset'] ) ); + update_post_meta( $post_id, '_um_search_filters_gmt', (int) $_POST['um-gmt-offset'] ); } diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index 548b2524..84cccd32 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -2689,7 +2689,7 @@ Require a strong password: info_value( UM()->options()->get(' --- UM Access Configuration --- Panic Key: options()->get('panic_key') . "\n"; ?> -Global Site Access: options()->get('accessible') ) ] . "\n"; ?> +Global Site Access: options()->get('accessible') ] . "\n"; ?> options()->get('accessible') == 2 ) { ?> Custom Redirect URL: options()->get('access_redirect')."\n";?> Exclude the following URLs:options()->get('access_exclude_uris') )."\n";?> diff --git a/includes/core/class-form.php b/includes/core/class-form.php index ed224c4d..6c8fec39 100644 --- a/includes/core/class-form.php +++ b/includes/core/class-form.php @@ -98,7 +98,7 @@ if ( ! class_exists( 'um\core\Form' ) ) { $arr_options['status'] = 'success'; $arr_options['post'] = $_POST; - UM()->fields()->set_id = intval( $_POST['form_id'] ); + UM()->fields()->set_id = absint( $_POST['form_id'] ); UM()->fields()->set_mode = 'profile'; $form_fields = UM()->fields()->get_fields(); $arr_options['fields'] = $form_fields; diff --git a/includes/core/class-member-directory-meta.php b/includes/core/class-member-directory-meta.php index 1cc99839..af70f0b8 100644 --- a/includes/core/class-member-directory-meta.php +++ b/includes/core/class-member-directory-meta.php @@ -308,14 +308,14 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) { $values_array = array(); foreach ( $value as $single_val ) { - $single_val = stripslashes( $single_val ); + $single_val = trim( stripslashes( $single_val ) ); - $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value LIKE %s", '%"' . trim( $single_val ) . '"%' ); - $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value LIKE %s", '%' . serialize( strval( trim( $single_val ) ) ) . '%' ); - $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value = %s", trim( $single_val ) ); + $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value LIKE %s", '%"' . $single_val . '"%' ); + $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value LIKE %s", '%' . serialize( (string) $single_val ) . '%' ); + $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value = %s", $single_val ); if ( is_numeric( $single_val ) ) { - $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value LIKE %s", '%' . serialize( intval( trim( $single_val ) ) ) . '%' ); + $values_array[] = $wpdb->prepare( "{$join_slug}{$i}.um_value LIKE %s", '%' . serialize( (int) $single_val ) . '%' ); } } @@ -629,7 +629,7 @@ if ( ! class_exists( 'um\core\Member_Directory_Meta' ) ) { $search_like_string = apply_filters( 'um_member_directory_meta_search_like_type', '%' . $search_line . '%', $search_line ); - $this->where_clauses[] = $wpdb->prepare( "( umm_search.um_value = %s OR umm_search.um_value LIKE %s OR umm_search.um_value LIKE %s OR {$core_search}{$additional_search})", $search_line, $search_like_string, '%' . serialize( strval( $search_line ) ) . '%' ); + $this->where_clauses[] = $wpdb->prepare( "( umm_search.um_value = %s OR umm_search.um_value LIKE %s OR umm_search.um_value LIKE %s OR {$core_search}{$additional_search})", $search_line, $search_like_string, '%' . serialize( (string) $search_line ) . '%' ); $this->is_search = true; } diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index ca231bc1..c85abbf2 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -1429,18 +1429,20 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { if ( ! empty( $_POST['search'] ) ) { // complex using with change_meta_sql function + $search = trim( stripslashes( $_POST['search'] ) ); + $meta_query = array( 'relation' => 'OR', array( - 'value' => trim( stripslashes( $_POST['search'] ) ), + 'value' => $search, 'compare' => '=', ), array( - 'value' => trim( stripslashes( $_POST['search'] ) ), + 'value' => $search, 'compare' => 'LIKE', ), array( - 'value' => trim( serialize( strval( stripslashes( $_POST['search'] ) ) ) ), + 'value' => serialize( (string) $search ), 'compare' => 'LIKE', ), ); @@ -1614,22 +1616,22 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { $field_query = array( 'relation' => 'OR' ); foreach ( $value as $single_val ) { - $single_val = stripslashes( $single_val ); + $single_val = trim( stripslashes( $single_val ) ); $arr_meta_query = array( array( 'key' => $field, - 'value' => trim( $single_val ), + 'value' => $single_val, 'compare' => '=', ), array( 'key' => $field, - 'value' => serialize( strval( trim( $single_val ) ) ), + 'value' => serialize( (string) $single_val ), 'compare' => 'LIKE', ), array( 'key' => $field, - 'value' => '"' . trim( $single_val ) . '"', + 'value' => '"' . $single_val . '"', 'compare' => 'LIKE', ) ); @@ -1638,7 +1640,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { $arr_meta_query[] = array( 'key' => $field, - 'value' => serialize( intval( trim( $single_val ) ) ), + 'value' => serialize( (int) $single_val ), 'compare' => 'LIKE', ); @@ -1883,20 +1885,22 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { $field_query = array( 'relation' => 'OR' ); foreach ( $value as $single_val ) { + $single_val = trim( $single_val ); + $arr_meta_query = array( array( 'key' => $field, - 'value' => trim( $single_val ), + 'value' => $single_val, 'compare' => '=', ), array( 'key' => $field, - 'value' => serialize( strval( trim( $single_val ) ) ), + 'value' => serialize( (string) $single_val ), 'compare' => 'LIKE', ), array( 'key' => $field, - 'value' => '"' . trim( $single_val ) . '"', + 'value' => '"' . $single_val . '"', 'compare' => 'LIKE', ) ); @@ -1905,7 +1909,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { $arr_meta_query[] = array( 'key' => $field, - 'value' => serialize( intval( trim( $single_val ) ) ), + 'value' => serialize( (int) $single_val ), 'compare' => 'LIKE', ); diff --git a/includes/core/class-password.php b/includes/core/class-password.php index d19a9ba8..f6d3c059 100644 --- a/includes/core/class-password.php +++ b/includes/core/class-password.php @@ -471,7 +471,7 @@ if ( ! class_exists( 'um\core\Password' ) ) { } $attempts = (int) get_user_meta( $user_id, 'password_rst_attempts', true ); - $is_admin = user_can( intval( $user_id ),'manage_options' ); + $is_admin = user_can( absint( $user_id ),'manage_options' ); if ( UM()->options()->get( 'enable_reset_password_limit' ) ) { // if reset password limit is set diff --git a/includes/core/class-profile.php b/includes/core/class-profile.php index 1567491b..84d6e205 100644 --- a/includes/core/class-profile.php +++ b/includes/core/class-profile.php @@ -192,7 +192,7 @@ if ( ! class_exists( 'um\core\Profile' ) ) { if ( isset( $tab_data['default_privacy'] ) ) { $privacy = $tab_data['default_privacy']; } else { - $privacy = intval( UM()->options()->get( 'profile_tab_' . $tab . '_privacy' ) ); + $privacy = (int) UM()->options()->get( 'profile_tab_' . $tab . '_privacy' ); } $privacy = apply_filters( 'um_profile_menu_tab_privacy', $privacy, $tab ); diff --git a/includes/core/class-user.php b/includes/core/class-user.php index e882e4f2..8efac0f6 100644 --- a/includes/core/class-user.php +++ b/includes/core/class-user.php @@ -2013,7 +2013,7 @@ if ( ! class_exists( 'um\core\User' ) ) { * */ function user_exists_by_id( $user_id ) { - $aux = get_userdata( intval( $user_id ) ); + $aux = get_userdata( absint( $user_id ) ); if ( $aux == false ) { return false; } else { diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php index aecee7ea..67826f1b 100644 --- a/includes/core/um-actions-profile.php +++ b/includes/core/um-actions-profile.php @@ -733,9 +733,9 @@ function um_profile_dynamic_meta_desc() { - - - + + + @@ -743,7 +743,7 @@ function um_profile_dynamic_meta_desc() { - + diff --git a/readme.txt b/readme.txt index 3d1e97b7..3f0f480d 100644 --- a/readme.txt +++ b/readme.txt @@ -155,7 +155,7 @@ 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.13: November xx, 2020 = += 2.1.13: December 8, 2020 = * Enhancements: @@ -168,6 +168,10 @@ The plugin works with popular caching plugins by automatically excluding Ultimat - Fixed: Getting page content of the GDPR privacy policies - Fixed: Password strength validation for Unicode symbols +* Tweaks: + + - There are changed PHP’s intval(), strval(), floatval(), and boolval() typecasting functions to (int), (string), (float) and (bool) regarding [this doc](https://make.wordpress.org/core/2020/11/20/miscellaneous-developer-focused-changes-in-wordpress-5-6/). + = 2.1.12: October 29, 2020 = * Enhancements: