mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-17 19:23:27 +02:00
[WIP] New GoogleReCAPTCHA code
Support for v3 v2-invisible doesn't work yet
This commit is contained in:
@@ -104,19 +104,25 @@
|
||||
|
||||
{{ hook('HOOK_ACCOUNT_CREATE_AFTER_PASSWORDS') }}
|
||||
|
||||
{% if config.recaptcha_enabled %}
|
||||
<tr>
|
||||
<td class="LabelV" style="width: 150px">
|
||||
<span{% if errors.verification[0] is defined %} class="red"{% endif %}>Verification:</span>
|
||||
</td>
|
||||
<td>
|
||||
<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-theme="{{ config.recaptcha_theme }}"></div>
|
||||
</td>
|
||||
</tr>
|
||||
{% if errors.verification is defined %}
|
||||
<tr><td></td><td><span class="FormFieldError">{{ errors.verification }}</span></td></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if config.recaptcha_enabled %}
|
||||
{% if config.recaptcha_type == 'v3' %}
|
||||
<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
|
||||
{% elseif config.recaptcha_type == 'v2-invisible' %}
|
||||
<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-bind="login-submit"></div>
|
||||
{% elseif config.recaptcha_type == 'v2-checkbox' %}
|
||||
<tr>
|
||||
<td class="LabelV" style="width: 150px">
|
||||
<span{% if errors.verification[0] is not null %} class="red"{% endif %}>Verification:</span>
|
||||
</td>
|
||||
<td>
|
||||
<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-theme="{{ config.recaptcha_theme }}"></div>
|
||||
</td>
|
||||
</tr>
|
||||
{% if errors.verification is defined %}
|
||||
<tr><td></td><td><span class="FormFieldError">{{ errors.verification }}</span></td></tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{{ hook('HOOK_ACCOUNT_CREATE_AFTER_RECAPTCHA') }}
|
||||
</tbody>
|
||||
@@ -334,3 +340,7 @@
|
||||
</form>
|
||||
{{ hook('HOOK_ACCOUNT_CREATE_AFTER_FORM') }}
|
||||
<script type="text/javascript" src="tools/check_name.js"></script>
|
||||
{% if config.recaptcha_enabled and config.recaptcha_type == 'v3' %}
|
||||
{% set action = 'register' %}
|
||||
{{ include('google_recaptcha_v3.html.twig') }}
|
||||
{% endif %}
|
@@ -39,6 +39,22 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="?s
|
||||
<td><input type="checkbox" id="remember_me" name="remember_me" value="true" />
|
||||
<label for="remember_me"> Remember me</label></td>
|
||||
</tr>
|
||||
{% if config.recaptcha_enabled %}
|
||||
{% if config.recaptcha_type == 'v3' %}
|
||||
<input type="hidden" name="g-recaptcha-response" id="g-recaptcha-response" />
|
||||
{% elseif config.recaptcha_type == 'v2-invisible' %}
|
||||
<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-bind="login-submit"></div>
|
||||
{% elseif config.recaptcha_type == 'v2-checkbox' %}
|
||||
<tr>
|
||||
<td class="LabelV" style="width: 150px">
|
||||
<span{% if error is not null %} class="red"{% endif %}>Verification:</span>
|
||||
</td>
|
||||
<td>
|
||||
<div class="g-recaptcha" data-sitekey="{{ config.recaptcha_site_key }}" data-theme="{{ config.recaptcha_theme }}"></div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if error is not null %}
|
||||
<tr><td></td><td><span class="FormFieldError">{{ error }}</span></td></tr>
|
||||
{% endif %}
|
||||
@@ -73,4 +89,8 @@ Please enter your account {{ account|lower }} and your password.<br/><a href="?s
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</table>
|
||||
{% if config.recaptcha_enabled and config.recaptcha_type == 'v3' %}
|
||||
{% set action = 'login' %}
|
||||
{{ include('google_recaptcha_v3.html.twig') }}
|
||||
{% endif %}
|
11
system/templates/google_recaptcha_v3.html.twig
Normal file
11
system/templates/google_recaptcha_v3.html.twig
Normal file
@@ -0,0 +1,11 @@
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
grecaptcha.ready(function() {
|
||||
grecaptcha.execute('{{ config.recaptcha_site_key }}', {action: '{{ action }}'}).then(function(token) {
|
||||
if (token) {
|
||||
document.getElementById('g-recaptcha-response').value = token;
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
Reference in New Issue
Block a user