Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

data/conf/rspamd/local.d/policies_group.conf

@@ -11,19 +11,13 @@ symbols = {
     "R_DKIM_REJECT" {
         score = 10.0;
     }
-    "R_DKIM_PERMFAIL" {
-        score = 10.0;
-    }
     "DMARC_POLICY_REJECT" {
         weight = 20.0;
-        description = "DMARC reject policy";
     }
     "DMARC_POLICY_QUARANTINE" {
         weight = 10.0;
-        description = "DMARC quarantine policy";
     }
     "DMARC_POLICY_SOFTFAIL" {
         weight = 2.0;
-        description = "DMARC failed";
     }
 }

data/web/user.php

@@ -77,7 +77,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
   $username = $_SESSION['mailcow_cc_username'];
   $mailboxdata = mailbox('get', 'mailbox_details', $username);
 
-  $clientconfigstr = "host=" . urlencode($mailcow_hostname) . "&email=" . urlencode($username) . "&name=" . urlencode($mailboxdata['name']) . "&ui=" . strtok(urlencode($_SERVER['HTTP_HOST']), ':') . "&port=" . urlencode($autodiscover_config['caldav']['port']);
+  $clientconfigstr = "host=" . urlencode($mailcow_hostname) . "&email=" . urlencode($username) . "&name=" . urlencode($mailboxdata['name']) . "&ui=" . urlencode(strtok($_SERVER['HTTP_HOST'], ':')) . "&port=" . urlencode($autodiscover_config['caldav']['port']);
   if ($autodiscover_config['useEASforOutlook'] == 'yes')
   $clientconfigstr .= "&outlookEAS=1";
   if (file_exists('thunderbird-plugins/version.csv')) {