summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-07-14 22:23:52 +0200
committerBenny Baumann <BenBE@geshi.org>2013-07-14 22:35:10 +0200
commit75693292de2d907bf2a4b0f12abd7cd68781f95a (patch)
tree918d60a3ffdf5da339aa53ea3556b2bae252d2a2 /www
parent5ce73fd94b81c9444164815236e9d545635d7fda (diff)
downloadcacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.tar.gz
cacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.tar.xz
cacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.zip
bug 1123: fixed merge conflicts on testserver
Diffstat (limited to 'www')
-rw-r--r--www/gpg.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/www/gpg.php b/www/gpg.php
index 267fabd..d0ba432 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -286,6 +286,13 @@ function verifyEmail($email)
{
write_user_agreement(intval($_SESSION['profile']['id']), "CCA", "certificate creation", "", 1);
+ //set variable for comment
+ if(trim($_REQUEST['description']) == ""){
+ $description= "";
+ }else{
+ $description= trim(mysql_real_escape_string(stripslashes($_REQUEST['description'])));
+ }
+
$query = "insert into `gpg` set `memid`='".intval($_SESSION['profile']['id'])."',
`email`='".mysql_real_escape_string($lastvalidemail)."',
`level`='1',