From: INOPIAE Date: Tue, 12 Jul 2016 17:08:44 +0000 (+0200) Subject: upd: exchanged assure, assurance, Assurer with verification and RA Agent X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=a1d3a796a20e7e2f11364b143ec639d5defa8b5f upd: exchanged assure, assurance, Assurer with verification and RA Agent Change-Id: Ie3a463d1f28b2e7a194f43bb5f7f5f3704439707 --- diff --git a/src/org/cacert/gigi/dbObjects/Organisation.java b/src/org/cacert/gigi/dbObjects/Organisation.java index 101c973e..7380381a 100644 --- a/src/org/cacert/gigi/dbObjects/Organisation.java +++ b/src/org/cacert/gigi/dbObjects/Organisation.java @@ -62,7 +62,7 @@ public class Organisation extends CertificateOwner { 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; @@ -137,10 +137,10 @@ public class Organisation extends CertificateOwner { 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()); @@ -161,7 +161,7 @@ public class Organisation extends CertificateOwner { 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()); diff --git a/src/org/cacert/gigi/pages/MainPage.templ b/src/org/cacert/gigi/pages/MainPage.templ index 8ab6329b..3acd4b9e 100644 --- a/src/org/cacert/gigi/pages/MainPage.templ +++ b/src/org/cacert/gigi/pages/MainPage.templ @@ -2,7 +2,7 @@

-

+

@@ -10,5 +10,5 @@

-

-

https://wiki.cacert.org/TTP/TTPuser' and !' https://wiki.cacert.org/TTP/TTPAL'.?>

+

+

https://wiki.cacert.org/TTP/TTPuser' and !' https://wiki.cacert.org/TTP/TTPAL'.?>

diff --git a/src/org/cacert/gigi/pages/MainPageNotLogin.templ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ index 91afad23..0a5f030c 100644 --- a/src/org/cacert/gigi/pages/MainPageNotLogin.templ +++ b/src/org/cacert/gigi/pages/MainPageNotLogin.templ @@ -13,7 +13,7 @@

-

'Assurer Challenge!'' yet??>

+

'Agent Qualifying Challenge!'' yet??>

'Terms of Service!'' yet??>

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java index 12204688..2baf95e8 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java @@ -541,12 +541,12 @@ public class CertificateRequest { 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 { diff --git a/src/org/cacert/gigi/pages/account/domain/DomainOverview.templ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.templ index e5b8bbe7..28dbf87c 100644 --- a/src/org/cacert/gigi/pages/account/domain/DomainOverview.templ +++ b/src/org/cacert/gigi/pages/account/domain/DomainOverview.templ @@ -12,5 +12,5 @@

-Please contact your Organisation Assurer to add a domain. +Please contact your Organisation RA Agent to add a domain. diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ index 511c9b0c..c4f52d0e 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ +++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ @@ -37,7 +37,7 @@ - : + : @@ -47,7 +47,7 @@ - : + : diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.java b/src/org/cacert/gigi/pages/orga/AffiliationForm.java index c8dd3e52..f6a2da7d 100644 --- a/src/org/cacert/gigi/pages/orga/AffiliationForm.java +++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.java @@ -43,7 +43,7 @@ public class AffiliationForm extends Form { 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.")); diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ index b39a3ec5..5bebe9b7 100644 --- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ +++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ @@ -1,9 +1,9 @@ - + - @@ -24,7 +24,7 @@ - + @@ -32,14 +32,14 @@ - + @@ -52,11 +52,11 @@ - + diff --git a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ index f36f87e7..de9282e5 100644 --- a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ +++ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ @@ -2,7 +2,7 @@
+
'ToS!''), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the ToS, Assurance policy and handbook.?>'ToS!''), Verification Policy and the Verification Handbook. I am making this verification subject to and in compliance with the ToS, Verification Policy and Handbook.?>
: - - - - + - + -
checked>
- +
- + diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.templ b/src/org/cacert/gigi/pages/wot/MyPoints.templ index 0129f69a..a0c65480 100644 --- a/src/org/cacert/gigi/pages/wot/MyPoints.templ +++ b/src/org/cacert/gigi/pages/wot/MyPoints.templ @@ -1,8 +1,8 @@ -

+

-:
+:
:
:
diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ index 01cedb86..e1e28df8 100644 --- a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ +++ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ @@ -13,7 +13,7 @@ -->
- +
diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ index 212c4f1c..c187f069 100644 --- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ +++ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.templ @@ -1,35 +1,35 @@

-

+

-

+

-

+

-

+

-

+

https://wiki.cacert.org/TTP/TTPuser' for the basic way how the TTP programme works for you, and !'https://wiki.cacert.org/TTP/TTPAL' whether the TTP programme affects the country where you are located.?>

-

+

-

+

-

+

-

+

diff --git a/src/org/cacert/gigi/pages/wot/Rules.templ b/src/org/cacert/gigi/pages/wot/Rules.templ index 43a87a44..59c2b77f 100644 --- a/src/org/cacert/gigi/pages/wot/Rules.templ +++ b/src/org/cacert/gigi/pages/wot/Rules.templ @@ -1,18 +1,18 @@

-

+



*
-*
-*
+*
+*


-
+

-*
+*
*
*

@@ -24,7 +24,7 @@


-

+

-


-

+


+

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java index 974c128a..e6288988 100644 --- a/src/org/cacert/gigi/util/Notary.java +++ b/src/org/cacert/gigi/util/Notary.java @@ -174,29 +174,29 @@ public class Notary { 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 {