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

[Web] Replace rtrim by preg_replace to fix transport checks

master
andryyy 2020-02-11 08:18:29 +01:00
parent 9d04d0ee4a
commit 4ea843f087
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/inc/ajax/transport_check.php
View File

@ -31,7 +31,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admi
// Explode to hostname and port // Explode to hostname and port
if ($has_bracket_and_port) { if ($has_bracket_and_port) {
$port = substr($hostname_w_port, strrpos($hostname_w_port, ':') + 1); $port = substr($hostname_w_port, strrpos($hostname_w_port, ':') + 1);
$hostname = rtrim($hostname_w_port, ':' . $port); $hostname = preg_replace('/'. preg_quote(':' . $port, '/') . '$/', '', $hostname_w_port);
if (filter_var($hostname, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { if (filter_var($hostname, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
$hostname = '[' . $hostname . ']:'; $hostname = '[' . $hostname . ']:';
} }
@ -39,7 +39,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admi
else { else {
if ($is_ipv4_and_has_port) { if ($is_ipv4_and_has_port) {
$port = substr($hostname_w_port, strrpos($hostname_w_port, ':') + 1); $port = substr($hostname_w_port, strrpos($hostname_w_port, ':') + 1);
$hostname = rtrim($hostname_w_port, ':' . $port); $hostname = preg_replace('/'. preg_quote(':' . $port, '/') . '$/', '', $hostname_w_port);
} }
if (filter_var($hostname_w_port, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { if (filter_var($hostname_w_port, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
$hostname = $hostname_w_port; $hostname = $hostname_w_port;
@ -51,7 +51,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "admi
} }
else { else {
$port = substr($hostname_w_port, strrpos($hostname_w_port, ':') + 1); $port = substr($hostname_w_port, strrpos($hostname_w_port, ':') + 1);
$hostname = rtrim($hostname_w_port, ':' . $port); $hostname = preg_replace('/'. preg_quote(':' . $port, '/') . '$/', '', $hostname_w_port);
} }
} }
// Try to get MX if host is not [host] // Try to get MX if host is not [host]