BLOCKEDLOGIN("blockedlogin", "may not login"), BLOCKEDCERT("blockedcert", "may not issue certificates"), //
TTP_ASSURER("ttp-assurer", "may verify via TTP"), TTP_APPLICANT("ttp-applicant", "requests to be verified via ttp"), //
CODESIGNING("codesigning", "may issue codesigning certificates"), ORGASSURER("orgassurer", "may verify organisations"), //
- NUCLEUS_ASSURER("nucleus-assurer", "may issue nucleus assurances"), LOCATE_AGENT("locate-agent", "wants access to the locate agent system");
+ NUCLEUS_ASSURER("nucleus-assurer", "may enter nucleus verifications"), LOCATE_AGENT("locate-agent", "wants access to the locate agent system");
private final String dbName;
public void setDoB(DayDate dob) throws GigiApiException {
synchronized (Notary.class) {
if (getReceivedAssurances().length != 0) {
- throw new GigiApiException("No change after assurance allowed.");
+ throw new GigiApiException("No change after verification allowed.");
}
if ( !CalendarUtil.isOfAge(dob, User.MINIMUM_AGE)) {
</td>
<td align="left">
<label for="login"><?=_Enable certificate login with this certificate?><br />
- <?=_By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .?></label>
+ <?=_By allowing certificate login, this certificate can be used to log into this account at !'<code>https://secure.cacert.org/</code>'.?></label>
</td>
</tr>
<tr>
</thead>
<tbody>
<tr>
- <td><?=_I have a CSR! Paste it here:?><br/>Don't know, what as CSR is and how to create one? Take a look in the <a href="https://wiki.cacert.org/FAQ/CSR">Wiki</a>!</td>
+ <td><?=_I have a CSR! Paste it here:?><br/><?=_Don't know what a CSR is or how to create one? Take a look at the !'<a href="https://wiki.cacert.org/FAQ/CSR">'Wiki!'</a>'!?></td>
<td>
<textarea class="form-control" name="CSR" class="csr"></textarea>
</td>
protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
User user = this.user.getTargetUser();
vars.put("mail", user.getEmail());
+ vars.put("status", l.getTranslation(user.isValidEmail(user.getEmail()) ? "verified" : "not verified"));
vars.put("exNames", new ArrayIterable<Name>(user.getNames()) {
@Override
</tr>
<tr>
<td><?=_Email?>:</td>
- <td><?=$mail?></td>
+ <td><?=$mail?><br/>(<?=$status?>)</td>
</tr>
<? foreach($exNames) { ?>
<tr>
import javax.servlet.http.HttpServletResponse;
import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Domain;
import org.cacert.gigi.dbObjects.EmailAddress;
import org.cacert.gigi.dbObjects.SupportedUser;
import org.cacert.gigi.dbObjects.User;
@Override
public boolean next(Language l, Map<String, Object> vars) {
for (; i < addrs.length;) {
- String address = addrs[i++].getAddress();
+ EmailAddress secAddress = addrs[i++];
+ String address = secAddress.getAddress();
if ( !address.equals(user.getEmail())) {
vars.put("secmail", address);
+ vars.put("status", l.getTranslation(secAddress.isVerified() ? "verified" : "not verified"));
return true;
}
}
return false;
}
});
+
+ final Domain[] doms = user.getDomains();
+ vars.put("domains", new IterableDataset() {
+
+ private int point = 0;
+
+ @Override
+ public boolean next(Language l, Map<String, Object> vars) {
+ if (point >= doms.length) {
+ return false;
+ }
+ Domain domain = doms[point];
+ vars.put("domain", domain.getSuffix());
+ vars.put("status", l.getTranslation(domain.isVerified() ? "verified" : "not verified"));
+ point++;
+ return true;
+ }
+ });
+
vars.put("certifrevoke", new SupportRevokeCertificatesForm(req, targetUser));
getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
}
</tr>
<? foreach($emails) {?>
<tr>
- <td><?=$secmail?></td>
+ <td><?=$secmail?> (<?=$status?>)</td>
</tr>
<? } ?>
</tbody>
</table>
+
+<table class="table">
+ <tbody><tr>
+ <th><?=_Domains?></th>
+ </tr>
+ <? foreach($domains) {?>
+ <tr>
+ <td><?=$domain?> (<?=$status?>)</td>
+ </tr>
+ <? } ?>
+ </tbody>
+</table>
+
<?=$certifrevoke?>
try {
type = AssuranceType.valueOf(val);
} catch (IllegalArgumentException e) {
- gae.mergeInto(new GigiApiException("Assurance Type wrong."));
+ gae.mergeInto(new GigiApiException("Verification Type wrong."));
}
}
int pointsI = 0;
String points = req.getParameter("points");
if (points == null || "".equals(points)) {
- gae.mergeInto(new GigiApiException("For an assurance, you need to enter points."));
+ gae.mergeInto(new GigiApiException("For a verification, you need to enter points."));
} else {
try {
pointsI = Integer.parseInt(points);
if (aword != null && !aword.equals("")) {
Language langApplicant = Language.getInstance(assuree.getPreferredLocale());
- String method = langApplicant.getTranslation("A password reset was triggered. If you did a password reset by assurance, please enter your secret password using this form:");
- String subject = langApplicant.getTranslation("Password reset by assurance");
+ String method = langApplicant.getTranslation("A password reset was triggered. If you did a password reset by verification, please enter your secret password using this form:");
+ String subject = langApplicant.getTranslation("Password reset by verification");
PasswordResetPage.initPasswordResetProcess(out, assuree, req, aword, langApplicant, method, subject);
}
return true;
private static final Template t = new Template(AssuranceForm.class.getResource("AssureeSearch.templ"));
public AssurePage() {
- super("Assure someone");
+ super("Verify someone");
}
AssuranceForm form = Form.getForm(req, AssuranceForm.class);
try {
if (form.submit(out, req)) {
- out.println(translate(req, "Assurance complete."));
+ out.println(translate(req, "Verification complete."));
return;
}
} catch (GigiApiException e) {
projects / gigi.git / commitdiff