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

[Web] Fix for the fix of transport map checks

Browse Source
This commit is contained in:
andryyy 2018-12-23 14:16:55 +01:00
parent 69447da1fe
commit ebaa441f0e
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,17 @@ function transport($_action, $_data = null) {
} }
} }
} }
if (!isset($next_hop_matches[1])) { if (isset($next_hop_matches[1])) {
if (in_array($next_hop_clean, $existing_nh)) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('next_hop_interferes', $next_hop_clean, $nexthop)
);
return false;
}
}
else {
foreach ($existing_clean_nh as $existing_clean_nh_each) { foreach ($existing_clean_nh as $existing_clean_nh_each) {
if ($existing_clean_nh_each[1] == $nexthop) { if ($existing_clean_nh_each[1] == $nexthop) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
@ -311,7 +321,17 @@ function transport($_action, $_data = null) {
preg_match('/\[(.+)\].*/', $transport_data['nexthop'], $existing_clean_nh[]); preg_match('/\[(.+)\].*/', $transport_data['nexthop'], $existing_clean_nh[]);
} }
} }
if (!isset($next_hop_matches[1])) { if (isset($next_hop_matches[1])) {
if (in_array($next_hop_clean, $existing_nh)) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => array('next_hop_interferes', $next_hop_clean, $nexthop)
);
return false;
}
}
else {
foreach ($existing_clean_nh as $existing_clean_nh_each) { foreach ($existing_clean_nh as $existing_clean_nh_each) {
if ($existing_clean_nh_each[1] == $nexthop) { if ($existing_clean_nh_each[1] == $nexthop) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(