cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

Fix for https://bugs.cacert.org/view.php?id=1318

Browse source 
"E-Mail Probe does not consider mx priorities"
This commit is contained in:
Wytze van der Raay 2014-12-05 09:06:50 +00:00
parent 8477354c33
commit 2ca78a2eb2
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
includes/general.php
View file

@ -538,20 +538,35 @@
if(preg_match("/^([a-zA-Z0-9])+([a-zA-Z0-9\+\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/" , $email))
{
list($username,$domain)=explode('@',$email,2);
$dom = escapeshellarg($domain);
$line = trim(shell_exec("dig +short MX $dom 2>&1"));
#echo $email."-$dom-$line-\n";
#echo shell_exec("dig +short mx heise.de 2>&1")."-<br>\n";
$list = explode("\n", $line);
foreach($list as $row) {
if(!strstr($row, " ")) {
continue;
}
list($pri, $mxhosts[]) = explode(" ", trim($row), 2);
$mxhostrr = array();
$mxweight = array();
if( !getmxrr($domain, $mxhostrr, $mxweight) ) {
$mxhostrr = array($domain);
$mxweight = array(0);
} else if ( empty($mxhostrr) ) {
$mxhostrr = array($domain);
$mxweight = array(0);
}
$mxhostprio = array();
for($i = 0; $i < count($mxhostrr); $i++) {
$mx_host = trim($mxhostrr[$i], '.');
$mx_prio = $mxweight[$i];
if(empty($mxhostprio[$mx_prio])) {
$mxhostprio[$mx_prio] = array();
}
$mxhostprio[$mx_prio][] = $mx_host;
}
array_walk($mxhostprio, function(&$mx) { shuffle($mx); } );
ksort($mxhostprio);
$mxhosts = array();
foreach($mxhostprio as $mx_prio => $mxhostnames) {
foreach($mxhostnames as $mx_host) {
$mxhosts[] = $mx_host;
}
}
$mxhosts[] = $domain;
array_walk($mxhosts, function(&$mx) { $mx = trim($mx, '.'); } );
foreach($mxhosts as $key => $domain)
{