Merge pull request #1064 from ultimatemember/development/2.4.3

Development/2.4.3

includes/admin/core/class-admin-menu.php

@@ -121,7 +121,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Menu' ) ) {
 				return;
 			}
 
-			$count = UM()->user()->get_pending_users_count();
+			$count = UM()->query()->get_pending_users_count();
 			if ( is_array( $menu ) ) {
 				foreach ( $menu as $key => $menu_item ) {
 					if ( 0 === strpos( $menu_item[0], _x( 'Users', 'Admin menu name' ) ) ) {

includes/admin/core/class-admin-notices.php

@@ -440,6 +440,10 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
 					$messages[0]['content'] = __( 'Your user cache is now removed.', 'ultimate-member' );
 					break;
 
+				case 'cleared_status_cache':
+					$messages[0]['content'] = __( 'Your user statuses cache is now removed.', 'ultimate-member' );
+					break;
+
 				case 'got_updates':
 					$messages[0]['content'] = __( 'You have the latest updates.', 'ultimate-member' );
 					break;
@@ -528,13 +532,13 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
 					continue;
 
 				if ( ( is_object( $license ) && 'inactive' == $license->license ) || 'inactive' == $license ) {
-					$arr_inactive_license_keys[ ] = $license->item_name;
+					$arr_inactive_license_keys[] = $license->item_name;
 				}
 
 				$invalid_license++;
 			}
 
-			if ( ! empty(  $arr_inactive_license_keys ) ) {
+			if ( ! empty( $arr_inactive_license_keys ) ) {
 				$this->add_notice( 'license_key', array(
 					'class'     => 'error',
 					'message'   => '<p>' . sprintf( __( 'There are %d inactive %s license keys for this site. This site is not authorized to get plugin updates. You can active this site on <a href="%s">www.ultimatemember.com</a>.', 'ultimate-member' ), count( $arr_inactive_license_keys ) , ultimatemember_plugin_name, UM()->store_url ) . '</p>',

includes/admin/core/class-admin-users.php

@@ -411,7 +411,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
 				'rejected'                    => __( 'Rejected', 'ultimate-member' ),
 			);
 
-			UM()->query()->count_users_by_status( 'unassigned' );
+			// set default statuses if not already done
+			UM()->setup()->set_default_user_status();
 
 			foreach ( $status as $k => $v ) {
 				if ( isset( $_REQUEST['um_status'] ) && sanitize_key( $_REQUEST['um_status'] ) === $k ) {

includes/admin/core/packages/2.5.0/functions.php

@@ -0,0 +1,44 @@
+<?php if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+
+function um_upgrade_phone_fields250() {
+	UM()->admin()->check_ajax_nonce();
+
+	um_maybe_unset_time_limit();
+
+	$forms_query = new \WP_Query;
+	$forms       = $forms_query->query( array(
+		'post_type'      => 'um_form',
+		'posts_per_page' => -1,
+		'fields'         => 'ids',
+	) );
+
+	foreach ( $forms as $form_id ) {
+		$forms_fields = get_post_meta( $form_id, '_um_custom_fields', true );
+		if ( ! is_array( $forms_fields ) ) {
+			continue;
+		}
+
+		$need_update = false;
+		foreach ( $forms_fields as $key => &$field ) {
+			if ( in_array( $key, array( 'phone_number', 'mobile_number' ), true ) ) {
+				$field['type'] = 'tel';
+				$need_update = true;
+			}
+		}
+
+		if ( $need_update ) {
+			update_post_meta( $form_id, '_um_custom_fields', $forms_fields );
+		}
+	}
+
+	// remove cached option with users count, don't create separate AJAX upgrade for that
+	delete_option( 'um_cached_users_queue' );
+
+	// delete temporarily option for fields upgrade
+	update_option( 'um_last_version_upgrade', '2.5.0' );
+
+	wp_send_json_success( array( 'message' => __( 'Phone Number and Mobile Number fields have been successfully updated.', 'ultimate-member' ) ) );
+}

includes/admin/core/packages/2.5.0/hooks.php

@@ -0,0 +1,5 @@
+<?php if ( ! defined( 'ABSPATH' ) ) exit;
+
+return array(
+	'phone_fields250' => 'phone_fields250',
+);

includes/admin/core/packages/2.5.0/init.php

@@ -0,0 +1,30 @@
+<?php if ( ! defined( 'ABSPATH' ) ) exit; ?>
+
+
+<script type="text/javascript">
+	jQuery( document ).ready( function() {
+		um_add_upgrade_log( '<?php echo esc_js( __( 'Updated phone number fields in the UM Forms fields...', 'ultimate-member' ) ) ?>' );
+
+		jQuery.ajax({
+			url: wp.ajax.settings.url,
+			type: 'POST',
+			dataType: 'json',
+			data: {
+				action: 'um_phone_fields250',
+				nonce: um_admin_scripts.nonce
+			},
+			success: function( response ) {
+				if ( typeof response.data.message != 'undefined' ) {
+					um_add_upgrade_log( response.data.message );
+					//switch to the next package
+					um_run_upgrade();
+				} else {
+					um_wrong_ajax();
+				}
+			},
+			error: function() {
+				um_something_wrong();
+			}
+		});
+	});
+</script>