update + added time limited increase feature for admin
This commit is contained in:
root
parent
7966de6fcd
commit
1e7c974fe9
8 changed files with 205 additions and 42 deletions
98
messages.po
98
messages.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: CAcert\n"
|
"Project-Id-Version: CAcert\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2004-12-31 09:09+1100\n"
|
"POT-Creation-Date: 2005-01-02 14:38+1100\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -86,7 +86,7 @@ msgstr ""
|
||||||
#: includes/account_stuff.php:150 includes/account_stuff.php:158
|
#: includes/account_stuff.php:150 includes/account_stuff.php:158
|
||||||
#: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
|
#: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
|
||||||
#: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
|
#: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
|
||||||
#: www/account/33.php:47 www/account/7.php:28
|
#: www/account/33.php:47 www/account/7.php:27
|
||||||
msgid "Add"
|
msgid "Add"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -253,7 +253,7 @@ msgid "Benefits"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: includes/account.php:49 includes/account.php:389 www/index.php:316
|
#: includes/account.php:49 includes/account.php:389 www/index.php:316
|
||||||
#: www/wot.php:173 www/wot.php:183
|
#: www/wot.php:197 www/wot.php:209 scripts/removedead.php:57
|
||||||
msgid "Best regards"
|
msgid "Best regards"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -289,7 +289,7 @@ msgstr ""
|
||||||
msgid "CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at"
|
msgid "CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:174 www/wot.php:184
|
#: www/wot.php:198 www/wot.php:210 scripts/removedead.php:58
|
||||||
msgid "CAcert Support Team"
|
msgid "CAcert Support Team"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -607,7 +607,7 @@ msgstr ""
|
||||||
|
|
||||||
#: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
|
#: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
|
||||||
#: www/account/43.php:181 www/account/48.php:22 www/account/49.php:34
|
#: www/account/43.php:181 www/account/48.php:22 www/account/49.php:34
|
||||||
#: www/account/7.php:23
|
#: www/account/7.php:22
|
||||||
msgid "Domain"
|
msgid "Domain"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -917,11 +917,11 @@ msgstr ""
|
||||||
msgid "Howto Information"
|
msgid "Howto Information"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot/6.php:89
|
#: www/wot/6.php:98
|
||||||
msgid "I am sure of myself"
|
msgid "I am sure of myself"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot/6.php:78
|
#: www/wot/6.php:87
|
||||||
msgid "I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that CAcert may challenge this assurance and call upon me to prove the basis for it, and that I may be held responsible if I cannot provide such proof."
|
msgid "I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that CAcert may challenge this assurance and call upon me to prove the basis for it, and that I may be held responsible if I cannot provide such proof."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -942,7 +942,7 @@ msgstr ""
|
||||||
msgid "I don't want to be listed"
|
msgid "I don't want to be listed"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot/6.php:82
|
#: www/wot/6.php:91
|
||||||
msgid "I have read and understood the Rules For Assurers and am making this assurance subject to and in compliance with these rules."
|
msgid "I have read and understood the Rules For Assurers and am making this assurance subject to and in compliance with these rules."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1002,6 +1002,10 @@ msgstr ""
|
||||||
msgid "If you need to contact us in writing, address your mail to:"
|
msgid "If you need to contact us in writing, address your mail to:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: scripts/removedead.php:55
|
||||||
|
msgid "If you needed more time or any other extenuating circumstances you should contact us immediately so this situation can be dealt with immediately."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: www/account/0.php:18
|
#: www/account/0.php:18
|
||||||
msgid "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."
|
msgid "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."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1069,6 +1073,10 @@ msgstr ""
|
||||||
msgid "Invalid date of birth"
|
msgid "Invalid date of birth"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot/6.php:78
|
||||||
|
msgid "Issuing a temporary increase will automatically boost their points to 200 points for a nomindated amount of days, after which the person will be reduced to 150 points regardless of the amount of points they had previously. Regardless of method chosen above it will be recorded in the system as an Administrative Increase and there is a maximum amount of 45 days that points can be issued for."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot/3.php:17
|
#: www/wot/3.php:17
|
||||||
msgid "It is essential that CAcert Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system."
|
msgid "It is essential that CAcert Assurers understand and follow the rules below to ensure that applicants for assurance are suitably identified, which, in turn, maintains trust in the system."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1273,11 +1281,11 @@ msgstr ""
|
||||||
#: includes/account.php:1685 includes/account.php:1728
|
#: includes/account.php:1685 includes/account.php:1728
|
||||||
#: includes/account.php:1754 includes/account.php:1773
|
#: includes/account.php:1754 includes/account.php:1773
|
||||||
#: includes/account.php:1801 includes/general.php:296 includes/general.php:374
|
#: includes/account.php:1801 includes/general.php:296 includes/general.php:374
|
||||||
#: www/account.php:41 www/error404.php:17 www/wot.php:22 www/wot.php:188
|
#: www/account.php:41 www/error404.php:17 www/wot.php:22 www/wot.php:124
|
||||||
#: www/wot.php:207 www/wot.php:219 www/wot.php:230 www/account/15.php:23
|
#: www/wot.php:221 www/wot.php:240 www/wot.php:252 www/wot.php:263
|
||||||
#: www/account/19.php:23 www/account/19.php:42 www/account/19.php:50
|
#: www/account/15.php:23 www/account/19.php:23 www/account/19.php:42
|
||||||
#: www/account/23.php:23 www/account/6.php:21 www/account/6.php:40
|
#: www/account/19.php:50 www/account/23.php:23 www/account/6.php:21
|
||||||
#: www/account/6.php:48
|
#: www/account/6.php:40 www/account/6.php:48
|
||||||
msgid "My CAcert.org Account!"
|
msgid "My CAcert.org Account!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1451,6 +1459,10 @@ msgstr ""
|
||||||
msgid "Now revoking the following certificates:"
|
msgid "Now revoking the following certificates:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot/6.php:81
|
||||||
|
msgid "Number of days"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: includes/general_stuff.php:70
|
#: includes/general_stuff.php:70
|
||||||
msgid "OCSP Details"
|
msgid "OCSP Details"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1487,6 +1499,10 @@ msgstr ""
|
||||||
msgid "Only the first 100 rows are displayed."
|
msgid "Only the first 100 rows are displayed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot/6.php:61
|
||||||
|
msgid "Only tick the next box if the Assurance was face to face."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: www/help/3.php:8
|
#: www/help/3.php:8
|
||||||
msgid "Open Directory Security folder"
|
msgid "Open Directory Security folder"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1602,6 +1618,20 @@ msgstr ""
|
||||||
msgid "Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default."
|
msgid "Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/account/7.php:32
|
||||||
|
msgid "Please Note: You only need to enter the main part of your domain, eg. mydomain.com rather then www.mydomain.com. Once you have verified your domain you are able to enter any sub-domain, such as www.mydomain.com or www.this.is.mydomain.com as the system checks from right to left, rather then specific hostnames when you upload a CSR to the system."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot.php:208
|
||||||
|
#, php-format
|
||||||
|
msgid "Please Note: this is a temporary increase for %s days only. After that time their points will be reduced to 150 points."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot.php:195
|
||||||
|
#, php-format
|
||||||
|
msgid "Please Note: this is a temporary increase for %s days only. After that time your points will be reduced to 150 points."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: www/account/8.php:19
|
#: www/account/8.php:19
|
||||||
msgid "Please choose an authority email address"
|
msgid "Please choose an authority email address"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1623,7 +1653,7 @@ msgid "Please note: All html will be stripped from the contact information box,
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/account/43.php:195 www/account/43.php:230 www/wot/10.php:24
|
#: www/account/43.php:195 www/account/43.php:230 www/wot/10.php:24
|
||||||
#: www/wot/10.php:57 www/wot/6.php:85
|
#: www/wot/10.php:57 www/wot/6.php:94
|
||||||
msgid "Points"
|
msgid "Points"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1828,7 +1858,7 @@ msgstr ""
|
||||||
msgid "Server certificates (un-assured)"
|
msgid "Server certificates (un-assured)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:189
|
#: www/wot.php:222
|
||||||
msgid "Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this."
|
msgid "Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1900,6 +1930,14 @@ msgstr ""
|
||||||
msgid "TTP Form"
|
msgid "TTP Form"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot/6.php:81
|
||||||
|
msgid "Temporary Increase"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: scripts/removedead.php:60
|
||||||
|
msgid "Temporary points increase has expired."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: www/help/2.php:55
|
#: www/help/2.php:55
|
||||||
msgid "Ten Risks of PKI: What You're not Being Told about Public Key Infrastructure"
|
msgid "Ten Risks of PKI: What You're not Being Told about Public Key Infrastructure"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2056,7 +2094,7 @@ msgstr ""
|
||||||
msgid "There is several ways to become a CAcert Assurer, the most common of which is face to face meetings with existing assurers, who check your ID documents (you need to show 2 government issued photo ID where possible otherwise you won't be allocated as many points!)."
|
msgid "There is several ways to become a CAcert Assurer, the most common of which is face to face meetings with existing assurers, who check your ID documents (you need to show 2 government issued photo ID where possible otherwise you won't be allocated as many points!)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:226
|
#: www/wot.php:259
|
||||||
msgid "There was an error and I couldn't proceed"
|
msgid "There was an error and I couldn't proceed"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2361,12 +2399,16 @@ msgstr ""
|
||||||
msgid "You are putting your trust in people you don't know!"
|
msgid "You are putting your trust in people you don't know!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:181
|
#: scripts/removedead.php:54
|
||||||
|
msgid "You are receiving this email because you had a temporary increase to 200 points. This has since expired and you have been reduced to 150 points."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot.php:205
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "You are receiving this email because you have assured %s %s (%s)."
|
msgid "You are receiving this email because you have assured %s %s (%s)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:160
|
#: www/wot.php:181
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "You are receiving this email because you have been assured by %s %s (%s)."
|
msgid "You are receiving this email because you have been assured by %s %s (%s)."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2432,7 +2474,7 @@ msgstr ""
|
||||||
msgid "You have now created a public/private key pair. The private key is stored locally on your machine. The public portion is sent to CAcert in the form of a CSR."
|
msgid "You have now created a public/private key pair. The private key is stored locally on your machine. The public portion is sent to CAcert in the form of a CSR."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:182
|
#: www/wot.php:206
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "You issued them %s points and they now have %s points in total."
|
msgid "You issued them %s points and they now have %s points in total."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2462,11 +2504,11 @@ msgstr ""
|
||||||
msgid "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;"
|
msgid "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;"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:170
|
#: www/wot.php:191
|
||||||
msgid "You now have over 100 points and can start assuring others."
|
msgid "You now have over 100 points and can start assuring others."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:165
|
#: www/wot.php:186
|
||||||
msgid "You now have over 50 points, and can now have your name added to client certificates, and issue server certificates for up to 2 years."
|
msgid "You now have over 50 points, and can now have your name added to client certificates, and issue server certificates for up to 2 years."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2482,11 +2524,15 @@ msgstr ""
|
||||||
msgid "You then need to add the domain you have control of to your account, which you can do:"
|
msgid "You then need to add the domain you have control of to your account, which you can do:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: www/wot.php:125
|
||||||
|
msgid "You tried to give a temporary points increase to someone that already has more then 150 points. Can't continue."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: includes/account.php:1676
|
#: includes/account.php:1676
|
||||||
msgid "You tried to use an invalid language."
|
msgid "You tried to use an invalid language."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:161
|
#: www/wot.php:182
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "You were issued %s points and you now have %s points in total."
|
msgid "You were issued %s points and you now have %s points in total."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2511,7 +2557,7 @@ msgstr ""
|
||||||
msgid "You'll prepare the request now, but you can only submit the request via the online request forms. We do not accept CSRs via email."
|
msgid "You'll prepare the request now, but you can only submit the request via the online request forms. We do not accept CSRs via email."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:186
|
#: www/wot.php:212
|
||||||
msgid "You've Assured Another Member."
|
msgid "You've Assured Another Member."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2519,7 +2565,7 @@ msgstr ""
|
||||||
msgid "You've attempted to verify the same domain a fourth time with an invalid hash, subsequantly this request has been deleted in the system"
|
msgid "You've attempted to verify the same domain a fourth time with an invalid hash, subsequantly this request has been deleted in the system"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:176
|
#: www/wot.php:200
|
||||||
msgid "You've been Assured."
|
msgid "You've been Assured."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2545,7 +2591,7 @@ msgstr ""
|
||||||
msgid "Your account and/or email address has been verified. You can now start issuing certificates for this address."
|
msgid "Your account and/or email address has been verified. You can now start issuing certificates for this address."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:208
|
#: www/wot.php:241
|
||||||
msgid "Your account information has been updated."
|
msgid "Your account information has been updated."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2581,7 +2627,7 @@ msgstr ""
|
||||||
msgid "Your domain has been verified. You can now start issuing certificates for this domain."
|
msgid "Your domain has been verified. You can now start issuing certificates for this domain."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: www/wot.php:220
|
#: www/wot.php:253
|
||||||
msgid "Your email has been sent to "
|
msgid "Your email has been sent to "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" class="title"><?=_("Add Domain")?></td>
|
<td colspan="2" class="title"><?=_("Add Domain")?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class="DataTD" width="125"><?=_("Domain")?>: </td>
|
<td class="DataTD" width="125"><?=_("Domain")?>: </td>
|
||||||
<td class="DataTD" width="125"><input type="text" name="newdomain"></td>
|
<td class="DataTD" width="125"><input type="text" name="newdomain"></td>
|
||||||
|
|
@ -30,3 +29,5 @@
|
||||||
</table>
|
</table>
|
||||||
<input type="hidden" name="oldid" value="<?=$id?>">
|
<input type="hidden" name="oldid" value="<?=$id?>">
|
||||||
</form>
|
</form>
|
||||||
|
<p><?=_("Please Note: You only need to enter the main part of your domain, eg. mydomain.com rather then www.mydomain.com. Once you have verified your domain you are able to enter any sub-domain, such as www.mydomain.com or www.this.is.mydomain.com as the system checks from right to left, rather then specific hostnames when you upload a CSR to the system.")?></p>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,4 +43,23 @@ Mch2LMZhK4h/SBIft5ROzVU=
|
||||||
=R/pJ
|
=R/pJ
|
||||||
-----END PGP SIGNATURE-----
|
-----END PGP SIGNATURE-----
|
||||||
</pre>
|
</pre>
|
||||||
|
<pre>
|
||||||
|
-----BEGIN PGP SIGNED MESSAGE-----
|
||||||
|
Hash: SHA1
|
||||||
|
|
||||||
|
pub 1024D/65D0FD58 2003-07-11 CA Cert Signing Authority (Root CA) <gpg@cacert.org>
|
||||||
|
Key fingerprint = A31D 4F81 EF4E BD07 B456 FA04 D2BB 0D01 65D0 FD58
|
||||||
|
sub 2048g/113ED0F2 2003-07-11 [expires: 2033-07-03]
|
||||||
|
|
||||||
|
pub 1024D/9E2BD1F2 2003-08-05 CA Cert Signing Authority (Low Security Key) <lowgpg@cacert.org>
|
||||||
|
Key fingerprint = 9F94 ACDD D289 67E7 1FB7 1C3A 77AE 7F12 9E2B D1F2
|
||||||
|
sub 2048g/456D7D4B 2003-08-05 [expires: 2033-07-28]
|
||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.2.4 (GNU/Linux)
|
||||||
|
|
||||||
|
iD8DBQFB1JbY0rsNAWXQ/VgRAnVYAJ4uK8zjeTn/a3Wc1j66iQiQtgvV+wCfS/Re
|
||||||
|
NSTpDmG+DqGpqTh1Hn1Uf2g=
|
||||||
|
=/mLy
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
|
</pre>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -43,4 +43,23 @@ Mch2LMZhK4h/SBIft5ROzVU=
|
||||||
=R/pJ
|
=R/pJ
|
||||||
-----END PGP SIGNATURE-----
|
-----END PGP SIGNATURE-----
|
||||||
</pre>
|
</pre>
|
||||||
|
<pre>
|
||||||
|
-----BEGIN PGP SIGNED MESSAGE-----
|
||||||
|
Hash: SHA1
|
||||||
|
|
||||||
|
pub 1024D/65D0FD58 2003-07-11 CA Cert Signing Authority (Root CA) <gpg@cacert.org>
|
||||||
|
Key fingerprint = A31D 4F81 EF4E BD07 B456 FA04 D2BB 0D01 65D0 FD58
|
||||||
|
sub 2048g/113ED0F2 2003-07-11 [expires: 2033-07-03]
|
||||||
|
|
||||||
|
pub 1024D/9E2BD1F2 2003-08-05 CA Cert Signing Authority (Low Security Key) <lowgpg@cacert.org>
|
||||||
|
Key fingerprint = 9F94 ACDD D289 67E7 1FB7 1C3A 77AE 7F12 9E2B D1F2
|
||||||
|
sub 2048g/456D7D4B 2003-08-05 [expires: 2033-07-28]
|
||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.2.4 (GNU/Linux)
|
||||||
|
|
||||||
|
iD8DBQFB1JbY0rsNAWXQ/VgRAnVYAJ4uK8zjeTn/a3Wc1j66iQiQtgvV+wCfS/Re
|
||||||
|
NSTpDmG+DqGpqTh1Hn1Uf2g=
|
||||||
|
=/mLy
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
|
</pre>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
?>
|
?>
|
||||||
<? if($_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
|
<? if($_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
|
||||||
<form method="post" action="wot.php">
|
<form method="post" action="wot.php">
|
||||||
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
|
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="600">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2" class="title"><?=_("Assurance Confirmation")?></td>
|
<td colspan="2" class="title"><?=_("Assurance Confirmation")?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="DataTD" colspan="2">Only tick the next box if the Assurance was face to face</td>
|
<td class="DataTD" colspan="2"><?=_("Only tick the next box if the Assurance was face to face.")?></td>
|
||||||
</tr>
|
</tr>
|
||||||
<? } ?>
|
<? } ?>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -73,6 +73,15 @@
|
||||||
<td class="DataTD"><?=_("Date")?>:</td>
|
<td class="DataTD"><?=_("Date")?>:</td>
|
||||||
<td class="DataTD"><input type="text" name="date" value="<?=$_POST['date']?>"><br><?=_("Only fill this in if you assured the person on a different day")?></td>
|
<td class="DataTD"><input type="text" name="date" value="<?=$_POST['date']?>"><br><?=_("Only fill this in if you assured the person on a different day")?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<? if($_SESSION['profile']['admin'] == 1 && $_SESSION['_config']['pointsalready'] <= 150) { ?>
|
||||||
|
<tr>
|
||||||
|
<td class="DataTD" colspan="2"><?=_("Issuing a temporary increase will automatically boost their points to 200 points for a nomindated amount of days, after which the person will be reduced to 150 points regardless of the amount of points they had previously. Regardless of method chosen above it will be recorded in the system as an Administrative Increase and there is a maximum amount of 45 days that points can be issued for.")?></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="DataTD"><nobr><?=_("Temporary Increase")?>:</nobr><br><nobr><?=_("Number of days")?></nobr></td>
|
||||||
|
<td class="DataTD"><input type="text" name="expire" value="<?=$_POST['expire']?>"></td>
|
||||||
|
</tr>
|
||||||
|
<? } ?>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="DataTD"><input type="checkbox" name="assertion" value="1"<? if($_POST['assertion'] == 1) echo " checked"; ?>></td>
|
<td class="DataTD"><input type="checkbox" name="assertion" value="1"<? if($_POST['assertion'] == 1) echo " checked"; ?>></td>
|
||||||
<td class="DataTD"><?=_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that CAcert may challenge this assurance and call upon me to prove the basis for it, and that I may be held responsible if I cannot provide such proof.")?></td>
|
<td class="DataTD"><?=_("I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that CAcert may challenge this assurance and call upon me to prove the basis for it, and that I may be held responsible if I cannot provide such proof.")?></td>
|
||||||
|
|
|
||||||
|
|
@ -14,15 +14,51 @@
|
||||||
PARTICULAR PURPOSE. See the License for more details.
|
PARTICULAR PURPOSE. See the License for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
include_once("../includes/mysql.php");
|
include_once("/home/cacert/www/includes/mysql.php");
|
||||||
|
|
||||||
$query = "select * from `users` where `users`.`verified`=0 and
|
$query = "select * from `users` where `users`.`verified`=0 and
|
||||||
(UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(`users`.`created`)) >= 86400";
|
(UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(`users`.`created`)) >= 172800";
|
||||||
$res = mysql_query($query);
|
$res = mysql_query($query);
|
||||||
while($row = mysql_fetch_assoc($res))
|
while($row = mysql_fetch_assoc($res))
|
||||||
{
|
{
|
||||||
echo $row['email']."\n";
|
|
||||||
mysql_query("delete from `email` where `memid`='".$row['id']."'");
|
mysql_query("delete from `email` where `memid`='".$row['id']."'");
|
||||||
mysql_query("delete from `users` where `id`='".$row['id']."'");
|
mysql_query("delete from `users` where `id`='".$row['id']."'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$query = "select * from `notary` where `expire`!=0 and `expire`<NOW()";
|
||||||
|
$res = mysql_query($query);
|
||||||
|
while($row = mysql_fetch_assoc($res))
|
||||||
|
{
|
||||||
|
$query = "select sum(`points`) as `points` from `notary` where `to`='$row[to]' and `expire`=0 group by `to`";
|
||||||
|
$dres = mysql_query($query);
|
||||||
|
$drow = mysql_fetch_assoc($dres);
|
||||||
|
if($drow['points'] >= 150)
|
||||||
|
{
|
||||||
|
$query = "delete from `notary` where `to`='$row[to]' and `from`='$row[from]' and `expire`='$row[expire]'";
|
||||||
|
} else {
|
||||||
|
$newpoints = 150 - $drow['points'];
|
||||||
|
$query = "update `notary` set `expire`=0, `points`='$newpoints' where `to`='$row[to]' and `from`='$row[from]' and `expire`='$row[expire]'";
|
||||||
|
}
|
||||||
|
|
||||||
|
$data = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$row[to]'"));
|
||||||
|
$body = sprintf("%s %s (%s) had a temporary increse, but this has just expired and they have been reduced to 150 points.", $data['fname'], $data['lname'], $data['email'])."\n\n";
|
||||||
|
sendmail("cacert-board@lists.cacert.org", "[CAcert.org] Temporary Increase Expired.", $body, "website@cacert.org", "returns@cacert.org", "", "CAcert Website");
|
||||||
|
|
||||||
|
if($data['language'] != "")
|
||||||
|
{
|
||||||
|
$userlang = $data['language'];
|
||||||
|
putenv("LANG=".$userlang);
|
||||||
|
setlocale(LC_ALL, $userlang);
|
||||||
|
}
|
||||||
|
|
||||||
|
$body = _("You are receiving this email because you had a temporary increase to 200 points. This has since expired and you have been reduced to 150 points.")."\n\n";
|
||||||
|
$body = _("If you needed more time or any other extenuating circumstances you should contact us immediately so this situation can be dealt with immediately.")."\n\n";
|
||||||
|
|
||||||
|
$body .= _("Best regards")."\n";
|
||||||
|
$body .= _("CAcert Support Team");
|
||||||
|
|
||||||
|
sendmail($data['email'], "[CAcert.org] "._("Temporary points increase has expired."), $body, "support@cacert.org", "returns@cacert.org", "", "CAcert Website");
|
||||||
|
|
||||||
|
mysql_query($query);
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?
|
<?
|
||||||
if($process == "Confirm, I agree to these terms and conditions" && $iagree == "yes")
|
if($process == "Confirm, I agree to these terms and conditions" && $iagree == "yes")
|
||||||
{
|
{
|
||||||
$output_file = $fname = "cacert-20041209.tar.bz2";
|
$output_file = $fname = "cacert-20041231.tar.bz2";
|
||||||
|
|
||||||
header('Pragma: public');
|
header('Pragma: public');
|
||||||
|
|
||||||
|
|
|
||||||
39
www/wot.php
39
www/wot.php
|
|
@ -118,12 +118,28 @@
|
||||||
$query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`";
|
$query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`";
|
||||||
$res = mysql_query($query);
|
$res = mysql_query($query);
|
||||||
$drow = mysql_fetch_assoc($res);
|
$drow = mysql_fetch_assoc($res);
|
||||||
|
|
||||||
|
if($_SESSION['profile']['admin'] == 1 && intval($_POST['expire']) > 0 && $drow['total'] > 1500)
|
||||||
|
{
|
||||||
|
showheader(_("My CAcert.org Account!"));
|
||||||
|
echo "<p>"._("You tried to give a temporary points increase to someone that already has more then 150 points. Can't continue.")."</p>";
|
||||||
|
showfooter();
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($_SESSION['profile']['admin'] == 1 && intval($_POST['expire']) > 0)
|
||||||
|
{
|
||||||
|
$_POST['method'] == "Administrative Increase";
|
||||||
|
$_POST['points'] = 200 - $drow['total'];
|
||||||
|
} else {
|
||||||
|
$_POST['expire'] = 0;
|
||||||
if(($drow['total'] + $_POST['points']) > 100 && $max < 100)
|
if(($drow['total'] + $_POST['points']) > 100 && $max < 100)
|
||||||
$_POST['points'] = 100 - $drow['total'];
|
$_POST['points'] = 100 - $drow['total'];
|
||||||
if(($drow['total'] + $_POST['points']) > $max && $max >= 100)
|
if(($drow['total'] + $_POST['points']) > $max && $max >= 100)
|
||||||
$_POST['points'] = $max - $drow['total'];
|
$_POST['points'] = $max - $drow['total'];
|
||||||
if($_POST['points'] < 0)
|
if($_POST['points'] < 0)
|
||||||
$_POST['points'] = 0;
|
$_POST['points'] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if(mysql_escape_string(stripslashes($_POST['date'])) == "")
|
if(mysql_escape_string(stripslashes($_POST['date'])) == "")
|
||||||
$_POST['date'] = date("Y-m-d H:i:s");
|
$_POST['date'] = date("Y-m-d H:i:s");
|
||||||
|
|
@ -134,8 +150,13 @@
|
||||||
`location`='".mysql_escape_string(stripslashes($_POST['location']))."',
|
`location`='".mysql_escape_string(stripslashes($_POST['location']))."',
|
||||||
`date`='".mysql_escape_string(stripslashes($_POST['date']))."',
|
`date`='".mysql_escape_string(stripslashes($_POST['date']))."',
|
||||||
`when`=NOW()";
|
`when`=NOW()";
|
||||||
if($_SESSION['profile']['admin'] == 1)
|
if($_SESSION['profile']['admin'] == 1 && intval($_POST['expire']) > 0)
|
||||||
|
{
|
||||||
|
$query .= ",\n`method`='Administrative Increase'";
|
||||||
|
$query .= ",\n`expire`=DATE_ADD(NOW(), INTERVAL '".intval($_POST['expire'])."' DAY)";
|
||||||
|
} else if($_SESSION['profile']['admin'] == 1) {
|
||||||
$query .= ",\n`method`='".mysql_escape_string(stripslashes($_POST['method']))."'";
|
$query .= ",\n`method`='".mysql_escape_string(stripslashes($_POST['method']))."'";
|
||||||
|
}
|
||||||
mysql_query($query);
|
mysql_query($query);
|
||||||
if($_SESSION['profile']['points'] < 150)
|
if($_SESSION['profile']['points'] < 150)
|
||||||
{
|
{
|
||||||
|
|
@ -153,8 +174,8 @@
|
||||||
if($_SESSION['_config']['notarise']['language'] != "")
|
if($_SESSION['_config']['notarise']['language'] != "")
|
||||||
{
|
{
|
||||||
$userlang = $_SESSION['_config']['notarise']['language'];
|
$userlang = $_SESSION['_config']['notarise']['language'];
|
||||||
putenv("LANG=".$_SESSION['_config']['translations'][$userlang]);
|
putenv("LANG=".$userlang);
|
||||||
setlocale(LC_ALL, $_SESSION['_config']['translations'][$userlang]);
|
setlocale(LC_ALL, $$userlang);
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
|
$body = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
|
||||||
|
|
@ -170,6 +191,9 @@
|
||||||
$body .= _("You now have over 100 points and can start assuring others.")."\n\n";
|
$body .= _("You now have over 100 points and can start assuring others.")."\n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($_SESSION['profile']['admin'] == 1 && intval($_POST['expire']) > 0)
|
||||||
|
$body .= sprintf(_("Please Note: this is a temporary increase for %s days only. After that time your points will be reduced to 150 points."), intval($_POST['expire']))."\n\n";
|
||||||
|
|
||||||
$body .= _("Best regards")."\n";
|
$body .= _("Best regards")."\n";
|
||||||
$body .= _("CAcert Support Team");
|
$body .= _("CAcert Support Team");
|
||||||
|
|
||||||
|
|
@ -180,11 +204,20 @@
|
||||||
|
|
||||||
$body = sprintf(_("You are receiving this email because you have assured %s %s (%s)."), $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'])."\n\n";
|
$body = sprintf(_("You are receiving this email because you have assured %s %s (%s)."), $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'])."\n\n";
|
||||||
$body .= sprintf(_("You issued them %s points and they now have %s points in total."), $_POST['points'], ($_POST['points'] + $drow['total']))."\n\n";
|
$body .= sprintf(_("You issued them %s points and they now have %s points in total."), $_POST['points'], ($_POST['points'] + $drow['total']))."\n\n";
|
||||||
|
if($_SESSION['profile']['admin'] == 1 && intval($_POST['expire']) > 0)
|
||||||
|
$body .= sprintf(_("Please Note: this is a temporary increase for %s days only. After that time their points will be reduced to 150 points."), intval($_POST['expire']))."\n\n";
|
||||||
$body .= _("Best regards")."\n";
|
$body .= _("Best regards")."\n";
|
||||||
$body .= _("CAcert Support Team");
|
$body .= _("CAcert Support Team");
|
||||||
|
|
||||||
sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You've Assured Another Member."), $body, "support@cacert.org", "returns@cacert.org", "", "CAcert Support");
|
sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You've Assured Another Member."), $body, "support@cacert.org", "returns@cacert.org", "", "CAcert Support");
|
||||||
|
|
||||||
|
if($_SESSION['profile']['admin'] == 1 && intval($_POST['expire']) > 0)
|
||||||
|
{
|
||||||
|
$body = sprintf("%s %s (%s) has issued a temporary increase to 200 points for %s %s (%s) for %s days.", $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'], $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'], intval($_POST['expire']))."\n\n";
|
||||||
|
|
||||||
|
sendmail("cacert-board@lists.cacert.org", "[CAcert.org] Temporary Increase Issued.", $body, "website@cacert.org", "returns@cacert.org", "", "CAcert Website");
|
||||||
|
}
|
||||||
|
|
||||||
showheader(_("My CAcert.org Account!"));
|
showheader(_("My CAcert.org Account!"));
|
||||||
echo "<p>"._("Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this.")."</p>";
|
echo "<p>"._("Shortly you and the person you were assuring will receive an email confirmation. There is no action on your behalf required to complete this.")."</p>";
|
||||||
showfooter();
|
showfooter();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue