From e1cf5e2785533fe6584993ef6d64d4c963b0dad7 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Mon, 6 Oct 2008 21:26:16 +0000
Subject: [PATCH] Fixed HTML Markup, improved error messages

---
 pages/wot/6.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/wot/6.php b/pages/wot/6.php
index b0348a1..5cc6f32 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -40,20 +40,20 @@
 	while(strstr($name, "  "))
 		$name = str_replace("  ", " ", $name);
 	$cap .= "name=".urlencode($name);
-	$cap .= "&dob=".urlencode($row['dob']);
-	$cap .= "&email=".urlencode($row['email']);
+	$cap .= "&amp;dob=".urlencode($row['dob']);
+	$cap .= "&amp;email=".urlencode($row['email']);
 	$name = $_SESSION['profile']['fname']." ".$_SESSION['profile']['mname']." ".$_SESSION['profile']['lname']." ".$_SESSION['profile']['suffix'];
 	while(strstr($name, "  "))
 		$name = str_replace("  ", " ", $name);
-	$cap .= "&assurer=".urlencode($name);
-	$cap .= "&date=now";
-	$cap .= "&maxpoints=".maxpoints();
+	$cap .= "&amp;assurer=".urlencode($name);
+	$cap .= "&amp;date=now";
+	$cap .= "&amp;maxpoints=".maxpoints();
 
 	$maxpoints = maxpoints();
 	if($maxpoints > 100)
 		$maxpoints = 100;
 
-	if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
+        if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?><font color="#ff0000" size="+1">ERROR: <?=$_SESSION['_config']['error']?></font><? unset($_SESSION['_config']['error']); } ?>
 <form method="post" action="wot.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="600">
   <tr>
@@ -155,7 +155,7 @@
   </tr>
   <tr>
     <td class="DataTD"><?=_("WoT Form")?>:</td>
-    <td class="DataTD"><a href="<?=$cap?>" target="_NEW">A4 - <?=_("WoT Form")?></a> <a href="<?=$cap?>&format=letter" target="_NEW">US - <?=_("WoT Form")?></a></td>
+    <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>