summaryrefslogtreecommitdiff
path: root/cacert/pages/wot
diff options
context:
space:
mode:
Diffstat (limited to 'cacert/pages/wot')
-rw-r--r--cacert/pages/wot/1.php11
-rw-r--r--cacert/pages/wot/2.php7
-rw-r--r--cacert/pages/wot/4.php5
-rw-r--r--cacert/pages/wot/6.php12
4 files changed, 27 insertions, 8 deletions
diff --git a/cacert/pages/wot/1.php b/cacert/pages/wot/1.php
index 8eaab6b..a45b5df 100644
--- a/cacert/pages/wot/1.php
+++ b/cacert/pages/wot/1.php
@@ -87,7 +87,8 @@
} elseif($locid > 0){
echo "</ul>\n</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n<br>\n";
}
-
+ if($locid>0 || $regid>0 || $ccid>0)
+ {
$query = "select *, `users`.`id` as `id` from `users`,`notary` where `listme`='1' and
`ccid`='".$ccid."' and `regid`='".$regid."' and
`locid`='".$locid."' and `users`.`id`=`notary`.`to`
@@ -102,6 +103,8 @@
<td class="title"><?=_("Max Points")?></td>
<td class="title"><?=_("Contact Details")?></td>
<td class="title"><?=_("Email Assurer")?></td>
+ <td class="title"><?=_("Assurer Challenge")?></td>
+
</tr>
<? while($row = mysql_fetch_assoc($list)) { ?>
<tr>
@@ -109,8 +112,12 @@
<td class="DataTD"><?=maxpoints($row['id'])?></td>
<td class="DataTD"><?=$row['contactinfo']?></td>
<td class="DataTD"><a href="wot.php?id=9&amp;userid=<?=intval($row['id'])?>"><?=_("Email Me")?></a></td>
+ <td class="DataTD"><?=$row['assurer']?_("Yes"):("<font color=\"#ff0000\">"._("Not yet!")."</font>")?></td>
+
</tr>
-<? } ?>
+<? }
+ }
+?>
</table>
<br>
<? } ?>
diff --git a/cacert/pages/wot/2.php b/cacert/pages/wot/2.php
index 692d552..a75bc57 100644
--- a/cacert/pages/wot/2.php
+++ b/cacert/pages/wot/2.php
@@ -15,6 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
+<span style="background-color: #FF8080; font-size: 150%">
+Note that the <strong>TTP</strong> programme is effectively <strong>Frozen</strong><br>
+Until a subsidiary policy under AP is written, it is against AP rules.<br>
+</span>
+&nbsp;<br>
<h3><?=_("To become an Assurer")?></h3>
<p><?=_("There are 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!).")?></p>
@@ -28,6 +33,4 @@ Australia</p>
<p><?=_("Upon receiving your documents you will be notified, and points will be added to your account.")?></p>
-<p><?=_("The only other way to receive assurance points is to have had your identity checked by a third party CA, whose policies are suitably set to not let identity fraud run rampant. Please contact us if you would like more details about this.")?></p>
-
<p><?=_("Once you have received at least 100 Assurance Points you will have to pass a test called Assurer Challenge, which can be started at").' <a href="https://cats.cacert.org/">https://cats.cacert.org/</a>!'?></p>
diff --git a/cacert/pages/wot/4.php b/cacert/pages/wot/4.php
index 8ad267f..0da72da 100644
--- a/cacert/pages/wot/4.php
+++ b/cacert/pages/wot/4.php
@@ -15,6 +15,11 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
+<span style="background-color: #FF8080; font-size: 150%">
+Note that the <strong>TTP</strong> programme is effectively <strong>Frozen</strong><br>
+Until a subsidiary policy under AP is written, it is against AP rules.<br>
+</span>
+&nbsp;<br>
<h3><?=_("Trusted Third Parties")?></h3>
<p><?=_("A trusted 3rd party is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on. Other people are allowed to be authoritative in this area as well, such as bank managers, accountants and lawyers.")?></p>
diff --git a/cacert/pages/wot/6.php b/cacert/pages/wot/6.php
index 5cc6f32..bc37aa2 100644
--- a/cacert/pages/wot/6.php
+++ b/cacert/pages/wot/6.php
@@ -82,7 +82,7 @@
</tr>
<? } ?>
<tr>
- <td class="DataTD" colspan="2" align="left"><? printf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. Gross negligence may cause you to be liable."), $row['fname']); ?></td>
+ <td class="DataTD" colspan="2" align="left"><? printf(_("Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance."), $row['fname']); ?></td>
</tr>
<tr>
<td class="DataTD"><?=_("Name")?>:</td>
@@ -143,11 +143,15 @@
<? } ?>
<tr>
<td class="DataTD"><input type="checkbox" name="assertion" value="1"<? if(array_key_exists('assertion',$_POST) && $_POST['assertion'] == 1) echo " checked='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 the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.")?></td>
</tr>
<tr>
<td class="DataTD"><input type="checkbox" name="rules" value="1"<? if(array_key_exists('rules',$_POST) && $_POST['rules'] == 1) echo " checked='checked'"; ?>></td>
- <td class="DataTD"><?=_("I have read and understood the Rules For Assurers and am making this assurance subject to and in compliance with these rules.")?></td>
+ <td class="DataTD"><?=_("I have read and understood the Assurance Policy and the Assurance Handbook and am making this Assurance subject to and in compliance with the policy and handbook.")?></td>
+ </tr>
+ <tr>
+ <td class="DataTD"><?=_("Policy")?>:</td>
+ <td class="DataTD"><a href="/policy/AssurancePolicy.php" target="_NEW"><?=_("Assurance Policy")?></a> - <a href="http://wiki.cacert.org/AssuranceHandbook2" target="_NEW"><?=_("Assurance Handbook")?></a></td>
</tr>
<tr>
<td class="DataTD"><?=_("Points")?>:<br><nobr>(Max <?=maxpoints()?>)</nobr></td>
@@ -158,7 +162,7 @@
<td class="DataTD"><a href="<?=$cap?>" target="_NEW">A4 - <?=_("WoT Form")?></a> <a href="<?=$cap?>&amp;format=letter" target="_NEW">US - <?=_("WoT Form")?></a></td>
</tr>
<tr>
- <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("I am sure of myself")?>"> <input type="submit" name="cancel" value="<?=_("Cancel")?>"></td>
+ <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("I confirm this Assurance")?>"> <input type="submit" name="cancel" value="<?=_("Cancel")?>"></td>
</tr>
</table>
<input type="hidden" name="pagehash" value="<?=$_SESSION['_config']['wothash']?>">