7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nightly' into feature/sso

Browse Source
This commit is contained in:
Patrick Schult
2023-08-08 09:47:17 +02:00
committed by GitHub
parent 75c76dd1b7 0004677054
commit aa4c18ff09
96 changed files with 1849 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/web/admin.php
View File

@@ -85,6 +85,12 @@ $iam_settings = identity_provider('get');
// mbox templates
$mbox_templates = mailbox('get', 'mailbox_templates');
// cors settings
$cors_settings = cors('get');
$cors_settings['allowed_origins'] = str_replace(", ", "\n", $cors_settings['allowed_origins']);
$cors_settings['allowed_methods'] = explode(", ", $cors_settings['allowed_methods']);
$template = 'admin.twig';
$template_data = [
'tfa_data' => $tfa_data,
@@ -113,6 +119,7 @@ $template_data = [
'show_rspamd_global_filters' => @$_SESSION['show_rspamd_global_filters'],
'iam_settings' => $iam_settings,
'mbox_templates' => $mbox_templates,
'cors_settings' => $cors_settings,
'lang_admin' => json_encode($lang['admin']),
'lang_datatables' => json_encode($lang['datatables'])
];