git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "02ae5285"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "649a5c01"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I870ad468fba026cc5abf3c5699ed1e12ff28b32b
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/vars.inc.php b/mailcow/src/mailcow-dockerized/data/web/inc/vars.inc.php
index f497ffb..91d2145 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/vars.inc.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/vars.inc.php
@@ -45,21 +45,21 @@
// The autoconfig service will additionally announce the STARTTLS-enabled ports, specified in the "tlsport" variable.
'imap' => array(
'server' => $mailcow_hostname,
- 'port' => end(explode(':', getenv('IMAPS_PORT'))),
- 'tlsport' => end(explode(':', getenv('IMAP_PORT'))),
+ 'port' => (int)filter_var(substr(getenv('IMAPS_PORT'), strrpos(getenv('IMAPS_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT),
+ 'tlsport' => (int)filter_var(substr(getenv('IMAP_PORT'), strrpos(getenv('IMAP_PORT'), ':')), FILTER_SANITIZE_NUMBER_INT)
),
'pop3' => array(
'server' => $mailcow_hostname,
- 'port' => end(explode(':', getenv('POPS_PORT'))),
- 'tlsport' => end(explode(':', getenv('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' => end(explode(':', getenv('SMTPS_PORT'))),
- 'tlsport' => end(explode(':', getenv('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',
+ 'url' => 'https://' . $mailcow_hostname . ($https_port == 443 ? '' : ':' . $https_port) . '/Microsoft-Server-ActiveSync',
),
'caldav' => array(
'server' => $mailcow_hostname,
@@ -79,7 +79,29 @@
$DEFAULT_LANG = 'en';
// Available languages
-$AVAILABLE_LANGUAGES = array('ca', 'cs', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ko', 'lv', 'nl', 'pl', 'pt', 'ro', 'ru', 'sk', 'sv', 'zh');
+// https://www.iso.org/obp/ui/#search
+// https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+$AVAILABLE_LANGUAGES = array(
+ 'cs' => 'Čeština (Czech)',
+ 'da' => 'Danish (Dansk)',
+ 'de' => 'Deutsch (German)',
+ 'en' => 'English',
+ 'es' => 'Español (Spanish)',
+ 'fi' => 'Suomi (Finish)',
+ 'fr' => 'Français (French)',
+ 'hu' => 'Magyar (Hungarian)',
+ 'it' => 'Italiano (Italian)',
+ 'ko' => '한국어 (Korean)',
+ 'lv' => 'latviešu (Latvian)',
+ 'nl' => 'Nederlands (Dutch)',
+ 'pl' => 'Język Polski (Polish)',
+ 'pt' => 'Português (Portuguese)',
+ 'ro' => 'Română (Romanian)',
+ 'ru' => 'Pусский (Russian)',
+ 'sk' => 'Slovenčina (Slovak)',
+ 'sv' => 'Svenska (Swedish)',
+ 'zh' => '中文 (Chinese)'
+);
// Change theme (default: lumen)
// Needs to be one of those: cerulean, cosmo, cyborg, darkly, flatly, journal, lumen, paper, readable, sandstone,
@@ -88,14 +110,6 @@
// WARNING: Only lumen is loaded locally. Enabling any other theme, will download external sources.
$DEFAULT_THEME = 'lumen';
-// Password complexity as regular expression
-// Min. 6 characters
-$PASSWD_REGEP = '.{6,}';
-// Min. 6 characters, which must include at least one uppercase letter, one lowercase letter and one number
-// $PASSWD_REGEP = '^(?=.*[A-Z])(?=.*[0-9])(?=.*[a-z]).{6,}$';
-// Min. 6 characters, which must include at least one letter and one number
-// $PASSWD_REGEP = '^(?=.*[0-9])(?=.*[A-Za-z]).{6,}$';
-
// Show DKIM private keys - false by default
$SHOW_DKIM_PRIV_KEYS = false;
@@ -122,15 +136,9 @@
// Label for OTP devices
$OTP_LABEL = "mailcow UI";
-// Default "to" address in relay test tool
-$RELAY_TO = "null@hosted.mailcow.de";
-
// How long to wait (in s) for cURL Docker requests
$DOCKER_TIMEOUT = 60;
-// Anonymize IPs logged via UI
-$ANONYMIZE_IPS = true;
-
// Split DKIM key notation (bind format)
$SPLIT_DKIM_255 = false;
@@ -203,6 +211,7 @@
'Bad Words DE (only fired in combination with fishy TLDs)' => 'bad_words_de.map',
'Bad Languages' => 'bad_languages.map',
'Bulk Mail Headers' => 'bulk_header.map',
+ 'Bad (Junk) Mail Headers' => 'bad_header.map',
'Monitoring Hosts' => 'monitoring_nolog.map'
)
);