|
|
|
@ -187,18 +187,18 @@ function verifyEmail($email)
|
|
|
|
|
// Name (Comment) <Email>
|
|
|
|
|
if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
|
|
|
|
|
{
|
|
|
|
|
$name=trim(hex2bin($matches[1]));
|
|
|
|
|
$name=trim(gpg_hex2bin($matches[1]));
|
|
|
|
|
$nocomment=0;
|
|
|
|
|
$comm=trim(hex2bin($matches[2]));
|
|
|
|
|
$mail=trim(hex2bin($matches[3]));
|
|
|
|
|
$comm=trim(gpg_hex2bin($matches[2]));
|
|
|
|
|
$mail=trim(gpg_hex2bin($matches[3]));
|
|
|
|
|
}
|
|
|
|
|
// Name <EMail>
|
|
|
|
|
elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
|
|
|
|
|
{
|
|
|
|
|
$name=trim(hex2bin($matches[1]));
|
|
|
|
|
$name=trim(gpg_hex2bin($matches[1]));
|
|
|
|
|
$nocomment=1;
|
|
|
|
|
$comm="";
|
|
|
|
|
$mail=trim(hex2bin($matches[2]));
|
|
|
|
|
$mail=trim(gpg_hex2bin($matches[2]));
|
|
|
|
|
}
|
|
|
|
|
// Unrecognized format
|
|
|
|
|
else
|
|
|
|
@ -357,13 +357,13 @@ function verifyEmail($email)
|
|
|
|
|
$pos = strlen($bits[9]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$name = trim(hex2bin(trim(substr($bits[9], 0, $pos))));
|
|
|
|
|
$name = trim(gpg_hex2bin(trim(substr($bits[9], 0, $pos))));
|
|
|
|
|
$nameok=verifyName($name);
|
|
|
|
|
if($nocomment == 0)
|
|
|
|
|
{
|
|
|
|
|
$pos += 2;
|
|
|
|
|
$pos2 = strpos($bits[9], ")");
|
|
|
|
|
$comm = trim(hex2bin(trim(substr($bits[9], $pos, $pos2 - $pos))));
|
|
|
|
|
$comm = trim(gpg_hex2bin(trim(substr($bits[9], $pos, $pos2 - $pos))));
|
|
|
|
|
if($comm != "")
|
|
|
|
|
$comment[] = $comm;
|
|
|
|
|
$pos = $pos2 + 3;
|
|
|
|
@ -374,7 +374,7 @@ function verifyEmail($email)
|
|
|
|
|
$mail="";
|
|
|
|
|
if (preg_match("/<([\w.-]*\@[\w.-]*)>/", $bits[9],$match)) {
|
|
|
|
|
//echo "Found: ".$match[1];
|
|
|
|
|
$mail = trim(hex2bin($match[1]));
|
|
|
|
|
$mail = trim(gpg_hex2bin($match[1]));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|