paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
andryyy 2019-07-20 15:16:01 +02:00
parent a0f4886be6 32ca602f84
commit 27d60840ef
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/conf/rspamd/local.d/policies_group.conf
View File

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

2
data/web/user.php
View File

@ -77,7 +77,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
$username = $_SESSION['mailcow_cc_username']; $username = $_SESSION['mailcow_cc_username'];
$mailboxdata = mailbox('get', 'mailbox_details', $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') if ($autodiscover_config['useEASforOutlook'] == 'yes')
$clientconfigstr .= "&outlookEAS=1"; $clientconfigstr .= "&outlookEAS=1";
if (file_exists('thunderbird-plugins/version.csv')) { if (file_exists('thunderbird-plugins/version.csv')) {