7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[Web] Fix broken autoconfig ports, fixes #4221 (#4223)" (#4226)

Browse Source 
This reverts commit 9afea99189.
This commit is contained in:
André Peters
2021-08-10 09:05:01 +02:00
committed by GitHub
parent f5b709c776
commit 639e751678
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/web/inc/vars.inc.php
View File

@@ -45,18 +45,18 @@ $autodiscover_config = array(
// The autoconfig service will additionally announce the STARTTLS-enabled ports, specified in the "tlsport" variable.
'imap' => array(
'server' => $mailcow_hostname,
'port' => getEnvPort('IMAPS_PORT'),
'tlsport' => getEnvPort('IMAP_PORT')
'port' => (int)filter_var(substr(getenv('IMAPS_PORT'), strrpos(getenv('IMAPS_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT),
'tlsport' => (int)filter_var(substr(getenv('POP_PORT'), strrpos(getenv('IMAP_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT)
),
'pop3' => array(
'server' => $mailcow_hostname,
'port' => getEnvPort('POPS_PORT'),
'tlsport' => getEnvPort('POP_PORT')
'port' => (int)filter_var(substr(getenv('POPS_PORT'), strrpos(getenv('POPS_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT),
'tlsport' => (int)filter_var(substr(getenv('POP_PORT'), strrpos(getenv('POP_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT)
),
'smtp' => array(
'server' => $mailcow_hostname,
'port' => getEnvPort('SMTPS_PORT'),
'tlsport' => getEnvPort('SUBMISSION_PORT')
'port' => (int)filter_var(substr(getenv('SMTPS_PORT'), strrpos(getenv('SMTPS_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT),
'tlsport' => (int)filter_var(substr(getenv('SUBMISSION_PORT'), strrpos(getenv('SUBMISSION_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT)
),
'activesync' => array(
'url' => 'https://' . $mailcow_hostname . ($https_port == 443 ? '' : ':' . $https_port) . '/Microsoft-Server-ActiveSync',