summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-02-04 23:29:23 +0100
committerMichael Tänzer <neo@nhng.de>2014-02-04 23:29:23 +0100
commit2636d78df8972e2fae91c0785c0a87262adc62bb (patch)
treee863556b9a1d85db8fa6c921eda10ea456f611e3 /www
parent73fc407c07205e87d537338101ba133393aa80e2 (diff)
parentd810496e718e2545565e7b05687b763bdc628b92 (diff)
downloadcacert-devel-2636d78df8972e2fae91c0785c0a87262adc62bb.tar.gz
cacert-devel-2636d78df8972e2fae91c0785c0a87262adc62bb.tar.xz
cacert-devel-2636d78df8972e2fae91c0785c0a87262adc62bb.zip
Merge branch 'release' into bug-1138
Conflicts: includes/account.php includes/notary.inc.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'www')
-rw-r--r--www/wot.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/www/wot.php b/www/wot.php
index 0805625..fb229b9 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -371,7 +371,8 @@ $iecho= "c";
`when`=NOW()";
//record active acceptance by Assurer
if (check_date_format(trim($_REQUEST['date']),2010)) {
- write_user_agreement($_SESSION['profile']['id'], "CCA", "Assurance", "Assurer", 1, $_SESSION['_config']['notarise']['id']);
+ write_user_agreement($_SESSION['profile']['id'], "CCA", "assurance", "Assuring", 1, $_SESSION['_config']['notarise']['id']);
+ write_user_agreement($_SESSION['_config']['notarise']['id'], "CCA", "assurance", "Being assured", 0, $_SESSION['profile']['id']);
}
if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
$query .= ",\n`method`='TTP-Assisted'";
@@ -379,10 +380,6 @@ $iecho= "c";
mysql_query($query);
fix_assurer_flag($_SESSION['_config']['notarise']['id']);
include_once("../includes/notary.inc.php");
-/*to be activated after CCA accept option is implemented in form
- write_user_agreement($_SESSION['profile']['id'], "CCA", "assurance", "Assuring", 1, $_SESSION['_config']['notarise']['id']);}*/
-/* to be activated after the CCA recording is announced
- write_user_agreement($_SESSION['_config']['notarise']['id'], "CCA", "assurance", "Being assured", 0, $_SESSION['profile']['id']); */
if($_SESSION['profile']['points'] < 150)
{