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

[Dovecot] Update to 2.3.5.2

Browse Source 
[Compose] Update Dovecot image
This commit is contained in:
andryyy
2019-04-25 18:10:28 +02:00
parent b7903ae377
commit 3e3e526568
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/web/inc/functions.transports.inc.php
View File

@@ -193,7 +193,7 @@ function transport($_action, $_data = null) {
$username = str_replace(':', '\:', trim($_data['username']));
$password = str_replace(':', '\:', trim($_data['password']));
// ".domain" is a valid destination, "..domain" is not
if (empty($destination) || (is_valid_domain_name(preg_replace('/^' . preg_quote('.', '/') . '/', '', $destination)) === false && $destination != '*')) {
if (empty($destination) || (is_valid_domain_name(preg_replace('/^' . preg_quote('.', '/') . '/', '', $destination)) === false && $destination != '*' && filter_var($destination, FILTER_VALIDATE_EMAIL) === false)) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
@@ -223,6 +223,14 @@ function transport($_action, $_data = null) {
);
return false;
}
if ($transport_data['destination'] == $destination) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => 'transport_dest_exists'
);
return false;
}
}
}
if (isset($next_hop_matches[1])) {
@@ -319,6 +327,14 @@ function transport($_action, $_data = null) {
}
$existing_nh[] = $transport_data['nexthop'];
preg_match('/\[(.+)\].*/', $transport_data['nexthop'], $existing_clean_nh[]);
if ($transport_data['destination'] == $destination) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => 'transport_dest_exists'
);
return false;
}
}
}
if (isset($next_hop_matches[1])) {