bug 1137: Implemented the CCA tick and the recording of the CCA. There seems to be...
authorINOPIAE <inopiae@cacert.org>
Wed, 9 Jan 2013 10:36:16 +0000 (11:36 +0100)
committerINOPIAE <inopiae@cacert.org>
Wed, 9 Jan 2013 10:36:16 +0000 (11:36 +0100)
pages/wot/6.php
www/wot.php

index 28c1875..7403f5b 100644 (file)
        AssureHead(_("Assurance Confirmation"),sprintf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $fname));
        AssureTextLine(_("Name"),$name);
        AssureTextLine(_("Date of Birth"),$dob." ("._("YYYY-MM-DD").")");
        AssureHead(_("Assurance Confirmation"),sprintf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $fname));
        AssureTextLine(_("Name"),$name);
        AssureTextLine(_("Date of Birth"),$dob." ("._("YYYY-MM-DD").")");
+       AssureMethodLine(_("Method"),$methods,'');
        AssureBoxLine("certify",sprintf(_("I certify that %s %s %s has appeared in person"), $fname, $mname, $lname),array_key_exists('certify',$_POST) && $_POST['certify'] == 1);
        AssureBoxLine("certify",sprintf(_("I certify that %s %s %s has appeared in person"), $fname, $mname, $lname),array_key_exists('certify',$_POST) && $_POST['certify'] == 1);
+       AssureBoxLine("CCAAgreed",sprintf(_("I verify that %s %s %s accepted the CAcert Community Agreement."), $fname, $mname, $lname),array_key_exists('CCAAgreed',$_POST) && $_POST['CCAAgreed'] == 1);
        AssureInboxLine("location",_("Location"),array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:"","");
        AssureInboxLine("location",_("Location"),array_key_exists('location',$_SESSION['_config'])?$_SESSION['_config']['location']:"","");
-       AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"<br/>"._("Please adjust the date if you assured the person on a different day"));
-       AssureMethodLine(_("Method"),$methods,_("Only tick the next box if the Assurance was face to face."));
+       AssureInboxLine("date",_("Date"),array_key_exists('date',$_SESSION['_config'])?$_SESSION['_config']['date']:date("Y-m-d"),"<br/>"._("The date when the assurance took place. Please adjust the date if you assured the person on a different day"));
+       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("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 Assurance Policy and the Assurance Handbook and am making this Assurance subject to and in compliance with the policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1);
-       AssureTextLine(_("Policy"),"<a href=\"/policy/AssurancePolicy.php\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>");
+       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>");
        AssureInboxLine("points",_("Points"),"","<br />(Max. ".maxpoints().")");
        AssureInboxLine("points",_("Points"),"","<br />(Max. ".maxpoints().")");
-       AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"),$fname));
-       AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"));
+//     AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"),$fname));
+//     AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"));
        AssureFoot($id,_("I confirm this Assurance"));
 ?>
        AssureFoot($id,_("I confirm this Assurance"));
 ?>
index c6c0568..2e3082c 100644 (file)
@@ -18,6 +18,7 @@
 <?
 require_once("../includes/loggedin.php");
 require_once("../includes/lib/l10n.php");
 <?
 require_once("../includes/loggedin.php");
 require_once("../includes/lib/l10n.php");
+require_once("../includes/wot.inc.php");
 
 
 function show_page($target,$message,$error)
 
 
 function show_page($target,$message,$error)
@@ -87,28 +88,28 @@ function send_reminder()
 {
        $body = "";
        $my_translation = L10n::get_translation();
 {
        $body = "";
        $my_translation = L10n::get_translation();
-       
+
        $_SESSION['_config']['reminder-lang'] = $_POST['reminder-lang'];
        $_SESSION['_config']['reminder-lang'] = $_POST['reminder-lang'];
-       
+
        $reminder_translations[] = $_POST['reminder-lang'];
        if ( !in_array("en", $reminder_translations, $strict=true) ) {
                $reminder_translations[] = "en";
        }
        $reminder_translations[] = $_POST['reminder-lang'];
        if ( !in_array("en", $reminder_translations, $strict=true) ) {
                $reminder_translations[] = "en";
        }
-       
+
        foreach ($reminder_translations as $translation) {
                L10n::set_translation($translation);
        foreach ($reminder_translations as $translation) {
                L10n::set_translation($translation);
-               
+
                $body .= L10n::$translations[$translation].":\n\n";
                $body .= sprintf(_("This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued."), $_SESSION['profile']['fname']." (".$_SESSION['profile']['email'].")", "http://www.cacert.org", $_SESSION['profile']['fname'])."\n\n";
                $body .= _("Best regards")."\n";
                $body .= _("CAcert Support Team")."\n\n";
        }
                $body .= L10n::$translations[$translation].":\n\n";
                $body .= sprintf(_("This is a short reminder that you filled out forms to become trusted with CAcert.org, and %s has attempted to issue you points. Please create your account at %s as soon as possible and then notify %s so that the points can be issued."), $_SESSION['profile']['fname']." (".$_SESSION['profile']['email'].")", "http://www.cacert.org", $_SESSION['profile']['fname'])."\n\n";
                $body .= _("Best regards")."\n";
                $body .= _("CAcert Support Team")."\n\n";
        }
-       
+
        L10n::set_translation($reminder_translations[0]); // for the subject
        sendmail($_POST['email'], "[CAcert.org] "._("Reminder Notice"), $body, $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']);
        L10n::set_translation($reminder_translations[0]); // for the subject
        sendmail($_POST['email'], "[CAcert.org] "._("Reminder Notice"), $body, $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']);
-       
+
        L10n::set_translation($my_translation);
        L10n::set_translation($my_translation);
-       
+
        $_SESSION['_config']['remindersent'] = 1;
        $_SESSION['_config']['error'] = _("A reminder notice has been sent.");
 }
        $_SESSION['_config']['remindersent'] = 1;
        $_SESSION['_config']['error'] = _("A reminder notice has been sent.");
 }
@@ -122,13 +123,13 @@ function send_reminder()
        if(array_key_exists('location',$_POST) && $_POST['location'] != "")
                $_SESSION['_config']['location'] = $_POST['location'];
 
        if(array_key_exists('location',$_POST) && $_POST['location'] != "")
                $_SESSION['_config']['location'] = $_POST['location'];
 
-       $oldid=array_key_exists('oldid',$_REQUEST)?intval($_REQUEST['oldid']):0;        
+       $oldid=array_key_exists('oldid',$_REQUEST)?intval($_REQUEST['oldid']):0;
 
        if($oldid == 12)
                $id = $oldid;
 
        if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6))
 
        if($oldid == 12)
                $id = $oldid;
 
        if(($id == 5 || $oldid == 5 || $id == 6 || $oldid == 6))
-               if (!is_assurer($_SESSION['profile']['id'])) 
+               if (!is_assurer($_SESSION['profile']['id']))
                        {
                                show_page ("Exit","",get_assurer_reason($_SESSION['profile']['id']));
                                exit;
                        {
                                show_page ("Exit","",get_assurer_reason($_SESSION['profile']['id']));
                                exit;
@@ -155,7 +156,7 @@ function send_reminder()
                        $_SESSION['_config']['noemailfound'] = 1;
                        show_page("EnterEmail","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information."));
                        exit;
                        $_SESSION['_config']['noemailfound'] = 1;
                        show_page("EnterEmail","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information."));
                        exit;
-               } else 
+               } else
                {
                        $_SESSION['_config']['noemailfound'] = 0;
                        $_SESSION['_config']['notarise'] = mysql_fetch_assoc($res);
                {
                        $_SESSION['_config']['noemailfound'] = 0;
                        $_SESSION['_config']['notarise'] = mysql_fetch_assoc($res);
@@ -201,6 +202,12 @@ $iecho= "c";
                        exit;
                }
 
                        exit;
                }
 
