summaryrefslogtreecommitdiff
path: root/includes
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 /includes
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 'includes')
-rw-r--r--includes/account.php20
1 files changed, 20 insertions, 0 deletions
diff --git a/includes/account.php b/includes/account.php
index eae7500..6a92669 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -182,6 +182,14 @@
if($process != "" && $oldid == 3)
{
+ 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;
+ }
+
if(!(array_key_exists('addid',$_REQUEST) && is_array($_REQUEST['addid'])) && $_REQUEST['SSO'] != '1')
{
showheader(_("My CAcert.org Account!"));
@@ -311,6 +319,8 @@
exit;
}
+ write_user_agreement(intval($_SESSION['profile']['id']), "CCA", "certificate creation", "", 1);
+
$query = "insert into emailcerts set
`CN`='$defaultemail',
`keytype`='NS',
@@ -635,6 +645,14 @@
if($process != "" && $oldid == 10)
{
+ 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;
+ }
+
$CSR = clean_csr($_REQUEST['CSR']);
if(strpos($CSR,"---BEGIN")===FALSE)
{
@@ -751,6 +769,8 @@
if($_SESSION['_config']['rootcert'] < 1 || $_SESSION['_config']['rootcert'] > 2)
$_SESSION['_config']['rootcert'] = 1;
+ write_user_agreement(intval($_SESSION['profile']['id']), "CCA", "certificate creation", "", 1);
+
if(array_key_exists('0',$_SESSION['_config']['rowid']) && $_SESSION['_config']['rowid']['0'] > 0)
{
$query = "insert into `domaincerts` set