diff options
| author | INOPIAE <inopiae@cacert.org> | 2013-10-01 23:02:15 +0200 |
|---|---|---|
| committer | INOPIAE <inopiae@cacert.org> | 2013-10-01 23:02:15 +0200 |
| commit | 56271b9d9bb74038f6ad4397a73aa5a9c86b4fc5 (patch) | |
| tree | 7daaa17176af57caffca882255b1c131ce04765d | |
| parent | 55d2a7b1fdd6aba528adf5afaec880ebf067edcf (diff) | |
| parent | f292c28b10a39e885171ef19413b7ef02c6f7725 (diff) | |
| download | cacert-devel-56271b9d9bb74038f6ad4397a73aa5a9c86b4fc5.tar.gz cacert-devel-56271b9d9bb74038f6ad4397a73aa5a9c86b4fc5.tar.xz cacert-devel-56271b9d9bb74038f6ad4397a73aa5a9c86b4fc5.zip | |
Merge branch 'bug-1137' of git://git-cacert.it-sls.de/cacert-devel into bug-1137
| -rw-r--r-- | pages/wot/6.php | 2 | ||||
| -rw-r--r-- | www/wot.php | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pages/wot/6.php b/pages/wot/6.php index 1031090..3ca74c2 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -53,7 +53,7 @@ AssureTextLine("",_("Only tick the next box if the Assurance was face to face.")); AssureBoxLine("assertion",_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible."),array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1); AssureBoxLine("rules",_("I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1); - AssureTextLine(_("Policy"),"<a href=\"/policy/CAcert Community Agreement.php\" target=\"_blank\">"._("CAcert Community Agreement")."</a> -<a href=\"/policy/AssurancePolicy.php\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>"); + AssureTextLine(_("Policy"),"<a href=\"/policy/CAcertCommunityAgreement.php\" target=\"_blank\">"._("CAcert Community Agreement")."</a> -<a href=\"/policy/AssurancePolicy.php\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>"); AssureInboxLine("points",_("Points"),"","<br />(Max. ".maxpoints().")"); AssureFoot($id,_("I confirm this Assurance")); ?> diff --git a/www/wot.php b/www/wot.php index 8395a58..7200517 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) { |