fixes issues #146
Change-Id: If116abe20d4ad61a2bebbd6d74f9bf9186ba2ef1
14 files changed:
/policy/ToS
/policy/CPS
/policy/verification
/policy/ToS
/policy/CPS
/policy/verification
-/wiki/agentQualifyingChallenge
-/wiki/gigi
-/wiki/CSR
-/wiki/names
-/wiki/lostPassword
-/wiki/goodPassword
-/wiki/verificationHandbook
+/kb/acceptableDocuments
+/kb/agentQualifyingChallenge
+/kb/gigi
+/kb/CSR
+/kb/names
+/kb/lostPassword
+/kb/goodPassword
+/kb/verificationHandbook
Page info |
©2016-<?=$year?> <?=_${appName}?> <?=_powered by?> <a href="//wpia.club" target="_blank">WPIA (World Privacy and Identity Association)</a> |
<?=_!(/imprint)Imprint!'</a>'?> |
Page info |
©2016-<?=$year?> <?=_${appName}?> <?=_powered by?> <a href="//wpia.club" target="_blank">WPIA (World Privacy and Identity Association)</a> |
<?=_!(/imprint)Imprint!'</a>'?> |
- <?=_!(/dataPrivacy)Data privacy!'</a>'?>
+ <?=_!(/policy/dataPrivacy)Data privacy!'</a>'?>
<label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" 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 />
<label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" 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>
+<p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !(/kb/lostPassword)knowledge base!'</a>' for more information?></p>
-<p><?=_For general documentation and help, please visit the ${appName} !(/wiki/gigi)Wiki Documentation site!'</a>'.?>
+<p><?=_For general documentation and help, please visit the ${appName} !(/kb/gigi)knowledge base!'</a>'.?>
<?=_For specific policies, see the ${appName} !(/policy)Policies page!'</a>'.?></p>
\ No newline at end of file
<?=_For specific policies, see the ${appName} !(/policy)Policies page!'</a>'.?></p>
\ No newline at end of file
<td><input type="password" name="pword2" required></td>
</tr>
<tr>
<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>
+ <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 !(/kb/goodPassword)FAQ!'</a>'.?></td>
</tr>
<tr>
<td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
</tr>
<tr>
<td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
<td><input class="form-control" type="password" name="pword2" required></td>
</tr>
<tr>
<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>
+ <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 !(/kb/goodPassword)FAQ!'</a>'.?></td>
</tr>
<tr>
<td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
</tr>
<tr>
<td colspan="2"><input type="submit" name="process" value="<?=_Update Password?>"></td>
<a href='<?=$serial?>.cer'><?=_DER encoded Certificate?></a><br/>
<a href='<?=$serial?>.cer?install&chain'><?=_Install into browser.?></a><br/>
<a href='<?=$serial?>.cer?install'><?=_Install into browser (Chrome)?></a>. <?=_Please ensure that the intermediate certificates listed above are installed prior to installing the certificate.?>*<br/><br/>
<a href='<?=$serial?>.cer'><?=_DER encoded Certificate?></a><br/>
<a href='<?=$serial?>.cer?install&chain'><?=_Install into browser.?></a><br/>
<a href='<?=$serial?>.cer?install'><?=_Install into browser (Chrome)?></a>. <?=_Please ensure that the intermediate certificates listed above are installed prior to installing the certificate.?>*<br/><br/>
- * <?=_For information on how to install the root certificates into the truststore of your browser take a look at the !(/wiki/CSR)FAQ!'</a>'!?>
-
+ * <?=_For information on how to install the root certificates into the truststore of your browser take a look at the !(/kb/CSR)FAQ!'</a>'!?>
<p><?=_${appName} offers two ways to create a certificate.?>
<p><?=_${appName} offers two ways to create a certificate.?>
-<?=_One is to paste a certificate signing request (CSR) created from an existing or newly created private key.?> <?=_If you do not know what a CSR is or how to create one take a look at the !(/wiki/CSR)FAQ!'</a>'.?>
+<?=_One is to paste a certificate signing request (CSR) created from an existing or newly created private key.?> <?=_If you do not know what a CSR is or how to create one take a look at the !(/kb/CSR)FAQ!'</a>'.?>
<?=_As an alternative you can generate the private key inside your browser and export it once the certificate has been issued.?></p>
<form method="post">
<table class="table">
<?=_As an alternative you can generate the private key inside your browser and export it once the certificate has been issued.?></p>
<form method="post">
<table class="table">
<?=_Your private information will be used for internal procedures only and will not be shared with third parties.?>
</p>
<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
<?=_Your private information will be used for internal procedures only and will not be shared with third parties.?>
</p>
<p style="border:dotted 1px #900;padding:0.3em;background-color:#ffe;">
-<?=_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>'.?>
+<?=_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 !(/kb/goodPassword)FAQ!'</a>'.?>
vars.put("name", ni);
vars.put("dob", myDoB);
vars.put("email", HTMLEncoder.encodeHTML(email));
vars.put("name", ni);
vars.put("dob", myDoB);
vars.put("email", HTMLEncoder.encodeHTML(email));
- vars.put("helpOnNames", new SprintfCommand("Help on Names {0}in the wiki{1}", Arrays.asList("!(/wiki/names", "!'</a>")));
+ vars.put("helpOnNames", new SprintfCommand("Help on Names {0}in the knowledge base{1}", Arrays.asList("!(/kb/names", "!'</a>")));
vars.put("csrf", getCSRFToken());
vars.put("dobmin", User.MINIMUM_AGE + "");
vars.put("countryCode", cs);
vars.put("csrf", getCSRFToken());
vars.put("dobmin", User.MINIMUM_AGE + "");
vars.put("countryCode", cs);
}
int pwpoints = PasswordStrengthChecker.checkpw(pw1, ni.getNamePartsPlain(), email);
if (pwpoints < 3) {
}
int pwpoints = PasswordStrengthChecker.checkpw(pw1, ni.getNamePartsPlain(), email);
if (pwpoints < 3) {
- 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>'"))));
+ 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("!(/kb/goodPassword", "!'</a>'"))));
}
if ( !ga.isEmpty()) {
throw ga;
}
if ( !ga.isEmpty()) {
throw ga;
- <td colspan="3"><font color="red">*</font><?=_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>
+ <td colspan="3"><font color="red">*</font><?=_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 !(/kb/goodPassword)FAQ!'</a>'.?></td>
<h4><?=_Meeting?></h4>
<ul>
<li><?=_The meeting must be in person. Online meetings are currently not acceptable.?></li>
<h4><?=_Meeting?></h4>
<ul>
<li><?=_The meeting must be in person. Online meetings are currently not acceptable.?></li>
- <li><?=_At least one form of government issued photo identification must to be shown. It's preferable to see more than one form of government issued photo identification if available. A list of acceptable documents can be found !(/acceptableDocuments)here!'</a>'.?></li>
+ <li><?=_At least one form of government issued photo identification must to be shown. It's preferable to see more than one form of government issued photo identification if available. A list of acceptable documents can be found !(/kb/acceptableDocuments)here!'</a>'.?></li>
<li><?=_The verification form must be filled in completely. Preferably, use the pre-filled form provided by the system. All information on the form must match the information in the documents.?></li>
</ul>
<li><?=_The verification form must be filled in completely. Preferably, use the pre-filled form provided by the system. All information on the form must match the information in the documents.?></li>
</ul>
<td>
<?=_!(/policy/ToS)Terms of Service!'</a>'?>
- <?=_!(/policy/verification)Verification Policy!'</a>'?></a>
<td>
<?=_!(/policy/ToS)Terms of Service!'</a>'?>
- <?=_!(/policy/verification)Verification Policy!'</a>'?></a>
- - <?=_!(/wiki/verificationHandbook)Verification Handbook!'</a>'?></a>
+ - <?=_!(/kb/verificationHandbook)Verification Handbook!'</a>'?></a>
}
}
if (checkpw(pw, parts.toArray(new String[parts.size()]), email) < 3) {
}
}
if (checkpw(pw, parts.toArray(new String[parts.size()]), email) < 3) {
- 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>'"))));
+ 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("!(/kb/goodPassword", "!'</a>'"))));
projects / gigi.git / commitdiff