<h1><?=_Login?></h1>
<p class='smalltext'><?=_Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.?></p>
<label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" required/><br />
-<label for="password"><?=_Pass Phrase?>:</label><input class="form-control" type='password' name='password' required/><br />
+<label for="password"><?=_Password?>:</label><input class="form-control" type='password' name='password' required/><br />
<button type='submit' name="process" value="Login" class="btn btn-primary"><?=_Login?></button><br /><br />
<p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !(/wiki/lostPassword)wiki page!'</a>' for more information?></p>
</div>
<table class="table">
<thead>
<tr>
- <th colspan="2" class="title"><?=_Change Pass Phrase?></th>
+ <th colspan="2" class="title"><?=_Change Password?></th>
</tr>
</thead>
<tbody>
<td><input type="password" name="private_token" required></td>
</tr>
<tr>
- <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
+ <td><?=_New Password?><span class="formMandatory">*</span>: </td>
<td><input type="password" name="pword1" required></td>
</tr>
<tr>
- <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
+ <td><?=_Password Again?><span class="formMandatory">*</span>: </td>
<td><input type="password" name="pword2" required></td>
</tr>
<tr>
<td colspan="2"><span class="formMandatory">*</span><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. For the current requirements and to learn more, visit our !(/wiki/goodPassword)FAQ!'</a>'.?></td>
</tr>
<tr>
- <td colspan="2"><input type="submit" name="process" value="<?=_Update Pass Phrase?>"></td>
+ <td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
</tr>
</tbody>
</table>
<table class="table">
<thead>
<tr>
- <th colspan="2" class="title"><?=_Change Pass Phrase?></th>
+ <th colspan="2" class="title"><?=_Change Password?></th>
</tr>
</thead>
<tbody>
<tr>
- <td><?=_Old Pass Phrase?>: </td>
+ <td><?=_Old Password?>: </td>
<td><input class="form-control" type="password" name="oldpassword" required></td>
</tr>
<tr>
- <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
+ <td><?=_New Password?><span class="formMandatory">*</span>: </td>
<td><input class="form-control" type="password" name="pword1" required></td>
</tr>
<tr>
- <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
+ <td><?=_Password Again?><span class="formMandatory">*</span>: </td>
<td><input class="form-control" type="password" name="pword2" required></td>
</tr>
<tr>
<td colspan="2"><span class="formMandatory">*</span><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. For the current requirements and to learn more, visit our !(/wiki/goodPassword)FAQ!'</a>'.?></td>
</tr>
<tr>
- <td colspan="2"><input type="submit" name="process" value="<?=_Update Pass Phrase?>"></td>
+ <td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
</tr>
</tbody>
</table>
<label for='SANs'>SANs</label>
</td>
<td align="left">
- <textarea class="form-control" rows='5' name='SANs' placeholder="dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com (or newline separated)"><?=$emails?></textarea><br />
- <?=_Syntax for SAN?>: dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com <?=_(or newline separated)?><br />
+ <textarea class="form-control" rows='5' name='SANs' placeholder="dns:my.domain.example.org, dns:*.example.org, email:my.email@example.org (or newline separated)"><?=$emails?></textarea><br />
+ <?=_Syntax for SAN?>: dns:my.domain.example.org, dns:*.example.org, email:my.email@example.org <?=_(or newline separated)?><br />
<?=_Recommendation for inexperienced users: only use one email address for client certificates.?>
</td>
</tr>
<table class="table">
<tr>
- <td><?=_Email Addresses?> </td>
+ <td><?=_Email Address?> </td>
<td><input class="form-control" type="text" name="newemail" value="" required></td>
</tr>
<tr>
String pw1 = req.getParameter("pword1");
String pw2 = req.getParameter("pword2");
if (pw1 == null || pw1.equals("")) {
- ga.mergeInto(new GigiApiException("Pass Phrases were blank"));
+ ga.mergeInto(new GigiApiException("Passwords were blank"));
} else if ( !pw1.equals(pw2)) {
- ga.mergeInto(new GigiApiException("Pass Phrases don't match"));
+ ga.mergeInto(new GigiApiException("Passwords don't match"));
}
int pwpoints = PasswordStrengthChecker.checkpw(pw1, ni.getNamePartsPlain(), email);
if (pwpoints < 3) {
- ga.mergeInto(new GigiApiException(new SprintfCommand("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
+ ga.mergeInto(new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
}
if ( !ga.isEmpty()) {
throw ga;
</tr>
<tr>
- <td><?=_Pass Phrase?><font color="red">*</font>: </td>
+ <td><?=_Password?><font color="red">*</font>: </td>
<td><input class="form-control" type="password" name="pword1" size="30" autocomplete="off"></td>
<td rowspan="2"> </td>
</tr>
<tr>
- <td><?=_Pass Phrase Again?><font color="red">*</font>: </td>
+ <td><?=_Password Again?><font color="red">*</font>: </td>
<td><input class="form-control" type="password" name="pword2" size="30" autocomplete="off"></td>
</tr>
}
}
if (checkpw(pw, parts.toArray(new String[parts.size()]), email) < 3) {
- throw (new GigiApiException(new SprintfCommand("The Pass Phrase you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
+ throw (new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!'</a>'"))));
}
}
projects / gigi.git / commitdiff