From 380170613c3a8ccec68ff3d7e547c31db94de81c Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Wed, 18 Jan 2023 09:12:55 +0100
Subject: [PATCH] refs #22747 [finc] adapt new captcha from (VUFIND-1379)
(#1574)
---
themes/finc/templates/Auth/AbstractBase/resetpassword.phtml | 2 +-
themes/finc/templates/layout/layout.phtml | 6 +++---
themes/finc/templates/myresearch/account.phtml | 2 +-
themes/finc/templates/myresearch/newpassword.phtml | 2 +-
themes/finc/templates/record/pdaform.phtml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
index ed63456d5f7..4f04a7199c3 100644
--- a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
+++ b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml
@@ -27,7 +27,7 @@ $this->headTitle($this->translate('Reset Password'));
<label class="control-label"><?=$this->transEsc('Email')?>:</label>
<input type="email" class="form-control" name="email" <?=isset($email) ? 'value="' . $email . '" ' : ''?>autocomplete="email" required/>
</div>
- <?=$this->recaptcha()->html($this->useRecaptcha)?>
+ <?=$this->captcha()->html($this->useRecaptcha)?>
<div class="form-group">
<input class="btn btn-transparent" name="submit" type="submit" aria-label="submit form" value="<?=$this->transEsc('recovery_title')?>"/>
</div>
diff --git a/themes/finc/templates/layout/layout.phtml b/themes/finc/templates/layout/layout.phtml
index 88bdc236b6a..a96b33e8288 100644
--- a/themes/finc/templates/layout/layout.phtml
+++ b/themes/finc/templates/layout/layout.phtml
@@ -278,9 +278,9 @@ if (!isset($this->layout()->searchbox)) {
<div class="offcanvas-overlay" data-toggle="offcanvas"></div>
<?=$this->googleanalytics()?>
<?=$this->piwik()?>
- <?php if ($this->recaptcha()->active()): ?>
- <?=$this->inlineScript(\Zend\View\Helper\HeadScript::FILE, "https://www.google.com/recaptcha/api.js?onload=recaptchaOnLoad&render=explicit&hl=" . $this->layout()->userLang, 'SET')?>
- <?php endif; ?>
+ <?php foreach ($this->captcha()->js() as $jsInclude):?>
+ <?=$this->inlineScript(\Laminas\View\Helper\HeadScript::FILE, $jsInclude, 'SET')?>
+ <?php endforeach; ?>
<?php /* Enable Tooltips, finc-specific, CK */ ?>
<script>
$(document).ready(function () {
diff --git a/themes/finc/templates/myresearch/account.phtml b/themes/finc/templates/myresearch/account.phtml
index e79e7f8c2e3..8dc4d8fb97b 100644
--- a/themes/finc/templates/myresearch/account.phtml
+++ b/themes/finc/templates/myresearch/account.phtml
@@ -13,7 +13,7 @@
<form method="post" name="accountForm" id="accountForm" class="form-user-create" data-toggle="validator" role="form">
<?=$this->auth()->getCreateFields()?>
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
+ <?=$this->captcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-userlogin') ?>"><i class="fa fa-chevron-left" aria-hidden="true"></i> <?=$this->transEsc('Back')?></a>
<?php /* finc uses 'form-button-submit' here */ ?>
diff --git a/themes/finc/templates/myresearch/newpassword.phtml b/themes/finc/templates/myresearch/newpassword.phtml
index 51cf3d15c7d..07ea5b7b73d 100644
--- a/themes/finc/templates/myresearch/newpassword.phtml
+++ b/themes/finc/templates/myresearch/newpassword.phtml
@@ -29,7 +29,7 @@
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/>
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth_method) ?>" name="auth_method"/>
<?=$this->auth()->getNewPasswordForm() ?>
- <?=$this->recaptcha()->html($this->useRecaptcha) ?>
+ <?=$this->captcha()->html($this->useRecaptcha) ?>
<div class="form-group">
<?php /* finc uses 'form-button-submit' */ ?>
<input class="btn btn-primary" name="submit" type="submit" value="<?=$this->transEsc('form-button-submit')?>" />
diff --git a/themes/finc/templates/record/pdaform.phtml b/themes/finc/templates/record/pdaform.phtml
index ab7cb443865..6a0c0299845 100644
--- a/themes/finc/templates/record/pdaform.phtml
+++ b/themes/finc/templates/record/pdaform.phtml
@@ -33,7 +33,7 @@ $this->layout()->breadcrumbs = '<li>' . $this->searchMemory()->getLastSearchLink
</div>
<div class="form-group">
<span>
- <?=$this->recaptcha()->html($this->useRecaptcha)?>
+ <?=$this->captcha()->html($this->useRecaptcha)?>
</span>
<input type="submit" class="btn btn-primary" role="button" name="submit" value="<?=$this->transEsc('Submit')?>"/>
<?= $this->externalLink(
--
GitLab