summaryrefslogtreecommitdiff
path: root/www/gpg.php
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-09-06 05:40:36 +0200
committerBenny Baumann <BenBE@geshi.org>2013-09-06 05:40:36 +0200
commit18a9f2205edaaf42ab15f48c2165c31883bba8e5 (patch)
tree2d68fc0f549cb1b7c1fd9ba087ee0e74c9e49ec9 /www/gpg.php
parent0b92c4652f949b0a795e15064efe9f41c1eca769 (diff)
parent24603f28cde091813d8022daa9153eb4ab685ca4 (diff)
downloadcacert-devel-18a9f2205edaaf42ab15f48c2165c31883bba8e5.tar.gz
cacert-devel-18a9f2205edaaf42ab15f48c2165c31883bba8e5.tar.xz
cacert-devel-18a9f2205edaaf42ab15f48c2165c31883bba8e5.zip
Merge branch 'merge-bug-1177-893-1136-1123-1137' into release
Conflicts: www/gpg.php
Diffstat (limited to 'www/gpg.php')
-rw-r--r--www/gpg.php14
1 files changed, 14 insertions, 0 deletions
diff --git a/www/gpg.php b/www/gpg.php
index bf8ba29..2fdc518 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -17,7 +17,11 @@
*/ ?>
<?
require_once("../includes/loggedin.php");
+<<<<<<< HEAD
require_once("../includes/lib/general.php");
+=======
+ require_once('../includes/notary.inc.php');
+>>>>>>> merge-bug-1177-893-1136-1123-1137
$id = 0; if(array_key_exists('id',$_REQUEST)) $id=intval($_REQUEST['id']);
$oldid = $_REQUEST['oldid'] = array_key_exists('oldid',$_REQUEST) ? intval($_REQUEST['oldid']) : 0;
@@ -83,6 +87,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;
+ }
+
$err = runCommand('mktemp --directory /tmp/cacert_gpg.XXXXXXXXXX',
"",
$tmpdir);
@@ -293,6 +305,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= "";