Version bump to 3.2.0.1 for public release

Squashed with the following commits : commit 28dec28 (HEAD -> develop, origin/develop) Author: Lekhnath Pandey <lekhnath005@gmail.com> Date: Thu Apr 25 15:32:12 2024 +0545 Fix - Execute Migration Script while zip file uploaded commit 50e8928 Author: Ranjan Khanal <83644457+zhea-son@users.noreply.github.com> Date: Thu Apr 25 10:02:52 2024 +0545 Fix - Form doesn't work when File Upload is required. (#700) * Fix - File upload required validation * Fix - Divide for zero number field validation. commit fae9540 Author: Ranjan Khanal <83644457+zhea-son@users.noreply.github.com> Date: Thu Apr 25 10:01:54 2024 +0545 Fix - Frontend Validation ignore for conditionally hidden required fields. (#701) commit d7d998b Author: Lekhnath Pandey <lekhnath005@gmail.com> Date: Thu Apr 25 09:50:03 2024 +0545 Tweak - Introduce new hook to modify token expiration duration
wpeverest · Apr 25, 2024 · 28503fd · 28503fd
1 parent 5838b6b
commit 28503fd
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 22,613 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,10 @@
+= 3.2.0.1  - 25/04/2024 =
+* Tweak    - Introduce new hook to modify token expiration duration.
+* Fix      - Unable to submit form due to TypeError.
+* Fix      - Divide by zero error on number validation.
+* Fix      - Required Field error message for conditionally hidden fields.
+* Fix      - Execute Migration Script while zip file upload.
+
 = 3.2.0    - 15/04/2024 =
 * Feature  - Dashboard Page.
 * Feature  - Automatic user login after email confirmation and reset password.

