public Organisation(String name, String state, String province, String city, String email, String optionalName, String postalAddress, User creator) throws GigiApiException {
if ( !creator.isInGroup(Group.ORGASSURER)) {
- throw new GigiApiException("Only org-assurers may create organisations.");
+ throw new GigiApiException("Only Organisation RA Agents may create organisations.");
}
this.name = name;
this.state = state;
public synchronized void addAdmin(User admin, User actor, boolean master) throws GigiApiException {
if ( !admin.canAssure()) {
- throw new GigiApiException("Cannot add non-assurer.");
+ throw new GigiApiException("Cannot add person who is not RA Agent.");
}
if ( !actor.isInGroup(Group.ORGASSURER) && !isMaster(actor)) {
- throw new GigiApiException("Only org assurer or master-admin may add admins to an organisation.");
+ throw new GigiApiException("Only Organisation RA Agents or Organisation Administrators may add admins to an organisation.");
}
try (GigiPreparedStatement ps1 = new GigiPreparedStatement("SELECT 1 FROM `org_admin` WHERE `orgid`=? AND `memid`=? AND `deleted` IS NULL")) {
ps1.setInt(1, getId());
public void removeAdmin(User admin, User actor) throws GigiApiException {
if ( !actor.isInGroup(Group.ORGASSURER) && !isMaster(actor)) {
- throw new GigiApiException("Only org assurer or master-admin may delete admins from an organisation.");
+ throw new GigiApiException("Only Organisation RA Agents or Organisation Administrators may delete admins from an organisation.");
}
try (GigiPreparedStatement ps = new GigiPreparedStatement("UPDATE org_admin SET deleter=?, deleted=NOW() WHERE orgid=? AND memid=?")) {
ps.setInt(1, actor.getId());
<H4><?=_ET?></H4>
<p><?=_If you would like to view news items or change languages you can click the logout or go home links. Go home doesn't log you out of the system, just returns you to the front of the website. Logout logs you out of the system.?></p>
<H4><?=_My Details?></H4>
-<p><?=_In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.?></p>
+<p><?=_In this section you will be able to edit your personal information (if you haven't been verified), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned verification event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.?></p>
<h4><?=_Email Accounts and Client Certificates?></h4>
<p><?=_The email account section is for adding/updating/removing email accounts which can be used to issue client certificates against. The client certificate section steps you through generating a certificate signing request for one or more emails you've registered in the email account section.?></p>
<h4><?=_Domains and Server Certificates.?></h4>
<h4><?=_Org Client and Server Certificates?></h4>
<p><?=_Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.?></p>
<h4><?=_ET Web of Trust?></h4>
-<p><?=_The Web of Trust system ET uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. ET differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.?></p>
-<p><b><?=_For information about the TTP-assisted-assurance program please read !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' and !'<a href="//wiki.cacert.org/TTP/TTPAL"> https://wiki.cacert.org/TTP/TTPAL</a>'.?></b></p>
+<p><?=_The Web of Trust system ET uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. ET differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you. Once you've met up you can show your ID and you will need to fill out a verification form which the person assuring your details must retain for verification reasons.?></p>
+<p><b><?=_For information about the TTP-assisted-verification program please read !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' and !'<a href="//wiki.cacert.org/TTP/TTPAL"> https://wiki.cacert.org/TTP/TTPAL</a>'.?></b></p>
<h3><?=_For SomeCA Community Members?></h3>
-<p><?=_Have you passed the SomeCA !'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">'Assurer Challenge!'</a>' yet??></p>
+<p><?=_Have you passed the SomeCA !'<a href="http://wiki.cacert.org/wiki/AssurerChallenge">'Agent Qualifying Challenge!'</a>' yet??></p>
<p><?=_Have you read the !'<a href="/policy/TermsofService.html">'Terms of Service!'</a>' yet??></p>
verifiedCN = name;
} else {
if (nameTemp.isRequired()) {
- error.mergeInto(new GigiApiException("The name entered, does not match the details in your account. You cannot issue certificates with this name. Enter a name that matches the one that has been assured in your account, because a name is required for this certificate type."));
+ error.mergeInto(new GigiApiException("The name entered, does not match the details in your account. You cannot issue certificates with this name. Enter a name that matches the one that has been verified in your account, because a name is required for this certificate type."));
} else if (name.equals(DEFAULT_CN)) {
verifiedCN = DEFAULT_CN;
} else {
name = DEFAULT_CN;
- error.mergeInto(new GigiApiException("The name entered, does not match the details in your account. You cannot issue certificates with this name. Enter a name that matches the one that has been assured in your account or keep the default name."));
+ error.mergeInto(new GigiApiException("The name entered, does not match the details in your account. You cannot issue certificates with this name. Enter a name that matches the one that has been verified in your account or keep the default name."));
}
}
} else {
<?=_Currently we only issue certificates for Punycode domains if the person requesting them has code signing attributes attached to their account, as these have potentially slightly higher security risk.?>
</p>
<? } else { ?>
-Please contact your Organisation Assurer to add a domain.
+Please contact your Organisation RA Agent to add a domain.
<? } ?>
<td><a href="./<?=$id?>/trainings"><?=_Show?></a></td>
</tr>
<tr>
- <td><?=_Is Assurer?>:</td>
+ <td><?=_Is RA Agent?>:</td>
<td>
<? if($assurer) { ?>
<?=_Yes?>
</td>
</tr>
<tr>
- <td><?=_Assurance Points?>:</td>
+ <td><?=_Verification Points?>:</td>
<td><?=$assurancepoints?></td>
</tr>
<tr>
o.addAdmin(byEmail, LoginPage.getUser(req), req.getParameter("master") != null);
return true;
} else {
- out.println(Page.getLanguage(req).getTranslation("Requested user is not an assurer. We need an assurer here."));
+ out.println(Page.getLanguage(req).getTranslation("Requested user is not a RA Agent. We need a RA Agent here."));
}
}
out.println(Page.getLanguage(req).getTranslation("No action could have been carried out."));
<table class="table">
<thead>
-<tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
+<tr><th colspan="2"><?=_Verification Confirmation?></th></tr>
</thead>
<tbody>
-<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met ${name} in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the SomeCA Arbitrator for any issues with this Assurance.?>
+<tr><td colspan="2"><?=_Please check the following details match against what you witnessed when you met ${name} in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the SomeCA Arbitrator for any issues with this Verification.?>
</td></tr>
<tr>
</tr>
<tr>
<td><?=_Date?></td>
- <td><input class="form-control" type="text" name="date" value="<?=$date?>"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
+ <td><input class="form-control" type="text" name="date" value="<?=$date?>"><br/><?=_The date when the verification took place. Please adjust the date if you verified the person on a different day (YYYY-MM-DD).?></td>
</tr>
<tr>
<td><input type="checkbox" name="assertion" value="1"></td>
</tr>
<tr>
<td><input type="checkbox" name="rules" value="1"></td>
- <td><?=_I have read and understood the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>'), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the ToS, Assurance policy and handbook.?></td>
+ <td><?=_I have read and understood the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>'), Verification Policy and the Verification Handbook. I am making this verification subject to and in compliance with the ToS, Verification Policy and Handbook.?></td>
</tr>
<tr>
<td><?=_Policy?>: </td>
<td>
<a href="/policy/TermsOfService.html" target="_blank"><?=_Terms of Service?></a>
- - <a href="/policy/AssurancePolicy.php" target="_blank"><?=_Assurance Policy?></a>
- - <a href="http://wiki.cacert.org/AssuranceHandbook2" target="_blank"><?=_Assurance Handbook?></a>
+ - <a href="/policy/AssurancePolicy.php" target="_blank"><?=_Verification Policy?></a>
+ - <a href="http://wiki.cacert.org/AssuranceHandbook2" target="_blank"><?=_Verification Handbook?></a>
</td>
</tr>
<tr>
</tr>
<tr>
<td><input type="checkbox" name="passwordReset" value="1" <? if($aword) { ?>checked<? } ?>></td>
- <td><?=_I have conducted a passwort reset with assurance. The established "A-Word" is:?><input type="text" name="passwordResetValue" value="<? if($aword) { ?><?=$aword?><? } ?>"></td>
+ <td><?=_I have conducted a password reset with verification. The established "A-Word" is:?><input type="text" name="passwordResetValue" value="<? if($aword) { ?><?=$aword?><? } ?>"></td>
</tr>
<tr>
<td colspan="2">
- <input type="submit" name="process" value="<?=_I confirm this Assurance?>" />
+ <input type="submit" name="process" value="<?=_I confirm this verification?>" />
<input type="submit" name="cancel" value="<?=_Cancel?>" />
</td>
</tr>
<table class="table">
<thead>
<tr>
- <th colspan="2" class="title"><?=_Assure Someone?></th>
+ <th colspan="2" class="title"><?=_Verify Someone?></th>
</tr>
</thead>
<tbody>
<?=$pointlist?>
-<h2><?=_Assurance Points You Issued?></h2>
+<h2><?=_Verification Points You Issued?></h2>
<?=$madelist?>
-<?=_Assurance points?>: <?=$assP?><br/>
+<?=_Verification points?>: <?=$assP?><br/>
<? if($expP) { ?>
<?=_Experience points?>: <?=$expP?><br/>
<?=_Max points to issue?>: <?=$maxP?><br/>
</tr>-->
<tr>
<td colspan="2" >
- <input type="submit" name="ttp" value="<?=_I need a TTP assurance?>">
+ <input type="submit" name="ttp" value="<?=_I need a TTP verification?>">
</td>
</tr>
</table>
<h3><?=_Trusted Third Parties?></h3>
-<p><?=_The Trusted Third Party (TTP) programme is intended to be used in areas without many SomeCA Assurers.?></p>
+<p><?=_The Trusted Third Party (TTP) programme is intended to be used in areas without many SomeCA RA Agents.?></p>
<p><?=_A Trusted Third Party (TTP) is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on.?></p>
-<p><?=_With the TTP programme you can potentially gain assurance up to a maximum of 100 assurance points.?></p>
+<p><?=_With the TTP programme you can potentially gain verification up to a maximum of 100 verification points.?></p>
-<p><?=_Currently SomeCA has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.?></p>
+<p><?=_Currently SomeCA has only developed the TTP programme to the level that you can gain 70 verification points by TTP verification.?></p>
-<p><?=_We are working to develop a process that will fill the gap of the missing 30 assurance points to allow you to get the maximum 100 assurance points.?> </p>
+<p><?=_We are working to develop a process that will fill the gap of the missing 30 verification points to allow you to get the maximum 100 verification points.?> </p>
-<p><?=_In the meanwhile you would need to close this gap with face to face assurances with SomeCA Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.?></p>
+<p><?=_In the meanwhile you would need to close this gap with face to face verifications with SomeCA RA Agents. Think not only travelling to populated countries, but also remember that RA Agents may occasionally visit your country or area.?></p>
<p><?=_If you are interested in the TTP programme, read the pages !'<a href="//wiki.cacert.org/TTP/TTPuser">https://wiki.cacert.org/TTP/TTPuser</a>' for the basic way how the TTP programme works for you, and !'<a href="//wiki.cacert.org/TTP/TTPAL">https://wiki.cacert.org/TTP/TTPAL</a>' whether the TTP programme affects the country where you are located.?> </p>
<? if($ttp) { ?>
-<p><?=_If you want to ask for TTP assurances fill out the missing data and send the request to support@cacert.org to start the process. SomeCA will then inform you about the next steps.?></p>
+<p><?=_If you want to ask for TTP verifications fill out the missing data and send the request to support@cacert.org to start the process. SomeCA will then inform you about the next steps.?></p>
<?=$form?>
<? } ?>
<? if($topup) { ?>
-<p><?=_As you have already got 2 TTP assurances you can only take part in the TTP TOPUP programme. If you want to ask for the TTP TOPUP programme use the submit button to send the request to support@cacert.org to start the process. SomeCA will then inform you about the next steps.?></p>
+<p><?=_As you have already got 2 TTP verifications you can only take part in the TTP TOPUP programme. If you want to ask for the TTP TOPUP programme use the submit button to send the request to support@cacert.org to start the process. SomeCA will then inform you about the next steps.?></p>
<form method="post" action="ttp">
<input type="submit" name="ttptopup" value="<?=_I need a TTP TOPUP?>">
</form>
-<p><?=_We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 assurance points to 100 assurance points. Meanwhile you have to close this gap with face to face assurances from SomeCA Assurers. Think not only travelling to populated countries, but as well to assurers visiting your country or area.?></p>
+<p><?=_We are working to develop the TTP TOPUP process to be able to fill the gap of the missing 30 verification points to 100 verification points. Meanwhile you have to close this gap with face to face verification from SomeCA RA Agent. Think not only traveling to populated countries, but as well to RA Agent visiting your country or area.?></p>
<? } ?>
<? if($nothing) { ?>
<p><?=_You reached the maximum points that can be granted by the TTP programme and therefore you cannot take part in the TTP programme any more.?></p>
<? } ?>
<? if($inProgress) { ?>
-<p><?=_Your request for a TTP assurance is in progress. Please be patient.?></p>
+<p><?=_Your request for a TTP verification is in progress. Please be patient.?></p>
<? } ?>
<h3><?=_CAcert Web of Trust Rules?></h3>
-<p><?=_It is essential that SomeCA Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system.?></p>
+<p><?=_It is essential that SomeCA RA Agents understand and follow the rules below to ensure that applicants for verifcations are suitably identified, which, in turn, maintains trust in the system.?></p>
<p><?=_Contact?><br>
<br>
* <?=_You must meet the applicant in person;?><br>
-* <?=_You must sight at least one form of government issued photo identification. It's preferable if 2 forms of Government issued photo ID are presented, as less points may be issued if there is any doubt on the person by the person issuing points;?><br>
-* <?=_Complete the assurance form if the applicant has not already done so. Ensure that all information matches.?><br>
+* <?=_You must sight at least one form of government issued photo identification. It's preferable if 2 forms of government issued photo ID are presented.;?><br>
+* <?=_Complete the verification form if the applicant has not already done so. Ensure that all information matches.?><br>
</p>
<p><?=_Processing?><br>
-<?=_After the meeting, visit the SomeCA Web site's make an Assurance page and:?><br>
+<?=_After the meeting, visit the SomeCA Web site's verification page and:?><br>
<br>
-* <?=_Enter the applicant's email address;?><br>
+* <?=_Enter the applicant's email address and Date of Birth;?><br>
* <?=_Compare the online information to the information recorded on the paper form;?><br>
* <?=_If, and only if, the two match completely - you may award trust points up to the maximum points you are able to allocate;?><br>
</p>
<?=_You may charge a fee for your expenses if the applicant has been advised of the amount prior to the meeting.?></p>
<p><?=_Liability?><br>
-<?=_A SomeCA Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable.?></p>
+<?=_A SomeCA RA Agent who knowingly, or reasonably ought to have known, verifies the identity of an applicant contrary to this policy may be held liable.?></p>
-<p><?=_Assurance Points?><br>
-<?=_CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change. We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of SomeCA require this.?></p>
+<p><?=_Verification Points?><br>
+<?=_SomeCA may, from time to time, alter the amount of Verification Points that a class of RA Agents may assign as is necessary to effect a policy or rule change. We may also alter the amount of Verification Points available to an individual, or new class of RA Agents, should another policy of SomeCA require this.?></p>
public static void may(User assurer, User assuree, AssuranceType t) throws GigiApiException {
if (assuree.isInGroup(ASSUREE_BLOCKED)) {
- throw new GigiApiException("The assuree is blocked.");
+ throw new GigiApiException("The applicant is blocked.");
}
if (assurer.isInGroup(ASSURER_BLOCKED)) {
- throw new GigiApiException("The assurer is blocked.");
+ throw new GigiApiException("The RA Agent is blocked.");
}
if (t == AssuranceType.NUCLEUS) {
if ( !assurer.isInGroup(Group.NUCLEUS_ASSURER)) {
- throw new GigiApiException("Assurer needs to be Nucleus Assurer.");
+ throw new GigiApiException("RA Agent needs to be Nucleus RA Agent.");
}
return;
} else if (t == AssuranceType.TTP_ASSISTED) {
if ( !assurer.isInGroup(Group.TTP_ASSURER)) {
- throw new GigiApiException("Assurer needs to be TTP Assurer.");
+ throw new GigiApiException("RA Agent needs to be TTP RA Agent.");
}
if ( !assuree.isInGroup(Group.TTP_APPLICANT)) {
- throw new GigiApiException("Assuree needs to be TTP Applicant.");
+ throw new GigiApiException("Applicant needs to be TTP Applicant.");
}
return;
} else if (t == AssuranceType.FACE_TO_FACE) {
return;
}
- throw new GigiApiException("Assurance type not possible.");
+ throw new GigiApiException("Verification type not possible.");
}
private static void assureNucleus(User assurer, User assuree, int awarded, String location, String date) throws GigiApiException {
projects / gigi.git / commitdiff