From 3a13ceb2daf4da349341ebd6a3a94614357a05d1 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Tue, 15 Aug 2006 19:00:15 +0000
Subject: [PATCH] bug #300

---
 includes/account_stuff.php |  4 +++-
 pages/wot/5.php            | 10 +++++++++-
 www/wot.php                |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 869bd2b..93d6f6b 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -201,8 +201,10 @@ function hideall() {
         $extra = "?name=".urlencode($name);
 	$extra .= "&dob=".urlencode($_SESSION['profile']['dob']);
         $extra .= "&email=".urlencode($_SESSION['profile']['email']);
+
+	$extra2 = "?assurer=".urlencode($name)."&date=now&maxpoints=".maxpoints();
 ?>
-      <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['points'] < 100) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted Third Parties")?></a></li><li><a href="/cap.php<?=$extra?>">A4 - <?=_("WoT Form")?></a></li><li><a href="/cap.php<?=$extra?>&format=letter">US - <?=_("WoT Form")?></a></li><li><a href="/ttp.php<?=$extra?>">A4 - <?=_("TTP Form")?></li><li><a href="/ttp.php<?=$extra?>&format=letter">US - <?=_("TTP Form")?></a></nobr></li><? if($_SESSION['profile']['points'] > 50) { ?><li><a href="wot.php?id=11"><nobr><?=_("Organisation Assurance")?></nobr></a></li><? } ?></ul>
+      <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['points'] < 100) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted Third Parties")?></a></li><li><a href="/cap.php<?=$extra?>">A4 - <?=_("WoT Form")?></a></li><li><a href="/cap.php<?=$extra?>&format=letter">US - <?=_("WoT Form")?></a></li><li><nobr><a href="/ttp.php<?=$extra?>">A4 - <?=_("TTP Form")?></nobr></li><li><nobr><a href="/ttp.php<?=$extra?>&format=letter">US - <?=_("TTP Form")?></a></nobr></li><? if($_SESSION['profile']['points'] > 100) { ?><li><nobr><a href="/ttp.php<?=$extra2?>">A4 - <?=_("Blank TTP Form")?></nobr></li><li><nobr><a href="/ttp.php<?=$extra2?>&format=letter">US - <?=_("Blank TTP Form")?></a></nobr></li><? } ?><? if($_SESSION['profile']['points'] > 50) { ?><li><a href="wot.php?id=11"><nobr><?=_("Organisation Assurance")?></nobr></a></li><? } ?></ul>
     </div>
 <? if($_SESSION['profile']['points'] >= 50) { ?>
     <div class="relatedLinks">
diff --git a/pages/wot/5.php b/pages/wot/5.php
index ba89e54..c8399ac 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -33,7 +33,7 @@
 <input type="submit" name="reminder" value="<?=_("Send reminder notice")?>">
 </form>
 <? unset($_SESSION['_config']['noemailfound']); } ?>
-<form method="post" action="wot.php">
+<form method="post" action="wot.php" name="form1">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
     <td colspan="2" class="title"><?=_("Assure Someone")?></td>
@@ -52,3 +52,11 @@
 </table>
 <input type="hidden" name="oldid" value="<?=$id?>">
 </form>
+<SCRIPT LANGUAGE="JavaScript">
+	function focus()
+	{
+		document.form1.email.focus();
+	}
+
+	focus();
+</script>
diff --git a/www/wot.php b/www/wot.php
index 410c602..9cc8b89 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -269,7 +269,7 @@
 	{
 		$query = "insert into `notary` set `from`='".$_SESSION['profile']['id']."',
 						`to`='".$_SESSION['_config']['notarise']['id']."',
-						`points`='$newpoints', `awardeded`='$awarded',
+						`points`='$newpoints', `awarded`='$awarded',
 						`location`='".mysql_escape_string(stripslashes($_POST['location']))."',
 						`date`='".mysql_escape_string(stripslashes($_POST['date']))."',
 						`when`=NOW()";