public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-01-07 22:19:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5975 from mailcow/staging

Browse Source 
Automatic PR to nightly from 2024-08-01T03:13:55Z
This commit is contained in:
FreddleSpl0it
2024-08-01 11:07:55 +02:00
committed by GitHub
parent 57bc03b878 cbca306fc1
commit 9b86ff764e
4 changed files with 17 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/inc/functions.inc.php
View File

@@ -1396,7 +1396,7 @@ function unset_tfa_key($_data) {
}
function get_tfa($username = null, $id = null) {
global $pdo;
if (isset($_SESSION['mailcow_cc_username'])) {
if (empty($username) && isset($_SESSION['mailcow_cc_username'])) {
$username = $_SESSION['mailcow_cc_username'];
}
elseif (empty($username)) {

5
data/web/js/site/admin.js
View File

@@ -397,7 +397,10 @@ jQuery(function($){
{
title: lang.host,
data: 'hostname',
defaultContent: ''
defaultContent: '',
render: function (data, type) {
return escapeHtml(data);
}
},
{
title: lang.username,

5
data/web/js/site/debug.js
View File

@@ -325,7 +325,10 @@ jQuery(function($){
title: 'URI',
data: 'uri',
defaultContent: '',
className: 'dtr-col-md dtr-break-all'
className: 'dtr-col-md dtr-break-all',
render: function (data, type) {
return escapeHtml(data);
}
},
{
title: 'Method',