diff --git a/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml b/themes/finc/templates/Auth/AbstractBase/resetpassword.phtml index ed63456d5f7021511cfd29ab0f268c7175593362..4f04a7199c3ec15bcebcd70371826b357999939f 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 88bdc236b6a6acebea9f3a5c6fabcbdb0293d94f..a96b33e8288f222db5daf4a09b6891f14cd8a3c2 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 e79e7f8c2e3334ca63ee4cf23dc1d3736028ddbd..8dc4d8fb97b17446d2f13803d29ccf4d02c563b1 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 51cf3d15c7d086e2d03ea4ae1af03578f642484c..07ea5b7b73d5ee0291392639af7898425ca6197f 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 ab7cb4438655e44e234fa26104d70738ca39a50a..6a0c02998457f4486b38a42f181441c3c7b76d6a 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(