summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-05-16 15:53:13 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2018-05-16 15:53:13 +0200
commitdabeff231f0de37ba3084d5d38fb493a5297e03a (patch)
treee248406898388c9f280b9d04bc3b8238933854b1 /www
parent09377a033f8e5632248844e9938cecd25fa62550 (diff)
parenta2ed046439e1047867aba62686d43d2e5fb9af44 (diff)
downloadcacert-devel-dabeff231f0de37ba3084d5d38fb493a5297e03a.tar.gz
cacert-devel-dabeff231f0de37ba3084d5d38fb493a5297e03a.tar.xz
cacert-devel-dabeff231f0de37ba3084d5d38fb493a5297e03a.zip
Merge remote-tracking branch 'origin/bug-1431' into testserver-stable
Diffstat (limited to 'www')
-rw-r--r--www/gpg.php18
1 files changed, 18 insertions, 0 deletions
diff --git a/www/gpg.php b/www/gpg.php
index f7dfde8..4246adc 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -516,6 +516,8 @@ function verifyEmail($email)
$lines = "";
$gpgarr = explode("\n", trim($gpg));
+ $containsphoto = FALSE;
+
foreach($gpgarr as $line)
{
#echo "Line[]: $line <br/>\n";
@@ -525,7 +527,23 @@ function verifyEmail($email)
$lines .= "\n";
$lines .= $line;
}
+ elseif(substr($line, 0, 3) == "uat")
+ {
+ $containsphoto = TRUE;
+ }
+ }
+
+ if ($containsphoto)
+ {
+ showheader(_("Welcome to CAcert.org"));
+
+ echo "<p style='color:#ff0000'>"._("There is an image/photo in your key.")."</p>";
+ unset($_REQUEST['process']);
+ $id = $oldid;
+ unset($oldid);
+ exit();
}
+
$gpg = $lines;
$expires = 0;
$nerr=0; $nok=0;