Refactor Math Captcha plugin and fix dependency handling.

Removed unnecessary parameters and extra spaces for cleaner code. Improved dependency check logic to ensure compatibility with Ultimate Member and fixed admin notice HTML sanitization. Updated plugin version to 1.1.2.

Author: nikitasinelnikov

includes/class-um-math-captcha.php

@@ -21,23 +21,20 @@ class UM_Math_Captcha {
 	 */
 	public $cpa;
 
-
 	/**
 	 * Math Captcha field's name
 	 *
 	 * @var string
 	 */
 	public $key = 'um_math_challenge';
 
-
 	/**
 	 * An instance of the class.
 	 *
 	 * @var UM_Math_Captcha
 	 */
 	private static $instance;
 
-
 	/**
 	 * Creates an instance of the class.
 	 *
@@ -50,7 +47,6 @@ public static function instance() {
 		return self::$instance;
 	}
 
-
 	/**
 	 * UM_Math_Captch constructor.
 	 */
@@ -60,17 +56,14 @@ public function __construct() {
 		}
 		$this->cpa = new MathCaptcha();
 
-		add_action( 'um_after_register_fields', array( $this, 'add_field' ), 10, 1 );
-		add_action( 'um_submit_form_errors_hook__registration', array( $this, 'validate' ), 10, 2 );
+		add_action( 'um_after_register_fields', array( $this, 'add_field' ) );
+		add_action( 'um_submit_form_errors_hook__registration', array( $this, 'validate' ) );
 	}
 
-
 	/**
 	 * Add Math Captcha field to the registration form.
-	 *
-	 * @param array $args UM form data.
 	 */
-	public function add_field( $args ) {
+	public function add_field() {
 		$this->cpa->reset_captcha();
 
 		$field_data = array(
@@ -86,35 +79,30 @@ public function add_field( $args ) {
 		);
 
 		$data = apply_filters( "um_get_field__{$this->key}", $field_data );
-
 		?>
-			<div class="um-field um-field-text">
-				<?php echo UM()->fields()->field_label( $data['label'], $this->key, $data ); ?>
-				<div class="um-field-area">
-					<input type="text" name="<?php echo esc_attr( $data['name'] ); ?>" value="" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" />
-				</div>
+		<div class="um-field um-field-text">
+			<?php echo UM()->fields()->field_label( $data['label'], $this->key, $data ); ?>
+			<div class="um-field-area">
+				<input type="text" name="<?php echo esc_attr( $data['name'] ); ?>" value="" placeholder="<?php echo esc_attr( $data['placeholder'] ); ?>" />
 			</div>
+		</div>
 		<?php
-
 		if ( UM()->fields()->is_error( $this->key ) ) {
 			$text = UM()->fields()->show_error( $this->key );
 			echo UM()->fields()->field_error( $text, $this->key );
 		}
 	}
 
-
 	/**
 	 * Validate Math Captcha field when the registration form has been submitted.
 	 *
 	 * @param array $post_form Submission array.
-	 * @param array $form_data UM form data.
 	 */
-	public function validate( $post_form, $form_data ) {
+	public function validate( $post_form ) {
 		if ( empty( $post_form[ $this->key ] ) ) {
 			UM()->form()->add_error( $this->key, __( 'Math Captcha is required.', 'um-math-captcha' ) );
 		} elseif ( ! $this->cpa->validate( $post_form[ $this->key ] ) ) {
 			UM()->form()->add_error( $this->key, __( 'Incorrect answer. Please try again.', 'um-math-captcha' ) );
 		}
 	}
-
-}
+}

um-math-captcha.php

@@ -11,8 +11,8 @@
  * Requires at least: 6.5
  * Requires PHP: 7.4
  * UM version: 2.9.0
- * Version: 1.1.1
- *
+ * Version: 1.1.2
+ * Requires Plugins: ultimate-member
  * @package um_ext\um_math_captcha
  */
 
@@ -37,13 +37,19 @@
 	function um_math_captcha_check_dependencies() {
 		if ( ! defined( 'um_path' ) || ! function_exists( 'UM' ) || ! UM()->dependencies()->ultimatemember_active_check() ) {
 			// Ultimate Member is not active.
-			add_action(
-				'admin_notices',
-				function () {
-					// translators: %s - plugin name.
-					echo '<div class="error"><p>' . wp_kses_post( sprintf( __( 'The <strong>%s</strong> extension requires the Ultimate Member plugin to be activated to work properly. You can download it <a href="https://wordpress.org/plugins/ultimate-member">here</a>', 'um-math-captcha' ), um_math_captcha_extension ) ) . '</p></div>';
-				}
-			);
+			function um_math_captcha_dependencies() {
+				$allowed_html = array(
+					'a'      => array(
+						'href'   => array(),
+						'target' => true,
+					),
+					'strong' => array(),
+					'br'     => array(),
+				);
+				// translators: %s - plugin name.
+				echo '<div class="error"><p>' . wp_kses( sprintf( __( 'The <strong>%s</strong> extension requires the Ultimate Member plugin to be activated to work properly. You can download it <a href="https://wordpress.org/plugins/ultimate-member">here</a>', 'um-math-captcha' ), um_math_captcha_extension ), $allowed_html ) . '</p></div>';
+			}
+			add_action( 'admin_notices', 'um_math_captcha_dependencies' );
 		} else {
 			require_once 'includes/class-um-math-captcha.php';
 			UM()->set_class( 'Math_Captcha', true );