From 68abd6a535938f84918d4168781a6aae1270efa5 Mon Sep 17 00:00:00 2001
From: FreddlePat <p.schult95@outlook.de>
Date: Wed, 12 Jan 2022 21:57:21 +0100
Subject: [PATCH] migrating from u2f-api.js to webauthn

---
 data/web/inc/footer.inc.php  | 3 ++-
 data/web/templates/base.twig | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/web/inc/footer.inc.php b/data/web/inc/footer.inc.php
index 9c08c663..fedc7cdc 100644
--- a/data/web/inc/footer.inc.php
+++ b/data/web/inc/footer.inc.php
@@ -17,7 +17,8 @@ if (is_array($alertbox_log_parser)) {
   }
   $alert = array_filter(array_unique($alerts));
   foreach($alert as $alert_type => $alert_msg) {
-    $alerts[$alert_type] = implode('<hr class="alert-hr">', $alert_msg);
+    // html breaks from mysql alerts, replace ` with '
+    $alerts[$alert_type] = implode('<hr class="alert-hr">', str_replace("`", "'", $alert_msg));
   }
   unset($_SESSION['return']);
 }
diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
index 96728878..47d71b9c 100644
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -181,7 +181,7 @@ function recursiveBase64StrToArrayBuffer(obj) {
       backdrop: 'static',
       keyboard: false
     });
-    $('#webauthn_status_auth').html('<p><i class="bi bi-arrow-repeat icon-spin"></i> ' + lang_tfa.init_u2f + '</p>');
+    $('#webauthn_status_auth').html('<p><i class="bi bi-arrow-repeat icon-spin"></i> ' + lang_tfa.init_webauthn + '</p>');
     $('#ConfirmTFAModal').on('shown.bs.modal', function(){
       $(this).find('input[name=token]').focus();
       // If WebAuthn