summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-08-13 21:25:28 +0200
committerBenny Baumann <BenBE@geshi.org>2013-08-13 21:25:28 +0200
commit90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25 (patch)
treec869a8f3af7ded6a5e943a813f18c7a517561c9d /www
parente4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a (diff)
parent75693292de2d907bf2a4b0f12abd7cd68781f95a (diff)
downloadcacert-devel-90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25.tar.gz
cacert-devel-90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25.tar.xz
cacert-devel-90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25.zip
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
Conflicts: includes/account.php pages/account/10.php pages/account/3.php pages/gpg/0.php www/gpg.php
Diffstat (limited to 'www')
-rw-r--r--www/gpg.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/www/gpg.php b/www/gpg.php
index 317072c..4133cd9 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -17,6 +17,7 @@
*/ ?>
<?
require_once("../includes/loggedin.php");
+ require_once('../includes/notary.inc.php');
$id = 0; if(array_key_exists('id',$_REQUEST)) $id=intval($_REQUEST['id']);
$oldid = $_REQUEST['oldid'] = array_key_exists('oldid',$_REQUEST) ? intval($_REQUEST['oldid']) : 0;
@@ -82,6 +83,14 @@ function verifyEmail($email)
$state=0;
if($oldid == "0" && $CSR != "")
{
+ if(!array_key_exists('CCA',$_REQUEST))
+ {
+ showheader(_("My CAcert.org Account!"));
+ echo _("You did not accept the CAcert Community Agreement (CCA), hit the back button and try again.");
+ showfooter();
+ exit;
+ }
+
$debugkey = $gpgkey = clean_gpgcsr($CSR);
$tnam = tempnam('/tmp/', '__gpg');
@@ -274,6 +283,8 @@ function verifyEmail($email)
if($oldid == "0" && $CSR != "")
{
+ write_user_agreement(intval($_SESSION['profile']['id']), "CCA", "certificate creation", "", 1);
+
//set variable for comment
if(trim($_REQUEST['description']) == ""){
$description= "";