+               if(!array_key_exists('CCAAgreed',$_POST) || $_POST['CCAAgreed'] != 1)
+               {
+                       show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"));
+                       exit;
+               }
+
 /*             if(!array_key_exists('rules',$_POST) || $_POST['rules'] != 1)
                {
                        show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"));
 /*             if(!array_key_exists('rules',$_POST) || $_POST['rules'] != 1)
                {
                        show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"));
@@ -247,7 +254,7 @@ $iecho= "c";
                        $newpoints = $awarded = $max;
                if($newpoints < 0)
                        $newpoints = $awarded = 0;
                        $newpoints = $awarded = $max;
                if($newpoints < 0)
                        $newpoints = $awarded = 0;
-               
+
                $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`";
                $res = mysql_query($query);
                $drow = mysql_fetch_assoc($res);
                $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`";
                $res = mysql_query($query);
                $drow = mysql_fetch_assoc($res);
@@ -260,13 +267,13 @@ $iecho= "c";
                        $newpoints = $max - $drow['total'];
                if($newpoints < 0)
                        $newpoints = 0;
                        $newpoints = $max - $drow['total'];
                if($newpoints < 0)
                        $newpoints = 0;
-               
+
                if(mysql_escape_string(stripslashes($_POST['date'])) == "")
                        $_POST['date'] = date("Y-m-d H:i:s");
 
                $query = "select * from `notary` where `from`='".$_SESSION['profile']['id']."' AND
                                                `to`='".$_SESSION['_config']['notarise']['id']."' AND
                if(mysql_escape_string(stripslashes($_POST['date'])) == "")
                        $_POST['date'] = date("Y-m-d H:i:s");
 
                $query = "select * from `notary` where `from`='".$_SESSION['profile']['id']."' AND
                                                `to`='".$_SESSION['_config']['notarise']['id']."' AND
-                                               `awarded`='$awarded' AND 
+                                               `awarded`='$awarded' AND
                                                `location`='".mysql_escape_string(stripslashes($_POST['location']))."' AND
                                                `date`='".mysql_escape_string(stripslashes($_POST['date']))."'";
                $res = mysql_query($query);
                                                `location`='".mysql_escape_string(stripslashes($_POST['location']))."' AND
                                                `date`='".mysql_escape_string(stripslashes($_POST['date']))."'";
                $res = mysql_query($query);
@@ -285,6 +292,10 @@ $iecho= "c";
                                                `location`='".mysql_escape_string(stripslashes($_POST['location']))."',
                                                `date`='".mysql_escape_string(stripslashes($_POST['date']))."',
                                                `when`=NOW()";
                                                `location`='".mysql_escape_string(stripslashes($_POST['location']))."',
                                                `date`='".mysql_escape_string(stripslashes($_POST['date']))."',
                                                `when`=NOW()";
+               //record active acceptance by Assurer
+               write_user_agreement($_SESSION['profile']['id'], "CCA", "Assurance", "Assurer", 1, $_SESSION['_config']['notarise']['id']);
+               //record passive acceptance by Assuree
+               write_user_agreement($_SESSION['_config']['notarise']['id'], "CCA", "Assurance", "Assuree", 0, $_SESSION['profile']['id']);
                if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0)
                {
                        $query .= ",\n`method`='Temporary Increase'";
                if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0)
                {
                        $query .= ",\n`method`='Temporary Increase'";
@@ -297,7 +308,7 @@ $iecho= "c";
                }
                mysql_query($query);
                fix_assurer_flag($_SESSION['_config']['notarise']['id']);
                }
                mysql_query($query);
                fix_assurer_flag($_SESSION['_config']['notarise']['id']);
-               
+
                if($_SESSION['profile']['points'] < 150)
                {
                        $addpoints = 0;
                if($_SESSION['profile']['points'] < 150)
                {
                        $addpoints = 0;
@@ -319,7 +330,7 @@ $iecho= "c";
 
                $my_translation = L10n::get_translation();
                L10n::set_translation($_SESSION['_config']['notarise']['language']);
 
                $my_translation = L10n::get_translation();
                L10n::set_translation($_SESSION['_config']['notarise']['language']);
-               
+
                $body  = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
                if($_POST['points'] != $newpoints)
                        $body .= sprintf(_("You were issued %s points however the system has rounded this down to %s and you now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n";
                $body  = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
                if($_POST['points'] != $newpoints)
                        $body .= sprintf(_("You were issued %s points however the system has rounded this down to %s and you now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n";
@@ -448,10 +459,10 @@ $iecho= "c";
                        {
                                $my_translation = L10n::get_translation();
                                L10n::set_translation($user['language']);
                        {
                                $my_translation = L10n::get_translation();
                                L10n::set_translation($user['language']);
-                               
+
                                $subject = "[CAcert.org] ".sprintf(_("Message from %s"),
                                                $_SESSION['profile']['fname']);
                                $subject = "[CAcert.org] ".sprintf(_("Message from %s"),
                                                $_SESSION['profile']['fname']);
-                               
+
                                $body  = sprintf(_("Hi %s,"), $user['fname'])."\n\n";
                                $body .= sprintf(_("%s %s has sent you a message via the ".
                                                "contact an Assurer form on CAcert.org."),
                                $body  = sprintf(_("Hi %s,"), $user['fname'])."\n\n";
                                $body .= sprintf(_("%s %s has sent you a message via the ".
                                                "contact an Assurer form on CAcert.org."),
@@ -467,16 +478,16 @@ $iecho= "c";
                                                "abused, please write to support@cacert.org")."\n\n";
                                $body .= _("Best regards")."\n";
                                $body .= _("Your CAcert Community");
                                                "abused, please write to support@cacert.org")."\n\n";
                                $body .= _("Best regards")."\n";
                                $body .= _("Your CAcert Community");
-                               
+
                                sendmail($user['email'], $subject, $body,
                                                $_SESSION['profile']['email'], //from
                                                "", //replyto
                                                "", //toname
                                                $_SESSION['profile']['fname']." ".
                                                        $_SESSION['profile']['lname']); //fromname
                                sendmail($user['email'], $subject, $body,
                                                $_SESSION['profile']['email'], //from
                                                "", //replyto
                                                "", //toname
                                                $_SESSION['profile']['fname']." ".
                                                        $_SESSION['profile']['lname']); //fromname
-                               
+
                                L10n::set_translation($my_translation);
                                L10n::set_translation($my_translation);
-                               
+
                                showheader(_("My CAcert.org Account!"));?>
                                <p>
                                        <? printf(_("Your email has been sent to %s."), $user['fname']); ?>
                                showheader(_("My CAcert.org Account!"));?>
                                <p>
                                        <? printf(_("Your email has been sent to %s."), $user['fname']); ?>
@@ -489,10 +500,10 @@ $iecho= "c";
                                show_page(0,"",_("Sorry, I was unable to locate that user."));
                                exit;
                        }
                                show_page(0,"",_("Sorry, I was unable to locate that user."));
                                exit;
                        }
-               
+
                }
                }
-       } 
-       if($oldid == 9) 
+       }
+       if($oldid == 9)
        {
                $oldid=0;
                $id = 9;
        {
                $oldid=0;
                $id = 9;