Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
DerLinkman committed Mar 17, 2022
2 parents 5541f84 + d52323d commit 880a68d
Show file tree
Hide file tree
Showing 945 changed files with 7,652 additions and 14,228 deletions.
61 changes: 0 additions & 61 deletions data/conf/rspamd/lua/ivm-sg.lua

This file was deleted.

3 changes: 1 addition & 2 deletions data/web/css/build/008-mailcow.css
Expand Up @@ -204,11 +204,10 @@ legend {
color: #959595;
display: flex;
flex-direction: column;
width: 100% !important;
padding: 0 !important;
}
.footer .version {
margin-left: auto;
margin-top: 20px;
}
.slave-info {
padding: 15px 0px 15px 15px;
Expand Down
4 changes: 4 additions & 0 deletions data/web/inc/functions.mailbox.inc.php
Expand Up @@ -4054,6 +4054,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$stmt->execute(array(
':alias_domain' => $alias_domain,
));
$stmt = $pdo->prepare("DELETE FROM `spamalias` WHERE `address` LIKE :domain");
$stmt->execute(array(
':domain' => '%@'.$alias_domain,
));
$stmt = $pdo->prepare("DELETE FROM `bcc_maps` WHERE `local_dest` = :alias_domain");
$stmt->execute(array(
':alias_domain' => $alias_domain,
Expand Down

0 comments on commit 880a68d

Please sign in to comment.