Skip to content

User Registration Captcha #38604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 5 commits into from
Oct 23, 2022
Merged

User Registration Captcha #38604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0e896b
User Registration Captcha
brianteeman Aug 26, 2022
06da352
copy paste error
brianteeman Aug 26, 2022
75e0fbe
loop once
brianteeman Aug 26, 2022
b28ac34
Merge branch '4.2-dev' into captcha
rdeutz Oct 23, 2022
a0a6623
Merge branch '4.3-dev' into captcha
HLeithner Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/com_users/forms/registration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
validDomains="com_users.domains"
autocomplete="email"
/>
</fieldset>

<fieldset name="captcha">
<field
name="captcha"
type="captcha"
Expand Down
19 changes: 19 additions & 0 deletions components/com_users/src/View/Registration/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand Down Expand Up @@ -63,6 +64,15 @@ class HtmlView extends BaseHtmlView
*/
public $document;

/**
* Should we show a captcha form for the submission of the article?
*
* @var boolean
*
* @since 3.7.0
*/
protected $captchaEnabled = false;

/**
* The page class suffix
*
Expand Down Expand Up @@ -101,6 +111,15 @@ public function display($tpl = null)
$this->setLayout($active->query['layout']);
}

$captchaSet = $this->params->get('captcha', Factory::getApplication()->get('captcha', '0'));

foreach (PluginHelper::getPlugin('captcha') as $plugin) {
if ($captchaSet === $plugin->name) {
$this->captchaEnabled = true;
break;
}
}

// Escape strings for HTML output
$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx', ''), ENT_COMPAT, 'UTF-8');

Expand Down
6 changes: 6 additions & 0 deletions components/com_users/tmpl/registration/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
<form id="member-registration" action="<?php echo Route::_('index.php?option=com_users&task=registration.register'); ?>" method="post" class="com-users-registration__form form-validate" enctype="multipart/form-data">
<?php // Iterate through the form fieldsets and display each one. ?>
<?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
<?php if ($fieldset->name === 'captcha' && $this->captchaEnabled) : ?>
<?php continue; ?>
<?php endif; ?>
<?php $fields = $this->form->getFieldset($fieldset->name); ?>
<?php if (count($fields)) : ?>
<fieldset>
Expand All @@ -39,6 +42,9 @@
</fieldset>
<?php endif; ?>
<?php endforeach; ?>
<?php if ($this->captchaEnabled) : ?>
<?php echo $this->form->renderFieldset('captcha'); ?>
<?php endif; ?>
<div class="com-users-registration__submit control-group">
<div class="controls">
<button type="submit" class="com-users-registration__register btn btn-primary validate">
Expand Down