Skip to content

Commit 880a68d

Browse files
committed
Merge branch 'staging'
* staging: [WEB] Changed Version to footer margin top to 20px [Helper] Backup and restore: Use bullseye-slim [Web] Delete related spam aliases when deleting alias domain Revert "Before update on 2022-03-02_17_04_05" [Web] Footer fix (#4500) [Web] Update composer libs - Removing symfony/deprecation-contracts (v2.4.0) - Upgrading ddeboer/imap (1.12.1 => 1.13.1) - Upgrading directorytree/ldaprecord (v2.6.3 => v2.10.1) - Upgrading illuminate/contracts (v8.53.1 => v9.3.0) - Upgrading nesbot/carbon (2.51.1 => 2.57.0) - Upgrading phpmailer/phpmailer (v6.5.0 => v6.6.0) - Upgrading psr/container (1.1.1 => 2.0.2) - Upgrading psr/log (1.1.4 => 3.0.0) - Upgrading psr/simple-cache (1.0.1 => 2.0.0) - Upgrading robthree/twofactorauth (1.8.0 => 1.8.1) - Upgrading symfony/polyfill-ctype (v1.23.0 => v1.24.0) - Upgrading symfony/polyfill-mbstring (v1.23.1 => v1.24.0) - Upgrading symfony/polyfill-php80 (v1.23.1 => v1.24.0) - Upgrading symfony/translation (v5.3.4 => v6.0.5) - Upgrading symfony/translation-contracts (v2.4.0 => v3.0.0) - Upgrading symfony/var-dumper (v5.3.6 => v6.0.5) - Upgrading tightenco/collect (v8.34.0 => v8.83.2) - Upgrading twig/twig (v3.3.2 => v3.3.8) Before update on 2022-03-02_17_04_05 Fix issue forms [GH-Actions][stale] Update to v5.0.0
2 parents 5541f84 + d52323d commit 880a68d

File tree

945 files changed

+7652
-14228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

945 files changed

+7652
-14228
lines changed

data/conf/rspamd/lua/ivm-sg.lua

Lines changed: 0 additions & 61 deletions
This file was deleted.

data/web/css/build/008-mailcow.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,10 @@ legend {
204204
color: #959595;
205205
display: flex;
206206
flex-direction: column;
207-
width: 100% !important;
208-
padding: 0 !important;
209207
}
210208
.footer .version {
211209
margin-left: auto;
210+
margin-top: 20px;
212211
}
213212
.slave-info {
214213
padding: 15px 0px 15px 15px;

data/web/inc/functions.mailbox.inc.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4054,6 +4054,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
40544054
$stmt->execute(array(
40554055
':alias_domain' => $alias_domain,
40564056
));
4057+
$stmt = $pdo->prepare("DELETE FROM `spamalias` WHERE `address` LIKE :domain");
4058+
$stmt->execute(array(
4059+
':domain' => '%@'.$alias_domain,
4060+
));
40574061
$stmt = $pdo->prepare("DELETE FROM `bcc_maps` WHERE `local_dest` = :alias_domain");
40584062
$stmt->execute(array(
40594063
':alias_domain' => $alias_domain,

0 commit comments

Comments
 (0)