1.10.0

Author: ovx

altcha.php

@@ -7,16 +7,16 @@
  * Description: ALTCHA is a free, open-source CAPTCHA alternative that offers robust protection without using cookies, ensuring full GDPR compliance by design. It also provides invisible anti-spam and anti-bot protection through ALTCHA's API.
  * Author: Altcha.org
  * Author URI: https://altcha.org
- * Version: 1.9.3
- * Stable tag: 1.9.3
+ * Version: 1.10.0
+ * Stable tag: 1.10.0
  * Requires at least: 5.0
  * Requires PHP: 7.3
  * Tested up to: 6.6
  * License: GPLv2 or later
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html  
  */
 
-define('ALTCHA_VERSION', '1.9.3');
+define('ALTCHA_VERSION', '1.10.0');
 define('ALTCHA_WEBSITE', 'https://altcha.org/');
 define('ALTCHA_WIDGET_VERSION', '1.0.0');
 define('ALTCHA_LANGUAGES', [
@@ -65,6 +65,7 @@
 require plugin_dir_path( __FILE__ ) . './integrations/forminator.php';
 require plugin_dir_path( __FILE__ ) . './integrations/html-forms.php';
 require plugin_dir_path( __FILE__ ) . './integrations/gravityforms.php';
+require plugin_dir_path( __FILE__ ) . './integrations/wpdiscuz.php';
 require plugin_dir_path( __FILE__ ) . './integrations/wpforms.php';
 require plugin_dir_path( __FILE__ ) . './integrations/wordpress.php';
 

includes/core.php

@@ -68,6 +68,8 @@ class AltchaPlugin
 
   public static $option_integration_wordpress_comments = "altcha_integration_wordpress_comments";
 
+  public static $option_integration_wpdiscuz = "altcha_integration_wpdiscuz";
+
   public static $option_integration_wpforms = "altcha_integration_wpforms";
 
   public static $html_espace_allowed_tags = array(
@@ -81,6 +83,7 @@ class AltchaPlugin
       'hidefooter' => array(),
       'blockspam' => array(),
       'spamfilter' => array(),
+      'name' => array(),
     ),
     'div' => array(
       'class' => array(),
@@ -224,6 +227,11 @@ public function get_integration_wordpress_comments()
     return trim(get_option(AltchaPlugin::$option_integration_wordpress_comments));
   }
 
+  public function get_integration_wpdiscuz()
+  {
+    return trim(get_option(AltchaPlugin::$option_integration_wpdiscuz));
+  }
+
   public function get_integration_wpforms()
   {
     return trim(get_option(AltchaPlugin::$option_integration_wpforms));
@@ -391,7 +399,7 @@ public function generate_challenge($hmac_key = null, $complexity = null, $expire
     return $response;
   }
 
-  public function get_widget_attrs($mode, $language = null)
+  public function get_widget_attrs($mode, $language = null, $name = null)
   {
     $challengeurl = $this->get_challengeurl();
     $api = $this->get_api();
@@ -408,6 +416,9 @@ public function get_widget_attrs($mode, $language = null)
       'challengeurl' => $challengeurl,
       'strings' => $strings,
     );
+    if ($name) {
+      $attrs['name'] = $name;
+    }
     if ($auto) {
       $attrs['auto'] = $auto;
     }
@@ -432,9 +443,9 @@ public function get_widget_attrs($mode, $language = null)
     return $attrs;
   }
 
-  public function render_widget($mode, $wrap = false, $language = null)
+  public function render_widget($mode, $wrap = false, $language = null, $name = null)
   {
-    $attrs = $this->get_widget_attrs($mode, $language);
+    $attrs = $this->get_widget_attrs($mode, $language, $name);
     $attributes = join(' ', array_map(function ($key) use ($attrs) {
       if (is_bool($attrs[$key])) {
         return $attrs[$key] ? $key : '';

includes/helpers.php

@@ -14,6 +14,8 @@ function altcha_plugin_active($name) {
       return is_plugin_active('html-forms/html-forms.php');
     case 'contact-form-7':
       return is_plugin_active('contact-form-7/wp-contact-form-7.php');
+    case 'wpdiscuz':
+      return is_plugin_active('wpdiscuz/class.WpdiscuzCore.php');
     case 'wpforms':
       return is_plugin_active('wpforms/wpforms.php') || is_plugin_active('wpforms-lite/wpforms.php');
     default:

includes/settings.php

@@ -122,6 +122,11 @@ function altcha_settings_init()
       AltchaPlugin::$option_integration_wordpress_reset_password
     );
 
+    register_setting(
+      'altcha_options',
+      AltchaPlugin::$option_integration_wpdiscuz
+    );
+
     register_setting(
       'altcha_options',
       AltchaPlugin::$option_integration_wpforms
@@ -461,6 +466,26 @@ function altcha_settings_init()
         )
     );
 
+    add_settings_field(
+        'altcha_settings_wpdiscuz_integration_field',
+        'WPDiscuz',
+        'altcha_settings_select_callback',
+        'altcha_admin',
+        'altcha_integrations_settings_section',
+        array(
+            "name" => AltchaPlugin::$option_integration_wpdiscuz,
+            "disabled" => !altcha_plugin_active('wpdiscuz'),
+            "spamfilter_options" => array(
+              "spamfilter",
+              "captcha_spamfilter",
+            ),
+            "options" => array(
+              "" => "Disable",
+              "captcha" => "Captcha",
+              "captcha_spamfilter" => "Captcha + Spam Filter",
+            ),
+        )
+    );
 
     add_settings_field(
         'altcha_settings_wpforms_integration_field',

integrations/wordpress.php

@@ -8,7 +8,7 @@ function () {
     $plugin = AltchaPlugin::$instance;
     $mode = $plugin->get_integration_wordpress_register();
     if (!empty($mode)) {
-      altcha_wordpress_comments_render_widget($mode, true);
+      altcha_wordpress_comments_render_widget($mode, 'altcha_register');
     }
   },
   10,
@@ -21,7 +21,7 @@ function ($user_login, $user_email, $errors) {
     $plugin = AltchaPlugin::$instance;
     $mode = $plugin->get_integration_wordpress_register();
     if (!empty($mode)) {
-      $altcha = isset($_POST['altcha']) ? trim(sanitize_text_field($_POST['altcha'])) : '';
+      $altcha = isset($_POST['altcha_register']) ? trim(sanitize_text_field($_POST['altcha_register'])) : '';
       if ($plugin->verify($altcha) === false) {
         return $errors->add(
           'altcha_error_message',
@@ -41,7 +41,7 @@ function () {
     $plugin = AltchaPlugin::$instance;
     $mode = $plugin->get_integration_wordpress_login();
     if (!empty($mode)) {
-      altcha_wordpress_comments_render_widget($mode, true);
+      altcha_wordpress_comments_render_widget($mode);
     }
   },
   10,
@@ -74,7 +74,7 @@ function () {
     $plugin = AltchaPlugin::$instance;
     $mode = $plugin->get_integration_wordpress_reset_password();
     if (!empty($mode)) {
-      altcha_wordpress_comments_render_widget($mode, true);
+      altcha_wordpress_comments_render_widget($mode);
     }
   },
   10,
@@ -135,7 +135,7 @@ function ($comment) {
       return $comment;
     }
     $plugin = AltchaPlugin::$instance;
-    $mode = $plugin->get_integration_wordpress_comments();
+    $mode = (altcha_plugin_active('wpdiscuz') && $plugin->get_integration_wpdiscuz()) || $plugin->get_integration_wordpress_comments();
     if (!empty($mode)) {
       $altcha = isset($_POST['altcha']) ? trim(sanitize_text_field($_POST['altcha'])) : '';
       if ($plugin->verify($altcha) === false) {
@@ -148,10 +148,10 @@ function ($comment) {
   1
 );
 
-function altcha_wordpress_comments_render_widget($mode, $full_width = false)
+function altcha_wordpress_comments_render_widget($mode, $name = null)
 {
   $plugin = AltchaPlugin::$instance;
   altcha_enqueue_scripts();
   altcha_enqueue_styles();
-  echo wp_kses($plugin->render_widget($mode, true), AltchaPlugin::$html_espace_allowed_tags);
+  echo wp_kses($plugin->render_widget($mode, true, null, $name), AltchaPlugin::$html_espace_allowed_tags);
 }

integrations/wpdiscuz.php

@@ -0,0 +1,22 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) exit;
+
+add_action(
+  'wpdiscuz_button_actions',
+  function () {
+    $plugin = AltchaPlugin::$instance;
+    $mode = $plugin->get_integration_wpdiscuz();
+    if (!empty($mode)) {
+      $plugin = AltchaPlugin::$instance;
+      altcha_enqueue_scripts();
+      altcha_enqueue_styles();
+      $output = "<div class=\"altcha-widget-wrap-wpdiscuz\">";
+      $output .= $plugin->render_widget($mode, false);
+      $output .= "</div>";
+      echo wp_kses($output, AltchaPlugin::$html_espace_allowed_tags);
+    }
+  },
+  10,
+  0
+);

public/altcha.css

@@ -14,6 +14,16 @@
   display: block;
 }
 
+.altcha-widget-wrap-wpdiscuz {
+  display: flex;
+  justify-content: end;
+  margin-bottom: 0.5rem;
+}
+
+.altcha-widget-wrap-wpdiscuz > * {
+  min-width: 260px;
+}
+
 .login .altcha:not([data-floating]) {
   --altcha-max-width: 100%;
 }

readme.txt

@@ -2,8 +2,8 @@
 Tags: altcha, captcha, spam, anti-spam, anti-bot, antispam, recaptcha, hcaptcha, gdpr
 Author: Altcha.org
 Author URI: https://altcha.org
-Version: 1.9.3
-Stable tag: 1.9.3
+Version: 1.10.0
+Stable tag: 1.10.0
 Requires at least: 5.0
 Requires PHP: 7.3
 Tested up to: 6.6
@@ -67,6 +67,7 @@ This plugin requires the WordPress REST API. If you are using any "Disable REST
 * Forminator
 * GravityForms
 * HTML Forms
+* WPDiscuz
 * WPForms
 * WordPress Login, Register, Password reset
 * WordPress Comments
@@ -94,6 +95,9 @@ All source code for the plugin, and the ALTCHA widget is available on GitHub. In
 
 == Changelog ==
 
+= 1.10.0 =
+* Added support for WPDiscuz
+
 = 1.9.3 =
 * Fix REST API Cache-Control header