summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-21 00:30:24 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-21 00:30:24 +0100
commit85589ff948973586ad4d0dea2e8e458f007fc0ea (patch)
tree7d614c79ac6856c64154ecbf4272579d8d4aca8e
parentc7ffefb15377a7471dd34506f7fa6a08a20d1b3b (diff)
parent1439176e62ab63d6ab522b07ca18213e56c24bf4 (diff)
downloadcacert-devel-85589ff948973586ad4d0dea2e8e458f007fc0ea.tar.gz
cacert-devel-85589ff948973586ad4d0dea2e8e458f007fc0ea.tar.xz
cacert-devel-85589ff948973586ad4d0dea2e8e458f007fc0ea.zip
Merge branch 'bug-1317' into testserver-stable
-rw-r--r--www/gpg.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/gpg.php b/www/gpg.php
index 4e05a88..f58153d 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -592,7 +592,7 @@ function verifyEmail($email)
}
// Name (Comment) <Email>
- if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
+ if(preg_match("/^([^\(\)\[@<>]+) \(([^\(\)@<>]*)\) <([\w=\/%+.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
$name=trim(gpg_hex2bin($matches[1]));
$nocomment=0;
@@ -600,7 +600,7 @@ function verifyEmail($email)
$mail=trim(gpg_hex2bin($matches[3]));
}
// Name <EMail>
- elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
+ elseif(preg_match("/^([^\(\)\[@<>]+) <([\w=\/%+.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/",$bits[9],$matches))
{
$name=trim(gpg_hex2bin($matches[1]));
$nocomment=1;
@@ -779,7 +779,7 @@ function verifyEmail($email)
}
$mail="";
- if (preg_match("/<([\w.-]*\@[\w.-]*)>/", $bits[9],$match)) {
+ if (preg_match("/<([\w=\/%+.-]*\@[\w.-]*|[\w.-]*\![\w=\/%.-]*)>/", $bits[9],$match)) {
//echo "Found: ".$match[1];
$mail = trim(gpg_hex2bin($match[1]));
}