git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/footer.inc.php b/mailcow/src/mailcow-dockerized/data/web/inc/footer.inc.php
index 9c08c66..61d81df 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/footer.inc.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/footer.inc.php
@@ -17,14 +17,49 @@
}
$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']);
}
+// map tfa details for twig
+$pending_tfa_authmechs = [];
+foreach($_SESSION['pending_tfa_methods'] as $authdata){
+ $pending_tfa_authmechs[$authdata['authmech']] = false;
+}
+if (isset($pending_tfa_authmechs['webauthn'])) {
+ $pending_tfa_authmechs['webauthn'] = true;
+}
+if (!isset($pending_tfa_authmechs['webauthn'])
+ && isset($pending_tfa_authmechs['yubi_otp'])) {
+ $pending_tfa_authmechs['yubi_otp'] = true;
+}
+if (!isset($pending_tfa_authmechs['webauthn'])
+ && !isset($pending_tfa_authmechs['yubi_otp'])
+ && isset($pending_tfa_authmechs['totp'])) {
+ $pending_tfa_authmechs['totp'] = true;
+}
+if (isset($pending_tfa_authmechs['u2f'])) {
+ $pending_tfa_authmechs['u2f'] = true;
+}
+
+// globals
$globalVariables = [
+ 'mailcow_info' => array(
+ 'version_tag' => $GLOBALS['MAILCOW_GIT_VERSION'],
+ 'last_version_tag' => $GLOBALS['MAILCOW_LAST_GIT_VERSION'],
+ 'git_owner' => $GLOBALS['MAILCOW_GIT_OWNER'],
+ 'git_repo' => $GLOBALS['MAILCOW_GIT_REPO'],
+ 'git_project_url' => $GLOBALS['MAILCOW_GIT_URL'],
+ 'git_commit' => $GLOBALS['MAILCOW_GIT_COMMIT'],
+ 'git_commit_date' => $GLOBALS['MAILCOW_GIT_COMMIT_DATE'],
+ 'mailcow_branch' => $GLOBALS['MAILCOW_BRANCH'],
+ 'updated_at' => $GLOBALS['MAILCOW_UPDATEDAT']
+ ),
'js_path' => '/cache/'.basename($JSPath),
- 'pending_tfa_method' => @$_SESSION['pending_tfa_method'],
+ 'pending_tfa_methods' => @$_SESSION['pending_tfa_methods'],
+ 'pending_tfa_authmechs' => $pending_tfa_authmechs,
'pending_mailcow_cc_username' => @$_SESSION['pending_mailcow_cc_username'],
'lang_footer' => json_encode($lang['footer']),
'lang_acl' => json_encode($lang['acl']),