From 7817a1b544f50ae795367358777c8af65c743b6a Mon Sep 17 00:00:00 2001
From: Maxime Besson <maxime.besson@worteks.com>
Date: Wed, 20 Apr 2022 09:58:44 +0200
Subject: [PATCH] Update templates for new Captcha API (#2692)

---
 .../site/templates/bootstrap/certificateReset.tpl    | 12 ++----------
 .../site/templates/bootstrap/gpgform.tpl             |  4 ++--
 .../site/templates/bootstrap/mail.tpl                |  4 ++--
 .../site/templates/bootstrap/register.tpl            |  4 ++--
 .../site/templates/bootstrap/standardform.tpl        |  4 ++--
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl b/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
index 0db7faf2d..c7cfca581 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/certificateReset.tpl
@@ -28,16 +28,8 @@
         <input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control"  trplaceholder="mail" required />
       </div>
 
-      <TMPL_IF NAME=CAPTCHA_SRC>
-        <div class="form-group">
-          <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
-        </div>
-        <div class="input-group mb-3">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><label for="captchafield" class="mb-0"><i class="fa fa-eye"></i></label></span>
-          </div>
-          <input id="captchafield" type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" trplaceholder="captcha" required autocomplete="off" />
-        </div>
+      <TMPL_IF NAME=CAPTCHA_HTML>
+        <TMPL_VAR NAME=CAPTCHA_HTML>
       </TMPL_IF>
       <TMPL_IF NAME="TOKEN">
         <input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
index d5925390d..fc2582c17 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
@@ -15,8 +15,8 @@
     <textarea id="passwordfield" name="password" class="form-control" trplaceholder="Signed text" required aria-required="true"></textarea>
   </div>
 
-  <TMPL_IF NAME=CAPTCHA_SRC>
-    <TMPL_INCLUDE NAME="captcha.tpl">
+  <TMPL_IF NAME=CAPTCHA_HTML>
+    <TMPL_VAR NAME=CAPTCHA_HTML>
   </TMPL_IF>
   <input id="token" type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
 
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
index 88ff8b7bf..3417c854d 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@@ -71,8 +71,8 @@
         <span trspan="resentConfirm">Do you want the confirmation mail to be resent?</span>
       </p>
 
-      <TMPL_IF NAME=CAPTCHA_SRC>
-        <TMPL_INCLUDE NAME="captcha.tpl">
+      <TMPL_IF NAME=CAPTCHA_HTML>
+        <TMPL_VAR NAME=CAPTCHA_HTML>
       </TMPL_IF>
 
       <div class="input-group mb-3">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
index 8b421a049..c02241240 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
@@ -40,8 +40,8 @@
       <input id="mailfield" name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required aria-required="true" autocomplete="email" />
     </div>
 
-    <TMPL_IF NAME=CAPTCHA_SRC>
-      <TMPL_INCLUDE NAME="captcha.tpl">
+    <TMPL_IF NAME=CAPTCHA_HTML>
+      <TMPL_VAR NAME=CAPTCHA_HTML>
     </TMPL_IF>
     <TMPL_IF NAME="TOKEN">
       <input id="token" type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
index e24fc1d56..c6af84745 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
@@ -33,8 +33,8 @@
     </TMPL_IF>
   </div>
 
-  <TMPL_IF NAME=CAPTCHA_SRC>
-    <TMPL_INCLUDE NAME="captcha.tpl">
+  <TMPL_IF NAME=CAPTCHA_HTML>
+    <TMPL_VAR NAME=CAPTCHA_HTML>
   </TMPL_IF>
 
   <TMPL_INCLUDE NAME="impersonation.tpl">