diff --git a/assets/js/frontend/user-registration-form-validator.js b/assets/js/frontend/user-registration-form-validator.js
@@ -210,6 +210,9 @@
 					validClass: "user-registration-valid",
 					ignore: function (index, element) {
 						// Return true to ignore the element, false to include it in validation
+						if ( $(element).closest(".ur-field-item").is(":hidden") ) {
+							return true;
+						}
 						return (
 							element.id &&
 							(element.id.startsWith("billing_") ||

diff --git a/assets/js/frontend/user-registration-form-validator.min.js b/assets/js/frontend/user-registration-form-validator.min.js
diff --git a/includes/admin/class-ur-admin.php b/includes/admin/class-ur-admin.php
@@ -22,6 +22,7 @@ class UR_Admin {
 	public function __construct() {
 		add_action( 'init', array( $this, 'includes' ) );
 		add_action( 'init', array( $this, 'translation_migration' ) );
+		add_action( 'init', array( $this, 'run_migration_script' ) );
 		add_action( 'current_screen', array( $this, 'conditional_includes' ) );
 		add_action( 'admin_init', array( $this, 'prevent_admin_access' ), 10, 2 );
 		add_action( 'load-users.php', array( $this, 'live_user_read' ), 10, 2 );
@@ -39,6 +40,18 @@ public function __construct() {
 		add_filter( 'display_post_states', array( $this, 'ur_add_post_state' ), 10, 2 );
 	}
 
+	/**
+	 * Execute migration script if version is not similar.
+	 *
+	 * @since 4.2.0.1
+	 */
+	public function run_migration_script() {
+		if ( UR_VERSION !== get_option( 'user_registration_version' ) ) {
+			UR_Install::maybe_run_migrations();
+			update_option( 'user_registration_version', UR_VERSION );
+		}
+	}
+
 	/**
 	 * Translation Migration for Payments, Content Restriction and Frontend Listing.
 	 */

diff --git a/includes/class-ur-email-confirmation.php b/includes/class-ur-email-confirmation.php
@@ -236,7 +236,14 @@ public function check_token_before_authenticate() {
 			$login_option = ur_get_user_login_option( $user_id );
 
 			if ( $user_token === $_GET['ur_token'] && ( 'email_confirmation' === $login_option || 'admin_approval_after_email_confirmation' === $login_option ) ) {
-				if ( isset( $output[1] ) && time() > ( $output[1] + 60 * 60 * 24 ) ) {
+				$token_expiration_duration = 24 * 60 * 60;
+                /**
+				 * Filter hook to modify the token expiration duration.
+				 * Default email confirmation token expiration duration is 24 hour.
+				 */
+                $token_expiration_duration = apply_filters('user_registration_email_confirmation_token_expiration_duration', $token_expiration_duration );
+
+				if (isset($output[1]) && time() > ($output[1] + $token_expiration_duration)) {
 					add_filter( 'login_message', array( $this, 'custom_token_expired_message' ) );
 					add_filter( 'user_registration_login_form_before_notice', array( $this, 'custom_token_expired_message' ) );
 				} else {

diff --git a/includes/class-ur-install.php b/includes/class-ur-install.php
@@ -278,7 +278,7 @@ private static function maybe_add_installation_date() {
 	 *
 	 * @return void
 	 */
-	private static function maybe_run_migrations() {
+	public static function maybe_run_migrations() {
 
 		include_once 'functions-ur-update.php';
 

diff --git a/includes/form/class-ur-form-field-number.php b/includes/form/class-ur-form-field-number.php
@@ -125,28 +125,30 @@ function ( $msg ) use ( $label, $message ) {
 
 		if ( isset( $single_form_field->advance_setting->step ) && '' !== $single_form_field->advance_setting->step ) {
 			$step = $single_form_field->advance_setting->step;
-			if ( floatval( $value ) % floatval( $step ) != 0 ) {
-				$message = array(
-					/* translators: %s - validation message */
-					$label       => sprintf( __( 'Please enter multiple of %d', 'user-registration' ), $step ),
-					'individual' => true,
-				);
-				add_filter(
-					$filter_hook,
-					function ( $msg ) use ( $label, $message ) {
-
-						if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX && ! ur_option_checked( 'user_registration_ajax_form_submission_on_edit_profile', false ) ) {
-							return sprintf( $message[ $label ] );
-						} else {
-
-							wp_send_json_error(
-								array(
-									'message' => $message,
-								)
-							);
+			if ( $step ) {
+				if ( floatval( $value ) % floatval( $step ) != 0 ) {
+					$message = array(
+						/* translators: %s - validation message */
+						$label       => sprintf( __( 'Please enter multiple of %d', 'user-registration' ), $step ),
+						'individual' => true,
+					);
+					add_filter(
+						$filter_hook,
+						function ( $msg ) use ( $label, $message ) {
+
+							if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX && ! ur_option_checked( 'user_registration_ajax_form_submission_on_edit_profile', false ) ) {
+								return sprintf( $message[ $label ] );
+							} else {
+
+								wp_send_json_error(
+									array(
+										'message' => $message,
+									)
+								);
+							}
 						}
-					}
-				);
+					);
+				}
 			}
 		}
 	}

diff --git a/includes/validation/class-ur-validation.php b/includes/validation/class-ur-validation.php
@@ -27,8 +27,9 @@ class UR_Validation {
 	 * @return boolean or WP_Error.
 	 */
 	public static function required( $value ) {
-		if ( empty( trim( $value ) ) ) { //phpcs:ignore;
-			if ( is_numeric( trim( $value ) ) || '0' === trim( $value ) ) {
+		$value = is_array( $value ) ? $value : trim( $value );
+		if ( empty( $value ) ) { //phpcs:ignore;
+			if ( is_numeric( $value ) || '0' === $value ) {
 				return true;
 			}
 

diff --git a/languages/user-registration.pot b/languages/user-registration.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the User Registration plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: User Registration 3.2.0\n"
+"Project-Id-Version: User Registration 3.2.0.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/user-registration\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-04-16T05:02:54+00:00\n"
+"POT-Creation-Date: 2024-04-25T10:17:56+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
 "X-Domain: user-registration\n"
@@ -999,7 +999,7 @@ msgstr ""
 
 #. translators: 1: Newly registered user count 2: User
 #: includes/admin/class-ur-admin-user-list-manager.php:220
-#: includes/admin/class-ur-admin.php:411
+#: includes/admin/class-ur-admin.php:424
 msgid "User"
 msgid_plural "Users"
 msgstr[0] ""
@@ -1113,41 +1113,41 @@ msgstr ""
 msgid "Skip to Dashboard"
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:93
+#: includes/admin/class-ur-admin.php:106
 msgid "UR My Account Page"
 msgstr ""
 
 #. translators: 1: User Registration 2:: five stars
-#: includes/admin/class-ur-admin.php:208
+#: includes/admin/class-ur-admin.php:221
 msgid "If you like %1$s please leave us a %2$s rating. A huge thanks in advance!"
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:210
+#: includes/admin/class-ur-admin.php:223
 msgid "Thank You!"
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:222
+#: includes/admin/class-ur-admin.php:235
 msgid "Thank you for using User Registration."
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:247
+#: includes/admin/class-ur-admin.php:260
 msgid "Bravo! 💪 Well done."
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:311
+#: includes/admin/class-ur-admin.php:324
 msgid "Contribute to the enhancement"
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:361
+#: includes/admin/class-ur-admin.php:374
 msgid "User Registration Plugin Survey"
 msgstr ""
 
 #. translators: 1: Newly registered user count 2: User
-#: includes/admin/class-ur-admin.php:411
+#: includes/admin/class-ur-admin.php:424
 msgid "%1$d new %2$s registered."
 msgstr ""
 
-#: includes/admin/class-ur-admin.php:468
+#: includes/admin/class-ur-admin.php:481
 msgid "Could not verify nonce"
 msgstr ""
 
@@ -3204,7 +3204,7 @@ msgstr ""
 #. translators: %s - Redirect URL.
 #. translators: %s - Username
 #. translators: %s - Lost password URL
-#: includes/class-ur-email-confirmation.php:420
+#: includes/class-ur-email-confirmation.php:427
 #: includes/class-ur-user-approval.php:207
 #: includes/class-ur-user-approval.php:212
 #: includes/class-ur-user-approval.php:236
@@ -3226,14 +3226,14 @@ msgid "ERROR:"
 msgstr ""
 
 #. translators: %s - Resend Verification Link.
-#: includes/class-ur-email-confirmation.php:420
+#: includes/class-ur-email-confirmation.php:427
 #: includes/class-ur-user-approval.php:249
 #: includes/class-ur-user-approval.php:291
 msgid "Your account is still pending approval. Verify your email by clicking on the link sent to your email. %s"
 msgstr ""
 
 #. translators: %s - Resend Verification Link.
-#: includes/class-ur-email-confirmation.php:420
+#: includes/class-ur-email-confirmation.php:427
 #: includes/class-ur-user-approval.php:249
 #: includes/class-ur-user-approval.php:291
 msgid "Resend Verification Link"
@@ -5198,7 +5198,7 @@ msgid "Please enter a value greater than %d"
 msgstr ""
 
 #. translators: %s - validation message
-#: includes/form/class-ur-form-field-number.php:131
+#: includes/form/class-ur-form-field-number.php:132
 msgid "Please enter multiple of %d"
 msgstr ""
 
@@ -5239,7 +5239,7 @@ msgstr ""
 #. translators: %d - Size
 #: includes/form/class-ur-form-field-text.php:108
 #: includes/form/class-ur-form-field-textarea.php:106
-#: includes/validation/class-ur-validation.php:177
+#: includes/validation/class-ur-validation.php:178
 msgid "Please enter number of words less than %d"
 msgstr ""
 
@@ -5253,7 +5253,7 @@ msgstr ""
 #. translators: %d - Size
 #: includes/form/class-ur-form-field-text.php:162
 #: includes/form/class-ur-form-field-textarea.php:160
-#: includes/validation/class-ur-validation.php:195
+#: includes/validation/class-ur-validation.php:196
 msgid "Please enter number of words at least %d"
 msgstr ""
 
@@ -6234,45 +6234,45 @@ msgstr ""
 msgid "Please enter a valid value for %s."
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:37
+#: includes/validation/class-ur-validation.php:38
 msgid "Please enter a valid value"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:53
+#: includes/validation/class-ur-validation.php:54
 msgid "Please enter a numeric value"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:69
+#: includes/validation/class-ur-validation.php:70
 msgid "Please input a valid email"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:88
+#: includes/validation/class-ur-validation.php:89
 msgid "Please input a valid url"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:105
+#: includes/validation/class-ur-validation.php:106
 msgid "Please input a valid date"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:123
+#: includes/validation/class-ur-validation.php:124
 msgid "Please input a valid value"
 msgstr ""
 
 #. translators: %d - Size
-#: includes/validation/class-ur-validation.php:141
+#: includes/validation/class-ur-validation.php:142
 msgid "Please enter value of length less than %d"
 msgstr ""
 
 #. translators: %d - Size
-#: includes/validation/class-ur-validation.php:159
+#: includes/validation/class-ur-validation.php:160
 msgid "Please enter value of length at least %d"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:211
+#: includes/validation/class-ur-validation.php:212
 msgid "Please enter an integer value"
 msgstr ""
 
-#: includes/validation/class-ur-validation.php:227
+#: includes/validation/class-ur-validation.php:228
 msgid "Please enter a non negative value"
 msgstr ""