Mirrors/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-08-02 06:52:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into nightly

Browse source
This commit is contained in:
FreddleSpl0it 2024-11-12 15:10:03 +01:00
commit 9542698e95
No known key found for this signature in database
GPG key ID: 00E14E7634F4BEC5
205 changed files with 7559 additions and 3663 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/web/json_api.php
View file

@ -509,7 +509,7 @@ if (isset($_GET['query'])) {
print(json_encode($getArgs));
$_SESSION['challenge'] = $WebAuthn->getChallenge();
return;
break;
break;
case "fail2ban":
if (!isset($_SESSION['mailcow_cc_role'])){
switch ($object) {
@ -2036,6 +2036,9 @@ if (isset($_GET['query'])) {
case "rl-mbox":
process_edit_return(ratelimit('edit', 'mailbox', array_merge(array('object' => $items), $attr)));
break;
case "rename-mbox":
process_edit_return(mailbox('edit', 'mailbox_rename', array_merge(array('mailbox' => $items), $attr)));
break;
case "user-acl":
process_edit_return(acl('edit', 'user', array_merge(array('username' => $items), $attr)));
break;